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

406 files changed, 14612 insertions, 8455 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 5709872c7..779ad4236 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -44,6 +44,185 @@ Version 1.8.0 (Jackie)
     elgg_clear_sticky_form(), elgg_is_sticky_form(), and elgg_get_sticky_value().
 
 
+Version 1.7.9
+(June 1, 2011 from http://code.elgg.org/branches/1.7)
+
+ Security Enhancements:
+  * Blocking possible access to restricted pages if headers are output too early. Thanks to Vazco
+    for reporting!
+
+ Bugfixes:
+  * Admins can delete Pages again.
+  * TinyMCE upgraded to 3.4.2 to fix IE support.
+  * Autocomplete input works correctly.
+  * Fixed Message Board "all" posts.
+  * Fixed deleting internal messages on some non-English sites.
+  * Better feedback if an error occurs when saving widgets.
+  * Messages from deleted users no longer show the recipient's avatar.
+  * Https logins on fully https sites work correctly.
+
+ API Changes:
+  * Added "creating", "river" plugin hook.
+  * User metadata is registered as independent higher in the boot sequence.
+  * Group ACLs are updated correctly when joining a non-logged in user to a group.
+  * Can return 0 for plugin hook 'comments', 'count'.
+
+
+Version 1.7.8
+(April 4, 2011 from http://code.elgg.org/branches/1.7)
+
+ Security Enhancements:
+  * Properly encoding search queries (Thanks to lord epsylon (of Lorea) for the report!)
+
+ Bugfixes:
+  * Blogs - Fixed disappearing blog draft issue.
+  * Groups - Editing a topic from discussion list page works now.
+  * Search - Group names used in titles.
+  * InviteFriends - Invitation link no longer shows up when logged out.
+  * Messages - Denormalized the message calculation for better performance.
+  * Sorting by time_created in relationship functions supported.
+  * Metadata and annotation names can now be updated.
+  * Fixed error with deleting a user with disabled entities.
+  * Removed unnecessary executable permissions on a number of files. (Thanks to
+    pauloortiz for the report!)
+
+ API Changes:
+  * Added delete_submenu_item() for removing sidebar menu items.
+
+
+Version 1.7.7
+(January 31, 2011 from http://code.elgg.org/branches/1.7)
+
+ Security Enhancements:
+  * Only admins can view the unvalidated users page (Thanks to Manacim
+    Medriano for the report!)
+
+ Bugfixes:
+  * Fixed deprecation notices for locales that use comma as radix point.
+  * Groups - Files can be completely disabled per group.
+  * Pages - Deleting and creating subpages is restricted to owner or group member.
+  * Groups - group icons deleted when group is deleted.
+  * Pagination will not display when all content id displayed.
+  * Fixed issue with get_context() when trailing slash is missing.
+
+ API Changes:
+  * Added $CONFIG->action_token_timeout.
+  * Added callback option to elgg_get_entities().
+
+
+Version 1.7.6
+(December 23, 2010 from http://code.elgg.org/branches/1.7)
+
+ Security Enhancements:
+  * Fixed a possible SQL injection attack when using a crafted
+    URL.  Thanks to Gerrit Venema from Gol Gol (golgol.nl) for
+    the report.
+
+ Bugfixes:
+  * Pages - Fixed "All Pages" link on "All Site Pages" page.
+  * Messages - Fixed invalid URLs when using old-style
+    pg/messages/<username> links.
+  * Messages - Fixed redirect after deleting a message.
+
+ API Changes:
+  * Added get_entities_from_access_collection() and deprecated it.
+  * is_registered_entity_type() returns correctly when requesting
+    just a type and not a subtype.
+
+
+Version 1.7.5
+(November 26, 2010 from http://code.elgg.org/branches/1.7)
+
+ Security Enhancements:
+  * Fixed a security flaw in the Bookmarks plugin that could
+    allow an XSS attack using crafted URLs.  Thanks to Akhilesh
+    Gupta for the bug report.
+  * Fixed a security flaw in the widgets system that could allow
+    an XSS attack using crafted URLs.
+
+ Bugfixes:
+  * Checking for mismatched passwords before creating user when
+    manually adding users.
+  * 'large' size profile icons created when cropped.
+  * Fixed menu entry for user's files link.
+  * Fixed caching issues with plugin-added view types.
+  * Fixed XFN links on profile page and user lists.
+  * Fixed PHP warnings about invalid foreaches in plugins.php
+  * Fixed problems in elgg_get_entities_*() when using an array
+    for owner_guid.
+  * Group profile edit action correctly encodes and saves array input.
+  * Language string corrections.
+
+ UI/UX Changes:
+  * Users must verify their current password before they can changing
+    passwords.
+  * Using pagehandlers instead of mod/mod_name/ calls in Blogs,
+    Bookmarks, Members, Pages, The Wire, Groups, Invite Friends,
+    and Messages.
+  * Added a page to view Wire posts by user.
+
+ API Changes:
+  * Added remove_group_tool_option().
+  * Wrapped Twitter Service's vendor's oAuth lib in class_exists().
+  * Added elgg_list_entities_from_relationship().
+  * Exposed order_by param in list_entities_from_relationship().
+  * Added a default annotation view.
+
+
+Version 1.7.4
+(October 14, 2010 from http://code.elgg.org/branches/1.7)
+
+ Bugfixes:
+  * Upgrade Twitter Services to use oAuth so The Wire can post
+    to Twitter. See http://el.gg/twitteroauth for instructions.
+  * WSOD fixed when viewing an invalid profile page.
+  * Checking for mismatched passwords earlier in registration to avoid
+    creating a user who can never log in and wasting a username/email.
+  * POST data in the web services API is correctly quoted on servers
+    with magic quotes enabled.
+  * WSOD fixed when trying to update an invalid entity.
+  * Group file widget only shows when Files are enabled for the group.
+  * Fixed misformatting of some group forum posts in the River.
+  * Fixed resizing tall non-square images.
+  * Non-English languages work when using memcache.
+  * User avatar menus work when switching filters on River Dashboard page.
+  * CSS is correctly cached for newly enabled plugins.
+  * Can no longer add bookmarks without a title. Previous bookmarks with
+    out titles can now be deleted.
+
+ UI/UX Changes:
+  * Pages: Admin users can edit user-defined "Welcome page."
+  * Pages: Group "Welcome page" can be edited.
+  * User Validation:  Added an admin section for unvalidated users. An
+    admin user can resend validation request, validate, or delete
+    unvalidated users.
+
+ API Changes:
+  * test_ip() removed.
+  * is_ip_in_range() removed.
+  * Read/write DB connections can use different credentials.
+  * Twitter services plugin allows other plugins to tweet
+    if the user authorizes them.  See twitterservice/README.txt
+
+
+Version 1.7.3
+(September 2, 2010 from http://code.elgg.org/branches/1.7)
+
+ Security enhancements:
+  * Fixed a security flaw that allowed an SQL injection attack
+    using crafted POSTs.  Thanks to Georg-Christian Pranschke of
+    www.sensepost.com for the bug report.
+
+ UI/UX Changes:
+  * Entering an invalid captcha now forwards to referring page.
+
+ Bugfixes:
+  * Multiple owners support fixed for legacy get_entity*() functions.
+  * "Edit details" and "Edit profile icon" only show up for user's own
+    profile.
+  * get_objects_in_group() works correctly.
+
+
 Version 1.7.2
 (August 18, 2010 from http://code.elgg.org/elgg/branches/1.7)
 
diff --git a/LICENCE.txt b/LICENSE.txt
index f833d881e..f833d881e 100644
--- a/LICENCE.txt
+++ b/LICENSE.txt
diff --git a/README.txt b/README.txt
index 6b60fb05c..4ab2b563a 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-Elgg version 1.8
+Elgg
 Copyright (c) 2008-2010 See COPYRIGHT.txt
 
 See CONTRIBUTORS.txt for development credits.
diff --git a/actions/admin/plugins/activate.php b/actions/admin/plugins/activate.php
index 0d930b27f..feb986b27 100644
--- a/actions/admin/plugins/activate.php
+++ b/actions/admin/plugins/activate.php
@@ -29,7 +29,7 @@ foreach ($plugin_guids as $guid) {
 	if ($plugin->activate()) {
 		$activated_guids[] = $guid;
 	} else {
-		register_error(elgg_echo('admin:plugins:activate:no', array($plugin->manifest->getName())));
+		register_error(elgg_echo('admin:plugins:activate:no', array($plugin->getManifest()->getName())));
 	}
 }
 
@@ -39,7 +39,12 @@ elgg_invalidate_simplecache();
 elgg_filepath_cache_reset();
 
 if (count($activated_guids) === 1) {
-	forward("admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]);
+	$url = 'admin/plugins';
+	$query = (string)parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
+	if ($query) {
+		$url .= "?$query";
+	}
+	forward($url . '#elgg-plugin-' . $plugin_guids[0]);
 } else {
 	forward(REFERER);
 }
\ No newline at end of file
diff --git a/actions/admin/plugins/activate_all.php b/actions/admin/plugins/activate_all.php
index 25802ce2e..19eb82142 100644
--- a/actions/admin/plugins/activate_all.php
+++ b/actions/admin/plugins/activate_all.php
@@ -1,21 +1,25 @@
 <?php
 /**
- * Activates all installed and inactive plugins.
+ * Activates all specified installed and inactive plugins.
  *
- * All plugins in the mod/ directory are that aren't active are activated and the views
+ * All specified plugins in the mod/ directory are that aren't active are activated and the views
  * cache and simplecache are invalidated.
  *
  * @package Elgg.Core
  * @subpackage Administration.Plugins
  */
 
-$plugins = elgg_get_plugins('inactive');
+$guids = get_input('guids');
+$guids = explode(',', $guids);
 
-foreach ($plugins as $plugin) {
-	if ($plugin->activate()) {
-		//system_message(elgg_echo('admin:plugins:activate:yes', array($plugin->manifest->getName())));
-	} else {
-		register_error(elgg_echo('admin:plugins:activate:no', array($plugin->manifest->getName())));
+foreach ($guids as $guid) {
+	$plugin = get_entity($guid);
+	if (!$plugin->isActive()) {
+		if ($plugin->activate()) {
+			//system_message(elgg_echo('admin:plugins:activate:yes', array($plugin->getManifest()->getName())));
+		} else {
+			register_error(elgg_echo('admin:plugins:activate:no', array($plugin->getManifest()->getName())));
+		}
 	}
 }
 
diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php
index 74c78e0fc..6c9a55c15 100644
--- a/actions/admin/plugins/deactivate.php
+++ b/actions/admin/plugins/deactivate.php
@@ -26,9 +26,9 @@ foreach ($plugin_guids as $guid) {
 	}
 
 	if ($plugin->deactivate()) {
-		//system_message(elgg_echo('admin:plugins:deactivate:yes', array($plugin->manifest->getName())));
+		//system_message(elgg_echo('admin:plugins:deactivate:yes', array($plugin->getManifest()->getName())));
 	} else {
-		register_error(elgg_echo('admin:plugins:deactivate:no', array($plugin->manifest->getName())));
+		register_error(elgg_echo('admin:plugins:deactivate:no', array($plugin->getManifest()->getName())));
 	}
 }
 
@@ -38,7 +38,12 @@ elgg_invalidate_simplecache();
 elgg_filepath_cache_reset();
 
 if (count($plugin_guids) == 1) {
-	forward("admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]);
+	$url = 'admin/plugins';
+	$query = (string)parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
+	if ($query) {
+		$url .= "?$query";
+	}
+	forward($url . '#elgg-plugin-' . $plugin_guids[0]);
 } else {
 	forward(REFERER);
 }
diff --git a/actions/admin/plugins/deactivate_all.php b/actions/admin/plugins/deactivate_all.php
index f1bea0a2c..436a3ad30 100644
--- a/actions/admin/plugins/deactivate_all.php
+++ b/actions/admin/plugins/deactivate_all.php
@@ -1,21 +1,25 @@
 <?php
 /**
- * Disable all installed plugins.
+ * Disable all specified installed plugins.
  *
- * All plugins in the mod/ directory are disabled and the views cache and simplecache
+ * Specified plugins in the mod/ directory are disabled and the views cache and simplecache
  * are reset.
  *
  * @package Elgg.Core
  * @subpackage Administration.Plugins
  */
 
-$plugins = elgg_get_plugins('active');
+$guids = get_input('guids');
+$guids = explode(',', $guids);
 
-foreach ($plugins as $plugin) {
-	if ($plugin->deactivate()) {
-		//system_message(elgg_echo('admin:plugins:deactivate:yes', array($plugin->manifest->getName())));
-	} else {
-		register_error(elgg_echo('admin:plugins:deactivate:no', array($plugin->manifest->getName())));
+foreach ($guids as $guid) {
+	$plugin = get_entity($guid);
+	if ($plugin->isActive()) {
+		if ($plugin->deactivate()) {
+			//system_message(elgg_echo('admin:plugins:activate:yes', array($plugin->getManifest()->getName())));
+		} else {
+			register_error(elgg_echo('admin:plugins:deactivate:no', array($plugin->getManifest()->getName())));
+		}
 	}
 }
 
diff --git a/actions/admin/plugins/set_priority.php b/actions/admin/plugins/set_priority.php
index fd7857e49..702aae91b 100644
--- a/actions/admin/plugins/set_priority.php
+++ b/actions/admin/plugins/set_priority.php
@@ -25,9 +25,9 @@ if (!($plugin instanceof ElggPlugin)) {
 }
 
 if ($plugin->setPriority($priority)) {
-	//system_message(elgg_echo('admin:plugins:set_priority:yes', array($plugin->manifest->getName())));
+	//system_message(elgg_echo('admin:plugins:set_priority:yes', array($plugin->getManifest()->getName())));
 } else {
-	register_error(elgg_echo('admin:plugins:set_priority:no', array($plugin->manifest->getName())));
+	register_error(elgg_echo('admin:plugins:set_priority:no', array($plugin->getManifest()->getName())));
 }
 
 // don't regenerate the simplecache because the plugin won't be
diff --git a/actions/admin/plugins/simple_update_states.php b/actions/admin/plugins/simple_update_states.php
index 662a5c3dd..7601013a7 100644
--- a/actions/admin/plugins/simple_update_states.php
+++ b/actions/admin/plugins/simple_update_states.php
@@ -22,7 +22,7 @@ $success = TRUE;
 
 foreach ($installed_plugins as $plugin) {
 	// this is only for simple plugins.
-	if ($plugin->manifest->getAdminInterface() != 'simple') {
+	if ($plugin->getManifest()->getAdminInterface() != 'simple') {
 		continue;
 	}
 
diff --git a/actions/avatar/crop.php b/actions/avatar/crop.php
index ed5faecfa..9c57530ae 100644
--- a/actions/avatar/crop.php
+++ b/actions/avatar/crop.php
@@ -65,5 +65,8 @@ $owner->y1 = $y1;
 $owner->y2 = $y2;
 
 system_message(elgg_echo('avatar:crop:success'));
+$view = 'river/user/default/profileiconupdate';
+elgg_delete_river(array('subject_guid' => $owner->guid, 'view' => $view));
+add_to_river($view, 'update', $owner->guid, $owner->guid);
 
 forward(REFERER);
diff --git a/actions/avatar/upload.php b/actions/avatar/upload.php
index 052212e97..e21aa49c8 100644
--- a/actions/avatar/upload.php
+++ b/actions/avatar/upload.php
@@ -50,6 +50,10 @@ foreach ($icon_sizes as $name => $size_info) {
 $owner->icontime = time();
 if (elgg_trigger_event('profileiconupdate', $owner->type, $owner)) {
 	system_message(elgg_echo("avatar:upload:success"));
+
+	$view = 'river/user/default/profileiconupdate';
+	elgg_delete_river(array('subject_guid' => $owner->guid, 'view' => $view));
+	add_to_river($view, 'update', $owner->guid, $owner->guid);
 }
 
 forward(REFERER);
diff --git a/actions/logout.php b/actions/logout.php
index 98926d205..c48a26b15 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -12,6 +12,7 @@ $result = logout();
 // Set the system_message as appropriate
 if ($result) {
 	system_message(elgg_echo('logoutok'));
+	forward();
 } else {
 	register_error(elgg_echo('logouterror'));
 }
\ No newline at end of file
diff --git a/actions/plugins/settings/save.php b/actions/plugins/settings/save.php
index f3c865b9f..3b5694039 100644
--- a/actions/plugins/settings/save.php
+++ b/actions/plugins/settings/save.php
@@ -21,7 +21,7 @@ if (!($plugin instanceof ElggPlugin)) {
 	forward(REFERER);
 }
 
-$plugin_name = $plugin->manifest->getName();
+$plugin_name = $plugin->getManifest()->getName();
 
 $result = false;
 
diff --git a/actions/plugins/usersettings/save.php b/actions/plugins/usersettings/save.php
index 9c1657388..c6214f68d 100644
--- a/actions/plugins/usersettings/save.php
+++ b/actions/plugins/usersettings/save.php
@@ -29,7 +29,7 @@ if (!($user instanceof ElggUser)) {
 	forward(REFERER);
 }
 
-$plugin_name = $plugin->manifest->getName();
+$plugin_name = $plugin->getManifest()->getName();
 
 // make sure we're admin or the user
 if (!$user->canEdit()) {
diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
index 79b8c2a4e..8fc1e46cb 100644
--- a/engine/classes/ElggEntity.php
+++ b/engine/classes/ElggEntity.php
@@ -850,12 +850,11 @@ abstract class ElggEntity extends ElggData implements
 	 * @since 1.8.0
 	 */
 	function countComments() {
-		$type = $this->getType();
 		$params = array('entity' => $this);
-		$number = elgg_trigger_plugin_hook('comments:count', $type, $params, false);
+		$num = trigger_plugin_hook('comments:count', $this->getType(), $params);
 
-		if ($number) {
-			return $number;
+		if (is_int($num)) {
+			return $num;
 		} else {
 			return $this->getAnnotationCalculation('generic_comment', 'count');
 		}
diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php
index 61dbf539e..157ed9ceb 100644
--- a/engine/classes/ElggMenuItem.php
+++ b/engine/classes/ElggMenuItem.php
@@ -325,7 +325,16 @@ class ElggMenuItem {
 	 * @return string
 	 */
 	public function getItemClass() {
-		return implode(' ', $this->itemClass);
+		//allow people to specify name with underscores and colons
+		$name = str_replace('_', '-', $this->getName());
+		$name = str_replace(':', '-', $name);
+
+		$class = implode(' ', $this->itemClass);
+		if ($class) {
+			return "elgg-menu-item-$name $class";
+		} else {
+			return "elgg-menu-item-$name";
+		}
 	}
 
 	/**
@@ -420,6 +429,17 @@ class ElggMenuItem {
 	}
 
 	/**
+	 * Set the menu item's children
+	 *
+	 * @param array $children Array of ElggMenuItems
+	 *
+	 * @return void
+	 */
+	public function setChildren($children) {
+		$this->children = $children;
+	}
+
+	/**
 	 * Get the children menu items
 	 *
 	 * @return array
diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
index 20a8673de..95a7362e2 100644
--- a/engine/classes/ElggPlugin.php
+++ b/engine/classes/ElggPlugin.php
@@ -9,8 +9,8 @@
  * @subpackage Plugins.Settings
  */
 class ElggPlugin extends ElggObject {
-	public $package;
-	public $manifest;
+	private $package;
+	private $manifest;
 
 	private $path;
 	private $pluginID;
@@ -76,18 +76,6 @@ class ElggPlugin extends ElggObject {
 			// load the rest of the plugin
 			parent::__construct($existing_guid);
 		}
-
-		// We have to let the entity load so we can manipulate it with the API.
-		// If the path is wrong or would cause an exception, catch it,
-		// disable the plugin, and emit an error.
-		try {
-			$this->package = new ElggPluginPackage($this->path, false);
-			$this->manifest = $this->package->getManifest();
-		} catch (Exception $e) {
-			// we always have to allow the entity to load.
-			elgg_log("Failed to load $this->guid as a plugin. " . $e->getMessage(), 'WARNING');
-			$this->errorMsg = $e->getmessage();
-		}
 	}
 
 	/**
@@ -152,7 +140,7 @@ class ElggPlugin extends ElggObject {
 	 * @return array
 	 */
 	public function getAvailableTextFiles() {
-		$filenames = $this->package->getTextFilenames();
+		$filenames = $this->getPackage()->getTextFilenames();
 
 		$files = array();
 		foreach ($filenames as $filename) {
@@ -562,13 +550,13 @@ class ElggPlugin extends ElggObject {
 			return false;
 		}
 
-		if (!$this->package instanceof ElggPluginPackage) {
+		if (!$this->getPackage() instanceof ElggPluginPackage) {
 			$this->errorMsg = elgg_echo('ElggPlugin:NoPluginPackagePackage', array($this->getID(), $this->guid));
 			return false;
 		}
 
-		if (!$this->package->isValid()) {
-			$this->errorMsg = $this->package->getError();
+		if (!$this->getPackage()->isValid()) {
+			$this->errorMsg = $this->getPackage()->getError();
 			return false;
 		}
 
@@ -607,8 +595,8 @@ class ElggPlugin extends ElggObject {
 	 * @return bool
 	 */
 	public function canActivate($site_guid = null) {
-		if ($this->package) {
-			return $this->package->isValid() && $this->package->checkDependencies();
+		if ($this->getPackage()) {
+			return $this->getPackage()->isValid() && $this->getPackage()->checkDependencies();
 		}
 
 		return false;
@@ -708,9 +696,9 @@ class ElggPlugin extends ElggObject {
 	 * @throws PluginException
 	 */
 	public function start($flags) {
-		if (!$this->canActivate()) {
-			return false;
-		}
+//		if (!$this->canActivate()) {
+//			return false;
+//		}
 
 		// include start file
 		if ($flags & ELGG_PLUGIN_INCLUDE_START) {
@@ -851,12 +839,7 @@ class ElggPlugin extends ElggObject {
 			return true;
 		}
 
-		// but need to have working ones.
-		if (!elgg_register_classes($classes_path)) {
-			$msg = elgg_echo('ElggPlugin:Exception:CannotRegisterClasses',
-							array($this->getID(), $this->guid, $classes_path));
-			throw new PluginException($msg);
-		}
+		elgg_register_classes($classes_path);
 
 		return true;
 	}
@@ -958,4 +941,44 @@ class ElggPlugin extends ElggObject {
 	public function getError() {
 		return $this->errorMsg;
 	}
+
+	/**
+	 * Returns this plugin's ElggPluginManifest object
+	 *
+	 * @return ElggPluginManifest
+	 */
+	public function getManifest() {
+		if ($this->manifest instanceof ElggPluginManifest) {
+			return $this->manifest;
+		}
+
+		try {
+			$this->manifest = $this->getPackage()->getManifest();
+		} catch (Exception $e) {
+			elgg_log("Failed to load manifest for plugin $this->guid. " . $e->getMessage(), 'WARNING');
+			$this->errorMsg = $e->getmessage();
+		}
+
+		return $this->manifest;
+	}
+
+	/**
+	 * Returns this plugin's ElggPluginPackage object
+	 *
+	 * @return ElggPluginPackage
+	 */
+	public function getPackage() {
+		if ($this->package instanceof ElggPluginPackage) {
+			return $this->package;
+		}
+
+		try {
+			$this->package = new ElggPluginPackage($this->path, false);
+		} catch (Exception $e) {
+			elgg_log("Failed to load package for $this->guid. " . $e->getMessage(), 'WARNING');
+			$this->errorMsg = $e->getmessage();
+		}
+
+		return $this->package;
+	}
 }
diff --git a/engine/classes/ElggPluginPackage.php b/engine/classes/ElggPluginPackage.php
index 4daab381e..977b72d76 100644
--- a/engine/classes/ElggPluginPackage.php
+++ b/engine/classes/ElggPluginPackage.php
@@ -334,13 +334,13 @@ class ElggPluginPackage {
 
 		// first, check if any active plugin conflicts with us.
 		foreach ($enabled_plugins as $plugin) {
-			$temp_conflicts = $plugin->manifest->getConflicts();
+			$temp_conflicts = $plugin->getManifest()->getConflicts();
 			foreach ($temp_conflicts as $conflict) {
 				if ($conflict['type'] == 'plugin' && $conflict['name'] == $this_id) {
 					$result = $this->checkDepPlugin($conflict, $enabled_plugins, false);
 
 					// rewrite the conflict to show the originating plugin
-					$conflict['name'] = $plugin->manifest->getName();
+					$conflict['name'] = $plugin->getManifest()->getName();
 
 					if (!$full_report && !$result['status']) {
 						return $result['status'];
@@ -455,19 +455,13 @@ class ElggPluginPackage {
 	 */
 	private function checkDepPriority(array $dep, array $plugins, $inverse = false) {
 		// grab the ElggPlugin using this package.
-		$this_plugin = elgg_get_plugin_from_id($this->getID());
-		$this_priority = $this_plugin->getPriority();
+		$plugin_package = elgg_get_plugin_from_id($this->getID());
+		$plugin_priority = $plugin_package->getPriority();
+		$test_plugin = elgg_get_plugin_from_id($dep['plugin']);
 
-		foreach ($plugins as $test_plugin) {
-			if ($test_plugin->getID() == $dep['plugin']) {
-				break;
-			}
-		}
-
-		// If this isn't a plugin or there are no active plugins,
-		// we can't satisfy this dep.
-		// Assume everything is ok.  See #2946.
-		if (!$this->plugin || !$plugins) {
+		// If this isn't a plugin or the plugin isn't installed or active
+		// priority doesn't matter. Use requires to check if a plugin is active.
+		if (!$plugin_package || !$test_plugin || !$test_plugin->isActive()) {
 			return array(
 				'status' => true,
 				'value' => 'uninstalled'
@@ -478,11 +472,11 @@ class ElggPluginPackage {
 
 		switch ($dep['priority']) {
 			case 'before':
-				$status = $this_priority < $test_plugin_priority;
+				$status = $plugin_priority < $test_plugin_priority;
 				break;
 
 			case 'after':
-				$status = $this_priority > $test_plugin_priority;
+				$status = $plugin_priority > $test_plugin_priority;
 				break;
 
 			default;
@@ -490,7 +484,7 @@ class ElggPluginPackage {
 		}
 
 		// get the current value
-		if ($this_priority < $test_plugin_priority) {
+		if ($plugin_priority < $test_plugin_priority) {
 			$value = 'before';
 		} else {
 			$value = 'after';
diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php
index d3cb0d488..e3b8b8f1a 100644
--- a/engine/classes/ElggSite.php
+++ b/engine/classes/ElggSite.php
@@ -148,11 +148,20 @@ class ElggSite extends ElggEntity {
 	 * @return bool
 	 */
 	public function save() {
+		global $CONFIG;
+
 		// Save generic stuff
 		if (!parent::save()) {
 			return false;
 		}
 
+		// make sure the site guid is set (if not, set to self)
+		if (!$this->get('site_guid')) {
+			$guid = $this->get('guid');
+			update_data("UPDATE {$CONFIG->dbprefix}entities SET site_guid=$guid
+				WHERE guid=$guid");
+		}
+
 		// Now save specific stuff
 		return create_site_entity($this->get('guid'), $this->get('name'),
 			$this->get('description'), $this->get('url'));
@@ -400,7 +409,7 @@ class ElggSite extends ElggEntity {
 			'action/login',
 			'register',
 			'action/register',
-			'pages/account/forgotten_password\.php',
+			'forgotpassword',
 			'action/user/requestnewpassword',
 			'resetpassword',
 			'upgrade\.php',
diff --git a/engine/lib/actions.php b/engine/lib/actions.php
index 47e4dd4a4..ff598916f 100644
--- a/engine/lib/actions.php
+++ b/engine/lib/actions.php
@@ -152,6 +152,7 @@ function action($action, $forwarder = "") {
  * @param string $filename Optionally, the filename where this action is located. If not specified,
  *                         will assume the action is in elgg/actions/<action>.php
  * @param string $access   Who is allowed to execute this action: admin, public, or logged_in.
+ *                         (default: logged_in)
  *
  * @see action()
  * @see http://docs.elgg.org/Actions
@@ -411,6 +412,16 @@ function elgg_is_xhr() {
  */
 function ajax_forward_hook($hook, $type, $reason, $params) {
 	if (elgg_is_xhr()) {
+		// always pass the full structure to avoid boilerplate JS code.
+		$params = array(
+			'output' => '',
+			'status' => 0,
+			'system_messages' => array(
+				'error' => array(),
+				'success' => array()
+			)
+		);
+
 		//grab any data echo'd in the action
 		$output = ob_get_clean();
 
@@ -423,12 +434,15 @@ function ajax_forward_hook($hook, $type, $reason, $params) {
 		}
 
 		//Grab any system messages so we can inject them via ajax too
-		$params['system_messages'] = system_messages(NULL, "");
+		$system_messages = system_messages(NULL, "");
+
+		if (isset($system_messages['success'])) {
+			$params['system_messages']['success'] = $system_messages['success'];
+		}
 
-		if (isset($params['system_messages']['error'])) {
+		if (isset($system_messages['error'])) {
+			$params['system_messages']['error'] = $system_messages['error'];
 			$params['status'] = -1;
-		} else {
-			$params['status'] = 0;
 		}
 
 		header("Content-type: application/json");
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 06418c44f..3bfb69102 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -183,7 +183,7 @@ function elgg_admin_notice_exists($id) {
 function elgg_register_admin_menu_item($section, $menu_id, $parent_id = NULL, $priority = 100) {
 
 	// make sure parent is registered
-	if ($parent_id && !elgg_is_menu_item_registered($menu_id, $parent_id)) {
+	if ($parent_id && !elgg_is_menu_item_registered('page', $parent_id)) {
 		elgg_register_admin_menu_item($section, $parent_id);
 	}
 
@@ -211,7 +211,7 @@ function elgg_register_admin_menu_item($section, $menu_id, $parent_id = NULL, $p
 }
 
 /**
- * Initialise the admin backend.
+ * Initialize the admin backend.
  *
  * @return void
  */
@@ -262,11 +262,18 @@ function admin_init() {
 
 	// configure
 	// plugins
-	elgg_register_admin_menu_item('configure', 'plugins', null, 10);
-	elgg_register_admin_menu_item('configure', 'simple', 'plugins', 10);
-	elgg_register_admin_menu_item('configure', 'advanced', 'plugins', 20);
+	elgg_register_menu_item('page', array(
+		'name' => 'plugins',
+		'href' => 'admin/plugins',
+		'text' => elgg_echo('admin:plugins'),
+		'context' => 'admin',
+		'priority' => 75,
+		'section' => 'configure'
+	));
 
 	// settings
+	elgg_register_admin_menu_item('configure', 'appearance', null, 50);
+	elgg_register_admin_menu_item('configure', 'settings', null, 100);
 	elgg_register_admin_menu_item('configure', 'basic', 'settings', 10);
 	elgg_register_admin_menu_item('configure', 'advanced', 'settings', 20);
 	elgg_register_admin_menu_item('configure', 'menu_items', 'appearance', 30);
@@ -277,6 +284,11 @@ function admin_init() {
 	// plugin settings are added in elgg_admin_add_plugin_settings_menu() via the admin page handler
 	// for performance reasons.
 
+	// we want plugin settings menu items to be sorted alphabetical
+	if (elgg_in_context('admin')) {
+		elgg_register_plugin_hook_handler('prepare', 'menu:page', 'elgg_admin_sort_page_menu');
+	}
+
 	if (elgg_is_admin_logged_in()) {
 		elgg_register_menu_item('topbar', array(
 			'name' => 'administration',
@@ -314,6 +326,7 @@ function admin_init() {
  *
  * @return void
  * @access private
+ * @since 1.8.0
  */
 function elgg_admin_add_plugin_settings_menu() {
 
@@ -325,11 +338,13 @@ function elgg_admin_add_plugin_settings_menu() {
 
 	foreach ($active_plugins as $plugin) {
 		$plugin_id = $plugin->getID();
-		if (elgg_view_exists("settings/$plugin_id/edit")) {
+		$settings_view_old = 'settings/' . $plugin_id . '/edit';
+		$settings_view_new = 'plugins/' . $plugin_id . '/settings';
+		if (elgg_view_exists($settings_view_new) || elgg_view_exists($settings_view_old)) {
 			elgg_register_menu_item('page', array(
 				'name' => $plugin_id,
 				'href' => "admin/plugin_settings/$plugin_id",
-				'text' => $plugin->manifest->getName(),
+				'text' => $plugin->getManifest()->getName(),
 				'parent_name' => 'settings',
 				'context' => 'admin',
 				'section' => 'configure',
@@ -339,6 +354,33 @@ function elgg_admin_add_plugin_settings_menu() {
 }
 
 /**
+ * Sort the plugin settings menu items
+ *
+ * @param string $hook
+ * @param string $type
+ * @param array  $return
+ * @param array  $params
+ *
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_admin_sort_page_menu($hook, $type, $return, $params) {
+	$configure_items = $return['configure'];
+	foreach ($configure_items as $menu_item) {
+		if ($menu_item->getName() == 'settings') {
+			$settings = $menu_item;
+		}
+	}
+
+	// keep the basic and advanced settings at the top
+	$children = $settings->getChildren();
+	$site_settings = array_splice($children, 0, 2);
+	usort($children, array('ElggMenuBuilder', 'compareByText'));
+	array_splice($children, 0, 0, $site_settings);
+	$settings->setChildren($children);
+}
+
+/**
  * Handles any set up required for administration pages
  *
  * @return void
@@ -413,8 +455,8 @@ function admin_settings_page_handler($page) {
 	$vars = array('page' => $page);
 
 	// special page for plugin settings since we create the form for them
-	if ($page[0] == 'plugin_settings' && isset($page[1])
-		&& elgg_view_exists("settings/{$page[1]}/edit")) {
+	if ($page[0] == 'plugin_settings' && isset($page[1]) &&
+		(elgg_view_exists("settings/{$page[1]}/edit") || elgg_view_exists("plugins/{$page[1]}/settings"))) {
 
 		$view = 'admin/plugin_settings';
 		$plugin = elgg_get_plugin_from_id($page[1]);
@@ -516,9 +558,11 @@ function admin_markdown_page_handler($pages) {
 	$filename = elgg_extract(1, $pages);
 
 	$error = false;
-
 	if (!$plugin) {
 		$error = elgg_echo('admin:plugins:markdown:unknown_plugin');
+		$body = elgg_view_layout('admin', array('content' => $error, 'title' => $error));
+		echo elgg_view_page($title, $body, 'admin');
+		return true;
 	}
 
 	$text_files = $plugin->getAvailableTextFiles();
@@ -541,11 +585,13 @@ function admin_markdown_page_handler($pages) {
 		return true;
 	}
 
-	$title = $plugin->manifest->getName() . ": $filename";
+	$title = $plugin->getManifest()->getName() . ": $filename";
 	$text = Markdown($file_contents);
 
 	$body = elgg_view_layout('admin', array(
-		'content' => $text,
+		// setting classes here because there's no way to pass classes
+		// to the layout
+		'content' => '<div class="elgg-markdown">' . $text . '</div>',
 		'title' => $title
 	));
 	
diff --git a/engine/lib/database.php b/engine/lib/database.php
index 6b1b494b9..7747eb0d5 100644
--- a/engine/lib/database.php
+++ b/engine/lib/database.php
@@ -250,8 +250,6 @@ function explain_query($query, $link) {
 function execute_query($query, $dblink) {
 	global $CONFIG, $dbcalls;
 
-	// remove newlines so logs are easier to read
-	$query = preg_replace("/[\r\n]/", "", $query);
 	if ($query == NULL) {
 		throw new DatabaseException(elgg_echo('DatabaseException:InvalidQuery'));
 	}
@@ -362,7 +360,7 @@ function get_data_row($query, $callback = "") {
 
 /**
  * Handles returning data from a query, running it through a callback function,
- * and caching the results.
+ * and caching the results. This is for R queries (from CRUD).
  *
  * @access private
  *
@@ -377,6 +375,8 @@ function get_data_row($query, $callback = "") {
 function elgg_query_runner($query, $callback = null, $single = false) {
 	global $CONFIG, $DB_QUERY_CACHE;
 
+	$query = elgg_format_query($query);
+
 	// since we want to cache results of running the callback, we need to
 	// need to namespace the query with the callback, and single result request.
 	$hash = (string)$callback . (string)$single . $query;
@@ -386,7 +386,7 @@ function elgg_query_runner($query, $callback = null, $single = false) {
 		$cached_query = $DB_QUERY_CACHE[$hash];
 
 		if ($cached_query !== FALSE) {
-			elgg_log("$query results returned from cache (hash: $hash)");
+			elgg_log("DB query $query results returned from cache (hash: $hash)", 'NOTICE');
 			return $cached_query;
 		}
 	}
@@ -415,13 +415,13 @@ function elgg_query_runner($query, $callback = null, $single = false) {
 	}
 
 	if (empty($return)) {
-		elgg_log("DB query \"$query\" returned no results.");
+		elgg_log("DB query $query returned no results.", 'NOTICE');
 	}
 
 	// Cache result
 	if ($DB_QUERY_CACHE) {
 		$DB_QUERY_CACHE[$hash] = $return;
-		elgg_log("$query results cached (hash: $hash)");
+		elgg_log("DB query $query results cached (hash: $hash)", 'NOTICE');
 	}
 
 	return $return;
@@ -440,6 +440,9 @@ function elgg_query_runner($query, $callback = null, $single = false) {
 function insert_data($query) {
 	global $CONFIG, $DB_QUERY_CACHE;
 
+	$query = elgg_format_query($query);
+	elgg_log("DB query $query", 'NOTICE');
+	
 	$dblink = get_db_link('write');
 
 	// Invalidate query cache
@@ -447,7 +450,7 @@ function insert_data($query) {
 		$DB_QUERY_CACHE->clear();
 	}
 
-	elgg_log("Query cache invalidated");
+	elgg_log("Query cache invalidated", 'NOTICE');
 
 	if (execute_query("$query", $dblink)) {
 		return mysql_insert_id($dblink);
@@ -468,12 +471,15 @@ function insert_data($query) {
 function update_data($query) {
 	global $CONFIG, $DB_QUERY_CACHE;
 
+	$query = elgg_format_query($query);
+	elgg_log("DB query $query", 'NOTICE');
+
 	$dblink = get_db_link('write');
 
 	// Invalidate query cache
 	if ($DB_QUERY_CACHE) {
 		$DB_QUERY_CACHE->clear();
-		elgg_log("Query cache invalidated");
+		elgg_log("Query cache invalidated", 'NOTICE');
 	}
 
 	if (execute_query("$query", $dblink)) {
@@ -495,12 +501,15 @@ function update_data($query) {
 function delete_data($query) {
 	global $CONFIG, $DB_QUERY_CACHE;
 
+	$query = elgg_format_query($query);
+	elgg_log("DB query $query", 'NOTICE');
+
 	$dblink = get_db_link('write');
 
 	// Invalidate query cache
 	if ($DB_QUERY_CACHE) {
 		$DB_QUERY_CACHE->clear();
-		elgg_log("Query cache invalidated");
+		elgg_log("Query cache invalidated", 'NOTICE');
 	}
 
 	if (execute_query("$query", $dblink)) {
@@ -635,6 +644,17 @@ function run_sql_script($scriptlocation) {
 }
 
 /**
+ * Format a query string for logging
+ * 
+ * @param string $query Query string
+ * @return string
+ */
+function elgg_format_query($query) {
+	// remove newlines and extra spaces so logs are easier to read
+	return preg_replace('/\s\s+/', ' ', $query);
+}
+
+/**
  * Sanitise a string for database use, but with the option of escaping extra characters.
  *
  * @param string $string           The string to sanitise
diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index bb52881cd..d92257a09 100644
--- a/engine/lib/deprecated-1.8.php
+++ b/engine/lib/deprecated-1.8.php
@@ -1,7 +1,83 @@
 <?php
 /**
- * @return str
+ * ***************************************************************************
+ * NOTE: If this is ever removed from Elgg, sites lose the ability to upgrade
+ * from 1.7.x and earlier to the latest version of Elgg without upgrading to
+ * 1.8 first.
+ * ***************************************************************************
+ *
+ * Upgrade the database schema in an ordered sequence.
+ *
+ * Executes all upgrade files in elgg/engine/schema/upgrades/ in sequential order.
+ * Upgrade files must be in the standard Elgg release format of YYYYMMDDII.sql
+ * where II is an incrementor starting from 01.
+ *
+ * Files that are < $version will be ignored.
+ *
+ * @warning Plugin authors should not call this function directly.
+ *
+ * @param int    $version The version you are upgrading from in the format YYYYMMDDII.
+ * @param string $fromdir Optional directory to load upgrades from. default: engine/schema/upgrades/
+ * @param bool   $quiet   If true, suppress all error messages. Only use for the upgrade from <=1.6.
+ *
+ * @return bool
+ * @see upgrade.php
+ * @see version.php
+ * @deprecated 1.8 Use PHP upgrades for sql changes.
+ */
+function db_upgrade($version, $fromdir = "", $quiet = FALSE) {
+	global $CONFIG;
+
+	elgg_deprecated_notice('db_upgrade() is deprecated by using PHP upgrades.', 1.8);
+
+	$version = (int) $version;
+
+	if (!$fromdir) {
+		$fromdir = $CONFIG->path . 'engine/schema/upgrades/';
+	}
+
+	if ($handle = opendir($fromdir)) {
+		$sqlupgrades = array();
+
+		while ($sqlfile = readdir($handle)) {
+			if (!is_dir($fromdir . $sqlfile)) {
+				if (preg_match('/^([0-9]{10})\.(sql)$/', $sqlfile, $matches)) {
+					$sql_version = (int) $matches[1];
+					if ($sql_version > $version) {
+						$sqlupgrades[] = $sqlfile;
+					}
+				}
+			}
+		}
+
+		asort($sqlupgrades);
+
+		if (sizeof($sqlupgrades) > 0) {
+			foreach ($sqlupgrades as $sqlfile) {
+
+				// hide all errors.
+				if ($quiet) {
+					try {
+						run_sql_script($fromdir . $sqlfile);
+					} catch (DatabaseException $e) {
+						error_log($e->getmessage());
+					}
+				} else {
+					run_sql_script($fromdir . $sqlfile);
+				}
+			}
+		}
+	}
+
+	return TRUE;
+}
+
+/**
+ * Lists entities from an access collection
+ *
  * @deprecated 1.8 Use elgg_list_entities_from_access_id()
+ *
+ * @return str
  */
 function list_entities_from_access_id($access_id, $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $listtypetoggle = true, $pagination = true) {
 
@@ -14,7 +90,14 @@ function list_entities_from_access_id($access_id, $entity_type = "", $entity_sub
 }
 
 /**
+ * Registers a particular action in memory
+ *
  * @deprecated 1.8 Use {@link elgg_register_action()} instead
+ *
+ * @param string $action The name of the action (eg "register", "account/settings/save")
+ * @param boolean $public Can this action be accessed by people not logged into the system?
+ * @param string $filename Optionally, the filename where this action is located
+ * @param boolean $admin_only Whether this action is only available to admin users.
  */
 function register_action($action, $public = false, $filename = "", $admin_only = false) {
 	elgg_deprecated_notice("register_action() was deprecated by elgg_register_action()", 1.8);
@@ -35,6 +118,8 @@ function register_action($action, $public = false, $filename = "", $admin_only =
  * This function extends the view "admin/main" with the provided view.
  * This view should provide a description and either a control or a link to.
  *
+ * @deprecated 1.8 Extend admin views manually
+ *
  * Usage:
  * 	- To add a control to the main admin panel then extend admin/main
  *  - To add a control to a new page create a page which renders a view admin/subpage
@@ -48,8 +133,6 @@ function register_action($action, $public = false, $filename = "", $admin_only =
  * @param string $view           The view to extend, by default this is 'admin/main'.
  * @param int    $priority       Optional priority to govern the appearance in the list.
  *
- * @deprecated 1.8 Extend admin views manually
- *
  * @return void
  */
 function extend_elgg_admin_page($new_admin_view, $view = 'admin/main', $priority = 500) {
@@ -115,7 +198,7 @@ function get_entities_from_annotations_calculate_x($sum = "sum", $entity_type =
 	$options['limit'] = $limit;
 	$options['offset'] = $offset;
 
-	$options['order_by'] = "calculation $orderdir";
+	$options['order_by'] = "annotation_calculation $orderdir";
 
 	$options['count'] = $count;
 
@@ -125,6 +208,12 @@ function get_entities_from_annotations_calculate_x($sum = "sum", $entity_type =
 /**
  * Returns entities ordered by the sum of an annotation
  *
+ * @warning This is function uses sum instead of count. THIS IS SLOW. See #3366.
+ *          This should be used when you have annotations with different values and you
+ *          want a list of entities ordered by the sum of all of those values.
+ *          If you want a list of entities ordered by the number of annotations on each entity,
+ *          use __get_entities_from_annotations_calculate_x() and pass 'count' as the first param.
+ *
  * @deprecated 1.8 Use elgg_get_entities_from_annotation_calculation()
  *
  * @param string $entity_type    Type of Entity
@@ -179,7 +268,7 @@ function get_entities_from_annotation_count($entity_type = "", $entity_subtype =
 	$options['limit'] = $limit;
 	$options['offset'] = $offset;
 
-	$options['order_by'] = "calculation $orderdir";
+	$options['order_by'] = "annotation_calculation $orderdir";
 
 	$options['count'] = $count;
 
@@ -241,7 +330,7 @@ function list_entities_from_annotation_count($entity_type = "", $entity_subtype
 
 	$options['limit'] = $limit;
 
-	$options['order_by'] = "calculation $orderdir";
+	$options['order_by'] = "annotation_calculation $orderdir";
 
 	return elgg_get_entities_from_annotation_calculation($options);
 }
@@ -249,6 +338,8 @@ function list_entities_from_annotation_count($entity_type = "", $entity_subtype
 /**
  * Adds an entry in $CONFIG[$register_name][$subregister_name].
  *
+ * @deprecated 1.8 Use the new menu system.
+ * 
  * This is only used for the site-wide menu.  See {@link add_menu()}.
  *
  * @param string $register_name     The name of the top-level register
@@ -257,7 +348,6 @@ function list_entities_from_annotation_count($entity_type = "", $entity_subtype
  * @param array  $children_array    Optionally, an array of children
  *
  * @return true|false Depending on success
- * @deprecated 1.8
  */
 function add_to_register($register_name, $subregister_name, $subregister_value, $children_array = array()) {
 	elgg_deprecated_notice("add_to_register() has been deprecated", 1.8);
@@ -290,6 +380,8 @@ function add_to_register($register_name, $subregister_name, $subregister_value,
 /**
  * Removes a register entry from $CONFIG[register_name][subregister_name]
  *
+ * @deprecated 1.8 Use the new menu system.
+ *
  * This is used to by {@link remove_menu()} to remove site-wide menu items.
  *
  * @param string $register_name    The name of the top-level register
@@ -297,7 +389,6 @@ function add_to_register($register_name, $subregister_name, $subregister_value,
  *
  * @return true|false Depending on success
  * @since 1.7.0
- * @deprecated 1.8
  */
 function remove_from_register($register_name, $subregister_name) {
 	elgg_deprecated_notice("remove_from_register() has been deprecated", 1.8);
@@ -326,10 +417,11 @@ function remove_from_register($register_name, $subregister_name) {
 /**
  * If it exists, returns a particular register as an array
  *
+ * @deprecated 1.8 Use the new menu system
+ *
  * @param string $register_name The name of the register
  *
  * @return array|false Depending on success
- * @deprecated 1.8
  */
 function get_register($register_name) {
 	elgg_deprecated_notice("get_register() has been deprecated", 1.8);
@@ -363,6 +455,8 @@ function get_register($register_name) {
  * Deprecated events core function. Code divided between elgg_register_event_handler()
  * and trigger_elgg_event().
  *
+ * @deprecated 1.8 Use explicit register/trigger event functions
+ *
  * @param string  $event       The type of event (eg 'init', 'update', 'delete')
  * @param string  $object_type The type of object (eg 'system', 'blog', 'user')
  * @param string  $function    The name of the function that will handle the event
@@ -371,7 +465,6 @@ function get_register($register_name) {
  * @param mixed   $object      Optionally, the object the event is being performed on (eg a user)
  *
  * @return true|false Depending on success
- * @deprecated 1.8 Use explicit register/trigger event functions
  */
 function events($event = "", $object_type = "", $function = "", $priority = 500, $call = false, $object = null) {
 
@@ -386,7 +479,14 @@ function events($event = "", $object_type = "", $function = "", $priority = 500,
 }
 
 /**
+ * Alias function for events, that registers a function to a particular kind of event
+ *
  * @deprecated 1.8 Use elgg_register_event_handler() instead
+ * 
+ * @param string $event The event type
+ * @param string $object_type The object type
+ * @param string $function The function name
+ * @return true|false Depending on success
  */
 function register_elgg_event_handler($event, $object_type, $callback, $priority = 500) {
 	elgg_deprecated_notice("register_elgg_event_handler() was deprecated by elgg_register_event_handler()", 1.8);
@@ -394,7 +494,14 @@ function register_elgg_event_handler($event, $object_type, $callback, $priority
 }
 
 /**
+ * Unregisters a function to a particular kind of event
+ * 
  * @deprecated 1.8 Use elgg_unregister_event_handler instead
+ *
+ * @param string $event The event type
+ * @param string $object_type The object type
+ * @param string $function The function name
+ * @since 1.7.0
  */
 function unregister_elgg_event_handler($event, $object_type, $callback) {
 	elgg_deprecated_notice('unregister_elgg_event_handler => elgg_unregister_event_handler', 1.8);
@@ -402,7 +509,14 @@ function unregister_elgg_event_handler($event, $object_type, $callback) {
 }
 
 /**
+ * Alias function for events, that triggers a particular kind of event
+ *
  * @deprecated 1.8 Use elgg_trigger_event() instead
+ * 
+ * @param string $event The event type
+ * @param string $object_type The object type
+ * @param string $function The function name
+ * @return true|false Depending on success
  */
 function trigger_elgg_event($event, $object_type, $object = null) {
 	elgg_deprecated_notice('trigger_elgg_event() was deprecated by elgg_trigger_event()', 1.8);
@@ -410,7 +524,29 @@ function trigger_elgg_event($event, $object_type, $object = null) {
 }
 
 /**
+ * Register a function to a plugin hook for a particular entity type, with a given priority.
+ *
  * @deprecated 1.8 Use elgg_register_plugin_hook_handler() instead
+ * 
+ * eg if you want the function "export_user" to be called when the hook "export" for "user" entities
+ * is run, use:
+ *
+ * 		register_plugin_hook("export", "user", "export_user");
+ *
+ * "all" is a valid value for both $hook and $entity_type. "none" is a valid value for $entity_type.
+ *
+ * The export_user function would then be defined as:
+ *
+ * 		function export_user($hook, $entity_type, $returnvalue, $params);
+ *
+ * Where $returnvalue is the return value returned by the last function returned by the hook, and
+ * $params is an array containing a set of parameters (or nothing).
+ *
+ * @param string $hook The name of the hook
+ * @param string $entity_type The name of the type of entity (eg "user", "object" etc)
+ * @param string $function The name of a valid function to be run
+ * @param string $priority The priority - 0 is first, 1000 last, default is 500
+ * @return true|false Depending on success
  */
 function register_plugin_hook($hook, $type, $callback, $priority = 500) {
 	elgg_deprecated_notice("register_plugin_hook() was deprecated by elgg_register_plugin_hook_handler()", 1.8);
@@ -418,7 +554,14 @@ function register_plugin_hook($hook, $type, $callback, $priority = 500) {
 }
 
 /**
+ * Unregister a function to a plugin hook for a particular entity type
+ *
  * @deprecated 1.8 Use elgg_unregister_plugin_hook_handler() instead
+ * 
+ * @param string $hook The name of the hook
+ * @param string $entity_type The name of the type of entity (eg "user", "object" etc)
+ * @param string $function The name of a valid function to be run
+ * @since 1.7.0
  */
 function unregister_plugin_hook($hook, $entity_type, $callback) {
 	elgg_deprecated_notice("unregister_plugin_hook() was deprecated by elgg_unregister_plugin_hook_handler()", 1.8);
@@ -426,7 +569,20 @@ function unregister_plugin_hook($hook, $entity_type, $callback) {
 }
 
 /**
+ * Triggers a plugin hook, with various parameters as an array. For example, to provide
+ * a 'foo' hook that concerns an entity of type 'bar', with a parameter called 'param1'
+ * with value 'value1', that by default returns true, you'd call:
+ *
  * @deprecated 1.8 Use elgg_trigger_plugin_hook() instead
+ *
+ * trigger_plugin_hook('foo', 'bar', array('param1' => 'value1'), true);
+ *
+ * @see register_plugin_hook
+ * @param string $hook The name of the hook to trigger
+ * @param string $entity_type The name of the entity type to trigger it for (or "all", or "none")
+ * @param array $params Any parameters. It's good practice to name the keys, i.e. by using array('name' => 'value', 'name2' => 'value2')
+ * @param mixed $returnvalue An initial return value
+ * @return mixed|null The cumulative return value for the plugin hook functions
  */
 function trigger_plugin_hook($hook, $type, $params = null, $returnvalue = null) {
 	elgg_deprecated_notice("trigger_plugin_hook() was deprecated by elgg_trigger_plugin_hook()", 1.8);
@@ -1667,7 +1823,7 @@ function get_installed_plugins($status = 'all') {
 		if ($include) {
 			$installed_plugins[$plugin->getID()] = array(
 				'active' => $plugin->isActive(),
-				'manifest' => $plugin->manifest->getManifest()
+				'manifest' => $plugin->getManifest()->getManifest()
 			);
 		}
 	}
@@ -2844,6 +3000,13 @@ $priority = 500) {
 }
 
 /**
+ * Returns a representation of a full 'page' (which might be an HTML page,
+ * RSS file, etc, depending on the current viewtype)
+ *
+ * @param string $title
+ * @param string $body
+ * @return string
+ *
  * @deprecated 1.8 Use elgg_view_page()
  */
 function page_draw($title, $body, $sidebar = "") {
@@ -3504,14 +3667,18 @@ $asc = false, $fullview = true, $listtypetoggle = false, $pagination = true, $or
 
 	$options['limit'] = $limit;
 
-	$options['order_by'] = "calculation $orderdir";
+	$options['order_by'] = "annotation_calculation $orderdir";
 
 	return elgg_get_entities_from_annotation_calculation($options);
 }
 
 /**
- * @deprecated 1.8
- * @see elgg_set_view_location()
+ * Set an alternative base location for a view (as opposed to the default of $CONFIG->viewpath)
+ *
+ * @param string $view The name of the view
+ * @param string $location The base location path
+ *
+ * @deprecated 1.8 Use elgg_set_view_location()
  */
 function set_view_location($view, $location, $viewtype = '') {
 	elgg_deprecated_notice("set_view_location() was deprecated by elgg_set_view_location()", 1.8);
@@ -3519,8 +3686,14 @@ function set_view_location($view, $location, $viewtype = '') {
 }
 
 /**
- * @deprecated 1.8
- * @see elgg_register_entity_url_handler()
+ * Sets the URL handler for a particular entity type and subtype
+ *
+ * @param string $function_name The function to register
+ * @param string $entity_type The entity type
+ * @param string $entity_subtype The entity subtype
+ * @return true|false Depending on success
+ *
+ * @deprecated 1.8 Use elgg_register_entity_url_handler()
  */
 function register_entity_url_handler($function_name, $entity_type = "all", $entity_subtype = "all") {
 	elgg_deprecated_notice("register_entity_url_handler() was deprecated by elgg_register_entity_url_handler()", 1.8);
@@ -3807,6 +3980,27 @@ function clear_annotations_by_owner($owner_guid) {
 }
 
 /**
+ * Registers a page handler for a particular identifier
+ *
+ * For example, you can register a function called 'blog_page_handler' for handler type 'blog'
+ * Now for all URLs of type http://yoururl/pg/blog/*, the blog_page_handler() function will be called.
+ * The part of the URL marked with * above will be exploded on '/' characters and passed as an
+ * array to that function.
+ * For example, the URL http://yoururl/blog/username/friends/ would result in the call:
+ * blog_page_handler(array('username','friends'), blog);
+ *
+ * Page handler functions should return true or the default page handler will be called.
+ *
+ * A request to register a page handler with the same identifier as previously registered
+ * handler will replace the previous one.
+ *
+ * The context is set to the page handler identifier before the registered
+ * page handler function is called. For the above example, the context is set to 'blog'.
+ *
+ * @param string $handler The page type to handle
+ * @param string $function Your function name
+ * @return true|false Depending on success
+ *
  * @deprecated 1.8 Use {@link elgg_register_page_handler()}
  */
 function register_page_handler($handler, $function){
@@ -3815,6 +4009,13 @@ function register_page_handler($handler, $function){
 }
 
 /**
+ * Unregister a page handler for an identifier
+ *
+ * Note: to replace a page handler, call register_page_handler()
+ *
+ * @param string $handler The page type identifier
+ * @since 1.7.2
+ * 
  * @deprecated 1.8 Use {@link elgg_unregister_page_handler()}
  */
 function unregister_page_handler($handler) {
@@ -3823,6 +4024,11 @@ function unregister_page_handler($handler) {
 }
 
 /**
+ * Register an annotation url handler.
+ *
+ * @param string $function_name The function.
+ * @param string $extender_name The name, default 'all'.
+ *
  * @deprecated 1.8 Use {@link elgg_register_annotation_url_handler()}
  */
 function register_annotation_url_handler($function, $extender_name) {
@@ -3831,6 +4037,15 @@ function register_annotation_url_handler($function, $extender_name) {
 }
 
 /**
+ * Sets the URL handler for a particular extender type and name.
+ * It is recommended that you do not call this directly, instead use one of the wrapper functions in the
+ * subtype files.
+ *
+ * @param string $function_name The function to register
+ * @param string $extender_type Extender type
+ * @param string $extender_name The name of the extender
+ * @return true|false Depending on success
+ *
  * @deprecated 1.8 Use {@link elgg_register_extender_url_handler()}
  */
 function register_extender_url_handler($function, $type = "all", $name = "all") {
@@ -3839,6 +4054,14 @@ function register_extender_url_handler($function, $type = "all", $name = "all")
 }
 
 /**
+ * Registers and entity type and subtype to return in search and other places.
+ * A description in the elgg_echo languages file of the form item:type:subtype
+ * is also expected.
+ *
+ * @param string $type The type of entity (object, site, user, group)
+ * @param string $subtype The subtype to register (may be blank)
+ * @return true|false Depending on success
+ * 
  * @deprecated 1.8 Use {@link elgg_register_entity_type()}
  */
 function register_entity_type($type, $subtype = null) {
@@ -3847,6 +4070,11 @@ function register_entity_type($type, $subtype = null) {
 }
 
 /**
+ * Register a metadata url handler.
+ *
+ * @param string $function_name The function.
+ * @param string $extender_name The name, default 'all'.
+ * 
  * @deprecated 1.8 Use {@link elgg_register_metadata_url_handler()}
  */
 function register_metadata_url_handler($function, $extender_name = "all") {
@@ -3854,7 +4082,12 @@ function register_metadata_url_handler($function, $extender_name = "all") {
 }
 
 /**
+ * Sets the URL handler for a particular relationship type
  *
+ * @param string $function_name The function to register
+ * @param string $relationship_type The relationship type.
+ * @return true|false Depending on success
+ * 
  * @deprecated 1.8 Use {@link elgg_register_relationship_url_handler()}
  */
 function register_relationship_url_handler($function_name, $relationship_type = "all") {
@@ -3863,6 +4096,15 @@ function register_relationship_url_handler($function_name, $relationship_type =
 }
 
 /**
+ * Registers a view to be simply cached
+ *
+ * Views cached in this manner must take no parameters and be login agnostic -
+ * that is to say, they look the same no matter who is logged in (or logged out).
+ *
+ * CSS and the basic jS views are automatically cached like this.
+ *
+ * @param string $viewname View name
+ *
  * @deprecated 1.8 Use {@link elgg_register_simplecache_view()}
  */
 function elgg_view_register_simplecache($viewname) {
@@ -3871,6 +4113,11 @@ function elgg_view_register_simplecache($viewname) {
 }
 
 /**
+ * Regenerates the simple cache.
+ *
+ * @param string $viewtype Optional viewtype to regenerate
+ * @see elgg_view_register_simplecache()
+ *
  * @deprecated 1.8 Use {@link elgg_regenerate_simplecache()}
  */
 function elgg_view_regenerate_simplecache($viewtype = NULL) {
@@ -3879,6 +4126,10 @@ function elgg_view_regenerate_simplecache($viewtype = NULL) {
 }
 
 /**
+ * Enables the simple cache.
+ *
+ * @see elgg_view_register_simplecache()
+ * 
  * @deprecated 1.8 Use {@link elgg_enable_simplecache()}
  */
 function elgg_view_enable_simplecache() {
@@ -3887,6 +4138,10 @@ function elgg_view_enable_simplecache() {
 }
 
 /**
+ * Disables the simple cache.
+ *
+ * @see elgg_view_register_simplecache()
+ * 
  * @deprecated 1.8 Use {@link elgg_disable_simplecache()}
  */
 function elgg_view_disable_simplecache() {
@@ -3912,6 +4167,22 @@ function is_installed() {
 }
 
 /**
+ * Attempt to authenticate.
+ * This function will process all registered PAM handlers or stop when the first
+ * handler fails. A handler fails by either returning false or throwing an
+ * exception. The advantage of throwing an exception is that it returns a message
+ * through the global $_PAM_HANDLERS_MSG which can be used in communication with
+ * a user. The order that handlers are processed is determined by the order that
+ * they were registered.
+ *
+ * If $credentials are provided the PAM handler should authenticate using the
+ * provided credentials, if not then credentials should be prompted for or
+ * otherwise retrieved (eg from the HTTP header or $_SESSION).
+ *
+ * @param mixed $credentials Mixed PAM handler specific credentials (e.g. username, password)
+ * @param string $policy - the policy type, default is "user"
+ * @return bool true if authenticated, false if not.
+ *
  * @deprecated 1.8 See {@link ElggPAM}
  */
 function pam_authenticate($credentials = NULL, $policy = "user") {
@@ -4375,6 +4646,11 @@ function using_widgets() {
 }
 
 /**
+ * Displays a particular widget
+ *
+ * @param ElggObject $widget The widget to display
+ * @return string The HTML for the widget, including JavaScript wrapper
+ * 
  * @deprecated 1.8
  */
 function display_widget(ElggObject $widget) {
@@ -4382,92 +4658,76 @@ function display_widget(ElggObject $widget) {
 	return elgg_view_entity($widget);
 }
 
-
 /**
- * ***************************************************************************
- * NOTE: If this is ever removed from Elgg, sites lose the ability to upgrade
- * from 1.7.x and earlier to the latest version of Elgg without upgrading to
- * 1.8 first.
- * ***************************************************************************
- *
- * Upgrade the database schema in an ordered sequence.
- *
- * Executes all upgrade files in elgg/engine/schema/upgrades/ in sequential order.
- * Upgrade files must be in the standard Elgg release format of YYYYMMDDII.sql
- * where II is an incrementor starting from 01.
- *
- * Files that are < $version will be ignored.
- *
- * @warning Plugin authors should not call this function directly.
- *
- * @param int    $version The version you are upgrading from in the format YYYYMMDDII.
- * @param string $fromdir Optional directory to load upgrades from. default: engine/schema/upgrades/
- * @param bool   $quiet   If true, suppress all error messages. Only use for the upgrade from <=1.6.
+ * Count the number of comments attached to an entity
  *
- * @return bool
- * @see upgrade.php
- * @see version.php
- * @deprecated 1.8 Use PHP upgrades for sql changes.
+ * @param ElggEntity $entity
+ * @return int Number of comments
  */
-function db_upgrade($version, $fromdir = "", $quiet = FALSE) {
-	global $CONFIG;
-
-	elgg_deprecated_notice('db_upgrade() is deprecated by using PHP upgrades.', 1.8);
-
-	$version = (int) $version;
+function elgg_count_comments($entity) {
+	elgg_deprecated_notice('elgg_count_comments() is deprecated by ElggEntity->countComments()', 1.8);
 
-	if (!$fromdir) {
-		$fromdir = $CONFIG->path . 'engine/schema/upgrades/';
+	if ($entity instanceof ElggEntity) {
+		return $entity->countComments();
 	}
 
-	if ($handle = opendir($fromdir)) {
-		$sqlupgrades = array();
-
-		while ($sqlfile = readdir($handle)) {
-			if (!is_dir($fromdir . $sqlfile)) {
-				if (preg_match('/^([0-9]{10})\.(sql)$/', $sqlfile, $matches)) {
-					$sql_version = (int) $matches[1];
-					if ($sql_version > $version) {
-						$sqlupgrades[] = $sqlfile;
-					}
-				}
-			}
-		}
+	return 0;
+}
 
-		asort($sqlupgrades);
+/**
+ * Removes all items relating to a particular acting entity from the river
+ *
+ * @param int $subject_guid The GUID of the entity
+ *
+ * @return bool Depending on success
+ * @deprecated 1.8 Use elgg_delete_river()
+ */
+function remove_from_river_by_subject($subject_guid) {
+	elgg_deprecated_notice("remove_from_river_by_subject() deprecated by elgg_delete_river()", 1.8);
 
-		if (sizeof($sqlupgrades) > 0) {
-			foreach ($sqlupgrades as $sqlfile) {
+	return elgg_delete_river(array('subject_guid' => $subject_guid));
+}
 
-				// hide all errors.
-				if ($quiet) {
-					try {
-						run_sql_script($fromdir . $sqlfile);
-					} catch (DatabaseException $e) {
-						error_log($e->getmessage());
-					}
-				} else {
-					run_sql_script($fromdir . $sqlfile);
-				}
-			}
-		}
-	}
+/**
+ * Removes all items relating to a particular entity being acted upon from the river
+ *
+ * @param int $object_guid The GUID of the entity
+ *
+ * @return bool Depending on success
+ * @deprecated 1.8 Use elgg_delete_river()
+ */
+function remove_from_river_by_object($object_guid) {
+	elgg_deprecated_notice("remove_from_river_by_object() deprecated by elgg_delete_river()", 1.8);
 
-	return TRUE;
+	return elgg_delete_river(array('object_guid' => $object_guid));
 }
 
 /**
- * Count the number of comments attached to an entity
+ * Removes all items relating to a particular annotation being acted upon from the river
  *
- * @param ElggEntity $entity
- * @return int Number of comments
+ * @param int $annotation_id The ID of the annotation
+ *
+ * @return bool Depending on success
+ * @since 1.7.0
+ * @deprecated 1.8 Use elgg_delete_river()
  */
-function elgg_count_comments($entity) {
-	elgg_deprecated_notice('elgg_count_comments() is deprecated by ElggEntity->countComments()', 1.8);
+function remove_from_river_by_annotation($annotation_id) {
+	elgg_deprecated_notice("remove_from_river_by_annotation() deprecated by elgg_delete_river()", 1.8);
 
-	if ($entity instanceof ElggEntity) {
-		return $entity->countComments();
-	}
+	return elgg_delete_river(array('annotation_id' => $annotation_id));
+}
 
-	return 0;
-}
\ No newline at end of file
+/**
+ * Removes a single river entry
+ *
+ * @param int $id The ID of the river entry
+ *
+ * @return bool Depending on success
+ * @since 1.7.2
+ * @deprecated 1.8 Use elgg_delete_river()
+ */
+function remove_from_river_by_id($id) {
+	elgg_deprecated_notice("remove_from_river_by_id() deprecated by elgg_delete_river()", 1.8);
+
+	return elgg_delete_river(array('id' => $id));
+}
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index e67f8b627..df78515f2 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -33,21 +33,15 @@ function _elgg_autoload($class) {
  *
  * @param string $dir The dir to look in
  *
- * @return true
+ * @return void
  * @since 1.8.0
  */
 function elgg_register_classes($dir) {
 	$classes = elgg_get_file_list($dir, array(), array(), array('.php'));
 
-	if (!$classes) {
-		return false;
-	}
-
 	foreach ($classes as $class) {
 		elgg_register_class(basename($class, '.php'), $class);
 	}
-
-	return true;
 }
 
 /**
@@ -1795,8 +1789,9 @@ function elgg_cacheable_view_page_handler($page, $type) {
 		// translates to the url /js/calendars/jquery.fullcalendar.min.<ts>.js
 		// and the view js/calendars/jquery.fullcalendar.min
 		// we ignore the last two dots for the ts and the ext.
+		// Additionally, the timestamp is optional.
 		$page = implode('/', $page);
-		$regex = '|(.+)\.([^\.]+)\.([^.]+)$|';
+		$regex = '|(.+?)\.([\d]+\.)?\w+$|';
 		preg_match($regex, $page, $matches);
 		$view = $matches[1];
 		$return = elgg_view("$type/$view");
@@ -2008,8 +2003,9 @@ function elgg_init() {
 	elgg_register_menu_item('topbar', array(
 		'name' => 'elgg_logo',
 		'href' => 'http://www.elgg.org/',
-		'text' => "<img src=\"$logo_url\" alt=\"Elgg logo\" />",
+		'text' => "<img src=\"$logo_url\" alt=\"Elgg logo\" width=\"38\" height=\"20\" />",
 		'priority' => 1,
+		'link_class' => 'elgg-topbar-logo',
 	));
 	
 	// Sets a blacklist of words in the current language.
diff --git a/engine/lib/extender.php b/engine/lib/extender.php
index a017c9eec..50b05579b 100644
--- a/engine/lib/extender.php
+++ b/engine/lib/extender.php
@@ -132,7 +132,7 @@ function can_edit_extender($extender_id, $type, $user_guid = 0) {
 		$user = elgg_get_logged_in_user_entity();
 	}
 
-	$functionname = "get_{$type}";
+	$functionname = "elgg_get_{$type}_from_id";
 	if (is_callable($functionname)) {
 		$extender = $functionname($extender_id);
 	} else {
@@ -161,13 +161,13 @@ function can_edit_extender($extender_id, $type, $user_guid = 0) {
 /**
  * Sets the URL handler for a particular extender type and name.
  * It is recommended that you do not call this directly, instead use
- * one of the wrapper functions in the subtype files.
+ * one of the wrapper functions such as elgg_register_annotation_url_handler().
  *
  * @param string $function_name The function to register
- * @param string $extender_type Extender type
+ * @param string $extender_type Extender type ('annotation', 'metadata')
  * @param string $extender_name The name of the extender
  *
- * @return true|false Depending on success
+ * @return bool
  */
 function elgg_register_extender_url_handler($extender_type, $extender_name, $function_name) {
 
diff --git a/engine/lib/group.php b/engine/lib/group.php
index d78274961..755482b00 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -276,8 +276,9 @@ function group_gatekeeper($forward = true) {
 
 	if ($forward && $allowed == false) {
 		register_error(elgg_echo('membershiprequired'));
-		forward($url, 'member');
-		exit;
+		if (!forward($url, 'member')) {
+			throw new SecurityException(elgg_echo('SecurityException:UnexpectedOutputInGatekeeper'));
+		}
 	}
 
 	return $allowed;
diff --git a/engine/lib/output.php b/engine/lib/output.php
index 3f35a1576..04c737062 100644
--- a/engine/lib/output.php
+++ b/engine/lib/output.php
@@ -170,7 +170,7 @@ function elgg_format_attributes(array $attrs) {
 		}
 
 		// ignore $vars['entity'] => ElggEntity stuff
-		if (is_not_null($val) && (is_array($val) || !is_object($val))) {
+		if ($val !== NULL && $val !== false && (is_array($val) || !is_object($val))) {
 
 			// allow $vars['class'] => array('one', 'two');
 			// @todo what about $vars['style']? Needs to be semi-colon separated...
diff --git a/engine/lib/pagehandler.php b/engine/lib/pagehandler.php
index e598d6821..31d73b18c 100644
--- a/engine/lib/pagehandler.php
+++ b/engine/lib/pagehandler.php
@@ -27,6 +27,20 @@ function page_handler($handler, $page) {
 		array_pop($page);
 	}
 
+	// return false to stop processing the request (because you handled it)
+	// return a new $params array if you want to route the request differently
+	$params = array(
+		'handler' => $handler,
+		'segments' => $page,
+	);
+	$params = elgg_trigger_plugin_hook('route', $handler, NULL, $params);
+	if ($params === false) {
+		return true;
+	}
+
+	$handler = $params['handler'];
+	$page = $params['segments'];
+
 	if (!isset($CONFIG->pagehandler) || empty($handler)) {
 		$result = false;
 	} else if (isset($CONFIG->pagehandler[$handler]) && is_callable($CONFIG->pagehandler[$handler])) {
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index 0947b7a8e..88217b782 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -266,9 +266,9 @@ function elgg_is_active_plugin($plugin_id, $site_guid = null) {
 /**
  * Loads all active plugins in the order specified in the tool admin panel.
  *
- * @note This is called on every page load and includes additional checking that plugins
- * are fit to be loaded.  If a plugin is active and problematic, it will be disabled
- * and a visible error emitted.
+ * @note This is called on every page load. If a plugin is active and problematic, it
+ * will be disabled and a visible error emitted. This does not check the deps system because
+ * that was too slow.
  *
  * @return bool
  */
@@ -307,17 +307,6 @@ function elgg_load_plugins() {
 	$plugins = elgg_get_plugins('active');
 	if ($plugins) {
 		foreach ($plugins as $plugin) {
-			// check if plugin can be started and try to start it.
-			// if anything is bad, disable it and emit a message.
-			if (!$plugin->isValid()) {
-				$plugin->deactivate();
-				$msg = elgg_echo('PluginException:MisconfiguredPlugin', array($plugin->getID(), $plugin->guid));
-				register_error($msg);
-				$return = false;
-
-				continue;
-			}
-
 			try {
 				$plugin->start($start_flags);
 			} catch (Exception $e) {
@@ -345,11 +334,10 @@ function elgg_load_plugins() {
  * Returns an ordered list of plugins
  *
  * @param string $status      The status of the plugins. active, inactive, or all.
- * @param bool   $include_bad Include physically deleted and invalid plugins?
  * @param mixed  $site_guid   Optional site guid
  * @return array
  */
-function elgg_get_plugins($status = 'active', $include_bad = false, $site_guid = NULL) {
+function elgg_get_plugins($status = 'active', $site_guid = null) {
 	$db_prefix = get_config('dbprefix');
 	$priority = elgg_namespace_plugin_private_setting('internal', 'priority');
 
@@ -388,22 +376,9 @@ function elgg_get_plugins($status = 'active', $include_bad = false, $site_guid =
 			break;
 	}
 
-	if ($include_bad) {
-		$old_ia = elgg_set_ignore_access(true);
-	}
-
+	$old_ia = elgg_set_ignore_access(true);
 	$plugins = elgg_get_entities_from_relationship($options);
-
-	if ($include_bad) {
-		elgg_set_ignore_access($old_ia);
-	} else {
-		// remove bad plugins
-		foreach ($plugins as $i => $plugin) {
-			if (!$plugin->isValid()) {
-				unset ($plugins[$i]);
-			}
-		}
-	}
+	elgg_set_ignore_access($old_ia);
 
 	return $plugins;
 }
@@ -422,7 +397,7 @@ function elgg_get_plugins($status = 'active', $include_bad = false, $site_guid =
 function elgg_set_plugin_priorities(array $order) {
 	$name = elgg_namespace_plugin_private_setting('internal', 'priority');
 
-	$plugins = elgg_get_plugins('any', true);
+	$plugins = elgg_get_plugins('any');
 	if (!$plugins) {
 		return false;
 	}
@@ -573,7 +548,7 @@ function elgg_get_plugins_provides($type = null, $name = null) {
 		$provides = array();
 
 		foreach ($active_plugins as $plugin) {
-			if ($plugin_provides = $plugin->manifest->getProvides()) {
+			if ($plugin_provides = $plugin->getManifest()->getProvides()) {
 				foreach ($plugin_provides as $provided) {
 					$provides[$provided['type']][$provided['name']] = array(
 						'version' => $provided['version'],
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 80f285e50..36dde7f05 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -18,12 +18,14 @@
  * @param int    $posted        The UNIX epoch timestamp of the river item (default: now)
  * @param int    $annotation_id The annotation ID associated with this river entry
  *
- * @return bool Depending on success
+ * @return int/bool River ID or false on failure
  */
 function add_to_river($view, $action_type, $subject_guid, $object_guid, $access_id = "",
 $posted = 0, $annotation_id = 0) {
 
-	// use default viewtype for when called from REST api
+	global $CONFIG;
+
+	// use default viewtype for when called from web services api
 	if (!elgg_view_exists($view, 'default')) {
 		return false;
 	}
@@ -60,7 +62,7 @@ $posted = 0, $annotation_id = 0) {
 	);
 
 	// return false to stop insert
-	$params = elgg_trigger_plugin_hook('add', 'river', null, $params);
+	$params = elgg_trigger_plugin_hook('creating', 'river', null, $params);
 	if ($params == false) {
 		// inserting did not fail - it was just prevented
 		return true;
@@ -68,11 +70,8 @@ $posted = 0, $annotation_id = 0) {
 
 	extract($params);
 
-	// Load config
-	global $CONFIG;
-
 	// Attempt to save river item; return success status
-	$insert_data = insert_data("insert into {$CONFIG->dbprefix}river " .
+	$id = insert_data("insert into {$CONFIG->dbprefix}river " .
 		" set type = '$type', " .
 		" subtype = '$subtype', " .
 		" action_type = '$action_type', " .
@@ -83,89 +82,130 @@ $posted = 0, $annotation_id = 0) {
 		" annotation_id = $annotation_id, " .
 		" posted = $posted");
 
-	//update the entities which had the action carried out on it
-	if ($insert_data) {
+	// update the entities which had the action carried out on it
+	// @todo shouldn't this be down elsewhere? Like when an annotation is saved?
+	if ($id) {
 		update_entity_last_action($object_guid, $posted);
-		return $insert_data;
+		
+		$river_items = elgg_get_river(array('id' => $id));
+		if ($river_items) {
+			elgg_trigger_event('created', 'river', $river_items[0]);
+		}
+		return $id;
+	} else {
+		return false;
 	}
 }
 
 /**
- * Removes all items relating to a particular acting entity from the river
+ * Delete river items
  *
- * @param int $subject_guid The GUID of the entity
+ * @warning not checking access (should we?)
  *
- * @return bool Depending on success
+ * @param array $options
+ *   ids                  => INT|ARR River item id(s)
+ *   subject_guids        => INT|ARR Subject guid(s)
+ *   object_guids         => INT|ARR Object guid(s)
+ *   annotation_ids       => INT|ARR The identifier of the annotation(s)
+ *   action_types         => STR|ARR The river action type(s) identifier
+ *   views                => STR|ARR River view(s)
+ *
+ *   types                => STR|ARR Entity type string(s)
+ *   subtypes             => STR|ARR Entity subtype string(s)
+ *   type_subtype_pairs   => ARR     Array of type => subtype pairs where subtype
+ *                                   can be an array of subtype strings
+ * 
+ *   posted_time_lower    => INT     The lower bound on the time posted
+ *   posted_time_upper    => INT     The upper bound on the time posted
+ *
+ * @return bool
+ * @since 1.8.0
  */
-function remove_from_river_by_subject($subject_guid) {
-	// Sanitise
-	$subject_guid = (int) $subject_guid;
-
-	// Load config
+function elgg_delete_river(array $options = array()) {
 	global $CONFIG;
 
-	// Remove
-	return delete_data("delete from {$CONFIG->dbprefix}river where subject_guid = {$subject_guid}");
-}
+	$defaults = array(
+		'ids'                  => ELGG_ENTITIES_ANY_VALUE,
 
-/**
- * Removes all items relating to a particular entity being acted upon from the river
- *
- * @param int $object_guid The GUID of the entity
- *
- * @return bool Depending on success
- */
-function remove_from_river_by_object($object_guid) {
-	// Sanitise
-	$object_guid = (int) $object_guid;
+		'subject_guids'	       => ELGG_ENTITIES_ANY_VALUE,
+		'object_guids'         => ELGG_ENTITIES_ANY_VALUE,
+		'annotation_ids'       => ELGG_ENTITIES_ANY_VALUE,
 
-	// Load config
-	global $CONFIG;
+		'views'                => ELGG_ENTITIES_ANY_VALUE,
+		'action_types'         => ELGG_ENTITIES_ANY_VALUE,
 
-	// Remove
-	return delete_data("delete from {$CONFIG->dbprefix}river where object_guid = {$object_guid}");
-}
+		'types'	               => ELGG_ENTITIES_ANY_VALUE,
+		'subtypes'             => ELGG_ENTITIES_ANY_VALUE,
+		'type_subtype_pairs'   => ELGG_ENTITIES_ANY_VALUE,
 
-/**
- * Removes all items relating to a particular annotation being acted upon from the river
- *
- * @param int $annotation_id The ID of the annotation
- *
- * @return bool Depending on success
- * @since 1.7.0
- */
-function remove_from_river_by_annotation($annotation_id) {
-	// Sanitise
-	$annotation_id = (int) $annotation_id;
+		'posted_time_lower'	   => ELGG_ENTITIES_ANY_VALUE,
+		'posted_time_upper'	   => ELGG_ENTITIES_ANY_VALUE,
 
-	// Load config
-	global $CONFIG;
+		'wheres'               => array(),
+		'joins'                => array(),
 
-	// Remove
-	return delete_data("delete from {$CONFIG->dbprefix}river where annotation_id = {$annotation_id}");
-}
+	);
 
-/**
- * Removes a single river entry
- *
- * @param int $id The ID of the river entry
- *
- * @return bool Depending on success
- * @since 1.7.2
- */
-function remove_from_river_by_id($id) {
-	global $CONFIG;
+	$options = array_merge($defaults, $options);
 
-	// Sanitise
-	$id = (int) $id;
+	$singulars = array('id', 'subject_guid', 'object_guid', 'annotation_id', 'action_type', 'view', 'type', 'subtype');
+	$options = elgg_normalise_plural_options_array($options, $singulars);
+
+	$wheres = $options['wheres'];
+
+	$wheres[] = elgg_get_guid_based_where_sql('rv.id', $options['ids']);
+	$wheres[] = elgg_get_guid_based_where_sql('rv.subject_guid', $options['subject_guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('rv.object_guid', $options['object_guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('rv.annotation_id', $options['annotation_ids']);
+	$wheres[] = elgg_river_get_action_where_sql($options['action_types']);
+	$wheres[] = elgg_river_get_view_where_sql($options['views']);
+	$wheres[] = elgg_get_river_type_subtype_where_sql('rv', $options['types'],
+		$options['subtypes'], $options['type_subtype_pairs']);
+
+	if ($options['posted_time_lower'] && is_int($options['posted_time_lower'])) {
+		$wheres[] = "rv.posted >= {$options['posted_time_lower']}";
+	}
+
+	if ($options['posted_time_upper'] && is_int($options['posted_time_upper'])) {
+		$wheres[] = "rv.posted <= {$options['posted_time_upper']}";
+	}
+
+	// remove identical where clauses
+	$wheres = array_unique($wheres);
+
+	// see if any functions failed
+	// remove empty strings on successful functions
+	foreach ($wheres as $i => $where) {
+		if ($where === FALSE) {
+			return FALSE;
+		} elseif (empty($where)) {
+			unset($wheres[$i]);
+		}
+	}
+
+	$query = "DELETE rv.* FROM {$CONFIG->dbprefix}river rv ";
+
+	// add joins
+	foreach ($joins as $j) {
+		$query .= " $j ";
+	}
 
-	return delete_data("delete from {$CONFIG->dbprefix}river where id = {$id}");
+	// add wheres
+	$query .= ' WHERE ';
+
+	foreach ($wheres as $w) {
+		$query .= " $w AND ";
+	}
+	$query .= "1=1";
+
+	return delete_data($query);
 }
 
 /**
  * Get river items
  *
  * @param array $options
+ *   ids                  => INT|ARR River item id(s)
  *   subject_guids        => INT|ARR Subject guid(s)
  *   object_guids         => INT|ARR Object guid(s)
  *   annotation_ids       => INT|ARR The identifier of the annotation(s)
@@ -195,6 +235,8 @@ function elgg_get_river(array $options = array()) {
 	global $CONFIG;
 
 	$defaults = array(
+		'ids'                  => ELGG_ENTITIES_ANY_VALUE,
+
 		'subject_guids'	       => ELGG_ENTITIES_ANY_VALUE,
 		'object_guids'         => ELGG_ENTITIES_ANY_VALUE,
 		'annotation_ids'       => ELGG_ENTITIES_ANY_VALUE,
@@ -224,11 +266,12 @@ function elgg_get_river(array $options = array()) {
 
 	$options = array_merge($defaults, $options);
 
-	$singulars = array('subject_guid', 'object_guid', 'annotation_id', 'action_type', 'type', 'subtype');
+	$singulars = array('id', 'subject_guid', 'object_guid', 'annotation_id', 'action_type', 'type', 'subtype');
 	$options = elgg_normalise_plural_options_array($options, $singulars);
 
 	$wheres = $options['wheres'];
 
+	$wheres[] = elgg_get_guid_based_where_sql('rv.id', $options['ids']);
 	$wheres[] = elgg_get_guid_based_where_sql('rv.subject_guid', $options['subject_guids']);
 	$wheres[] = elgg_get_guid_based_where_sql('rv.object_guid', $options['object_guids']);
 	$wheres[] = elgg_get_guid_based_where_sql('rv.annotation_id', $options['annotation_ids']);
@@ -471,7 +514,7 @@ function elgg_river_get_action_where_sql($types) {
 
 	if (!is_array($types)) {
 		$types = sanitise_string($types);
-		return "'(rv.action_type = '$types')";
+		return "(rv.action_type = '$types')";
 	}
 
 	// sanitize types array
@@ -485,6 +528,35 @@ function elgg_river_get_action_where_sql($types) {
 }
 
 /**
+ * Get the where clause based on river view strings
+ *
+ * @param array $types Array of view strings
+ *
+ * @return string
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_river_get_view_where_sql($views) {
+	if (!$views) {
+		return '';
+	}
+
+	if (!is_array($views)) {
+		$views = sanitise_string($views);
+		return "(rv.view = '$views')";
+	}
+
+	// sanitize views array
+	$views_sanitized = array();
+	foreach ($views as $view) {
+		$views_sanitized[] = sanitise_string($view);
+	}
+
+	$view_str = implode("','", $views_sanitized);
+	return "(rv.view IN ('$view_str'))";
+}
+
+/**
  * Sets the access ID on river items for a particular object
  *
  * @param int $object_guid The GUID of the entity
diff --git a/engine/lib/sessions.php b/engine/lib/sessions.php
index ae42956a9..407bb69c5 100644
--- a/engine/lib/sessions.php
+++ b/engine/lib/sessions.php
@@ -472,7 +472,10 @@ function gatekeeper() {
 	if (!elgg_is_logged_in()) {
 		$_SESSION['last_forward_from'] = current_page_url();
 		register_error(elgg_echo('loggedinrequired'));
-		forward('', 'login');
+
+		if (!forward('', 'login')) {
+			throw new SecurityException(elgg_echo('SecurityException:UnexpectedOutputInGatekeeper'));
+		}
 	}
 }
 
@@ -487,7 +490,9 @@ function admin_gatekeeper() {
 	if (!elgg_is_admin_logged_in()) {
 		$_SESSION['last_forward_from'] = current_page_url();
 		register_error(elgg_echo('adminrequired'));
-		forward('', 'admin');
+		if (!forward('', 'admin')) {
+			throw new SecurityException(elgg_echo('SecurityException:UnexpectedOutputInGatekeeper'));
+		}
 	}
 }
 
diff --git a/engine/lib/upgrades/2011052801.php b/engine/lib/upgrades/2011052801.php
new file mode 100644
index 000000000..8084bc06c
--- /dev/null
+++ b/engine/lib/upgrades/2011052801.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Make sure all users have the relationship member_of_site
+ */
+global $DB_QUERY_CACHE, $DB_PROFILE, $ENTITY_CACHE, $CONFIG;
+$db_prefix = get_config('dbprefix');
+
+$limit = 100;
+
+$q = "SELECT e.* FROM {$db_prefix}entities e
+	WHERE e.type = 'user' AND e.guid NOT IN (
+		SELECT guid_one FROM {$db_prefix}entity_relationships
+			WHERE guid_two = 1 AND relationship = 'member_of_site'
+		)
+	LIMIT $limit";
+
+$users = get_data($q);
+
+while ($users) {
+	$DB_QUERY_CACHE = $DB_PROFILE = $ENTITY_CACHE = array();
+
+	// do manually to not trigger any events because these aren't new users.
+	foreach ($users as $user) {
+		$rel_q = "INSERT INTO {$db_prefix}entity_relationships VALUES (
+			'',
+			'$user->guid',
+			'member_of_site',
+			'$user->site_guid',
+			'$user->time_created'
+		)";
+
+		insert_data($rel_q);
+	}
+
+	// every time we run this query we've just reduced the rows it returns by $limit
+	// so don't pass an offset.
+	$q = "SELECT e.* FROM {$db_prefix}entities e
+		WHERE e.type = 'user' AND e.guid NOT IN (
+			SELECT guid_one FROM {$db_prefix}entity_relationships
+				WHERE guid_two = 1 AND relationship = 'member_of_site'
+			)
+		LIMIT $limit";
+
+	$users = get_data($q);
+}
\ No newline at end of file
diff --git a/engine/lib/upgrades/2011061200-1.8b1-sites_need_a_site_guid-6d9dcbf46c0826cc.php b/engine/lib/upgrades/2011061200-1.8b1-sites_need_a_site_guid-6d9dcbf46c0826cc.php
new file mode 100644
index 000000000..4fc59ac41
--- /dev/null
+++ b/engine/lib/upgrades/2011061200-1.8b1-sites_need_a_site_guid-6d9dcbf46c0826cc.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Elgg 1.8b1 upgrade 2011061200
+ * sites_need_a_site_guid
+ *
+ * Sites did not have a site guid. This causes problems with getting
+ * metadata on site objects since we default to the current site.
+ */
+
+global $CONFIG;
+
+$ia = elgg_set_ignore_access(true);
+$access_status = access_get_show_hidden_status();
+access_show_hidden_entities(true);
+
+$options = array(
+	'type' => 'site',
+	'site_guid' => 0,
+);
+$batch = new ElggBatch('elgg_get_entities', $options);
+
+foreach ($batch as $entity) {
+	if (!$entity->site_guid) {
+		update_data("UPDATE {$CONFIG->dbprefix}entities SET site_guid=$entity->guid
+				WHERE guid=$entity->guid");
+	}
+}
+
+access_show_hidden_entities($access_status);
+elgg_set_ignore_access($ia);
diff --git a/engine/lib/users.php b/engine/lib/users.php
index dcec36ba5..59bfa1259 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -748,40 +748,6 @@ function execute_new_password_request($user_guid, $conf_code) {
 }
 
 /**
- * Handles pages for password reset requests.
- *
- * @param array $page Pages array
- *
- * @return void
- */
-function elgg_user_resetpassword_page_handler($page) {
-
-	$user_guid = get_input('u');
-	$code = get_input('c');
-
-	$user = get_entity($user_guid);
-
-	// don't check code here to avoid automated attacks
-	if (!$user instanceof ElggUser) {
-		register_error(elgg_echo('user:passwordreset:unknown_user'));
-		forward();
-	}
-
-	$params = array(
-		'guid' => $user_guid,
-		'code' => $code,
-	);
-	$form = elgg_view_form('user/passwordreset', array(), $params);
-
-	$title = elgg_echo('resetpassword');
-	$content = elgg_view_title(elgg_echo('resetpassword')) . $form;
-
-	$body = elgg_view_layout('one_column', array('content' => $content));
-
-	echo elgg_view_page($title, $body);
-}
-
-/**
  * Simple function that will generate a random clear text password
  * suitable for feeding into generate_user_password().
  *
@@ -1074,7 +1040,7 @@ function collections_submenu_items() {
  */
 function friends_page_handler($page_elements) {
 	if (isset($page_elements[0]) && $user = get_user_by_username($page_elements[0])) {
-		set_page_owner($user->getGUID());
+		elgg_set_page_owner_guid($user->getGUID());
 	}
 	if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
 		collections_submenu_items();
@@ -1129,26 +1095,27 @@ function collections_page_handler($page_elements) {
 }
 
 /**
- * Page handler for dashboard
+ * Page handler for account related pages
  *
- * @param array $page_elements Page elements
+ * @param array  $page_elements Page elements
+ * @param string $handler The handler string
  *
  * @return void
  */
-function dashboard_page_handler($page_elements) {
-	require_once(dirname(dirname(dirname(__FILE__))) . "/pages/dashboard.php");
-}
-
-
-/**
- * Page handler for registration
- *
- * @param array $page_elements Page elements
- *
- * @return void
- */
-function registration_page_handler($page_elements) {
-	require_once(dirname(dirname(dirname(__FILE__))) . "/pages/account/register.php");
+function elgg_user_account_page_handler($page_elements, $handler) {
+
+	$base_dir = elgg_get_root_path() . 'pages/account';
+	switch ($handler) {
+		case 'forgotpassword':
+			require_once("$base_dir/forgotten_password.php");
+			break;
+		case 'resetpassword':
+			require_once("$base_dir/reset_password.php");
+			break;
+		case 'register':
+			require_once("$base_dir/register.php");
+			break;
+	}
 }
 
 /**
@@ -1309,6 +1276,41 @@ function elgg_user_hover_menu($hook, $type, $return, $params) {
 	return $return;
 }
 
+function elgg_users_setup_entity_menu($hook, $type, $return, $params) {
+	if (elgg_in_context('widgets')) {
+		return $return;
+	}
+
+	$entity = $params['entity'];
+	if (!elgg_instanceof($entity, 'user')) {
+		return $return;
+	}
+
+	if ($entity->isBanned()) {
+		$banned = elgg_echo('banned');
+		$options = array(
+			'name' => 'banned',
+			'text' => "<span>$banned</span>",
+			'href' => false,
+			'priority' => 0,
+		);
+		$return = array(ElggMenuItem::factory($options));
+	} else {
+		$return = array();
+		if (isset($entity->location)) {
+			$options = array(
+				'name' => 'location',
+				'text' => "<span>$entity->location</span>",
+				'href' => false,
+				'priority' => 150,
+			);
+			$return[] = ElggMenuItem::factory($options);
+		}
+	}
+
+	return $return;
+}
+
 /**
  * This function loads a set of default fields into the profile, then triggers a hook letting other plugins to edit
  * add and delete fields.
@@ -1322,7 +1324,7 @@ function elgg_profile_fields_setup() {
 	$profile_defaults = array (
 		'description' => 'longtext',
 		'briefdescription' => 'text',
-		'location' => 'tags',
+		'location' => 'location',
 		'interests' => 'tags',
 		'skills' => 'tags',
 		'contactemail' => 'email',
@@ -1356,7 +1358,7 @@ function elgg_profile_fields_setup() {
 
 	// register any tag metadata names
 	foreach ($CONFIG->profile_fields as $name => $type) {
-		if ($type == 'tags') {
+		if ($type == 'tags' || $type == 'location' || $type == 'tag') {
 			elgg_register_tag_metadata_name($name);
 			// register a tag name translation
 			add_translation(get_current_language(), array("tag_names:$name" => elgg_echo("profile:$name")));
@@ -1451,6 +1453,7 @@ function users_pagesetup() {
 			'href' =>  $user->getURL(),
 			'text' => "<img src=\"$icon_url\" alt=\"$user->name\" title=\"$title\" class=\"$class\" />",
 			'priority' => 100,
+			'link_class' => 'elgg-topbar-avatar',
 		));
 
 		elgg_register_menu_item('topbar', array(
@@ -1490,9 +1493,9 @@ function users_init() {
 
 	elgg_register_page_handler('friends', 'friends_page_handler');
 	elgg_register_page_handler('friendsof', 'friends_of_page_handler');
-	elgg_register_page_handler('dashboard', 'dashboard_page_handler');
-	elgg_register_page_handler('register', 'registration_page_handler');
-	elgg_register_page_handler('resetpassword', 'elgg_user_resetpassword_page_handler');
+	elgg_register_page_handler('register', 'elgg_user_account_page_handler');
+	elgg_register_page_handler('forgotpassword', 'elgg_user_account_page_handler');
+	elgg_register_page_handler('resetpassword', 'elgg_user_account_page_handler');
 	elgg_register_page_handler('login', 'elgg_user_login_page_handler');
 	elgg_register_page_handler('avatar', 'elgg_avatar_page_handler');
 	elgg_register_page_handler('profile', 'elgg_profile_page_handler');
@@ -1529,6 +1532,8 @@ function users_init() {
 	// Register the user type
 	elgg_register_entity_type('user', '');
 
+	elgg_register_plugin_hook_handler('register', 'menu:entity', 'elgg_users_setup_entity_menu', 501);
+
 	elgg_register_event_handler('create', 'user', 'user_create_hook_add_site_relationship');
 }
 
diff --git a/index.php b/index.php
index 9cd0b2f02..708e38ec9 100644
--- a/index.php
+++ b/index.php
@@ -26,9 +26,6 @@ if (elgg_is_logged_in()) {
 $content = elgg_view_title(elgg_echo('content:latest'));
 $content .= elgg_list_river();
 
-global $autofeed;
-$autofeed = FALSE;
-
 $login_box = elgg_view('core/account/login_box');
 
 $params = array(
diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 1bf4808ef..c07839065 100644
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -2,7 +2,27 @@
 
 /**
  * Elgg Installer.
- * Controller for installing Elgg.
+ * Controller for installing Elgg. Supports both web-based on CLI installation.
+ *
+ * This controller steps the user through the install process. The method for
+ * each step handles both the GET and POST requests. There is no XSS/CSRF protection
+ * on the POST processing since the installer is only run once by the administrator.
+ *
+ * The installation process can be resumed by hitting the first page. The installer
+ * will try to figure out where to pick up again.
+ *
+ * All the logic for the installation process is in this class, but it depends on
+ * the core libraries. To do this, we selectively load a subset of the core libraries
+ * for the first few steps and then load the entire engine once the database and
+ * site settings are configured. In addition, this controller does its own session
+ * handling until the database is setup.
+ *
+ * There is an aborted attempt in the code at creating the data directory for
+ * users as a subdirectory of Elgg's root. The idea was to protect this directory
+ * through a .htaccess file. The problem is that a malicious user can upload a
+ * .htaccess of his own that overrides the protection for his user directory. The
+ * best solution is server level configuration that turns off AllowOverride for the
+ * data directory. See ticket #3453 for discussion on this.
  *
  * @package    Elgg.Core
  * @subpackage Installer
@@ -32,6 +52,9 @@ class ElggInstaller {
 	 * Constructor bootstraps the Elgg engine
 	 */
 	public function __construct() {
+		// load ElggRewriteTester as we depend on it
+		require_once(dirname(__FILE__) . "/ElggRewriteTester.php");
+
 		$this->isAction = $_SERVER['REQUEST_METHOD'] === 'POST';
 
 		$this->bootstrapConfig();
@@ -140,7 +163,6 @@ class ElggInstaller {
 		$params['password1'] = $params['password2'] = $params['password'];
 
 		if ($createHtaccess) {
-			require_once(dirname(__FILE__) . "/ElggRewriteTester.php");
 			$rewriteTester = new ElggRewriteTester();
 			if (!$rewriteTester->createHtaccess($CONFIG->path)) {
 				throw new InstallationException(elgg_echo('install:error:htaccess'));
@@ -278,7 +300,7 @@ class ElggInstaller {
 			'dbpassword' => array(
 				'type' => 'password',
 				'value' => '',
-				'required' => TRUE,
+				'required' => FALSE,
 				),
 			'dbname' => array(
 				'type' => 'text',
@@ -355,7 +377,6 @@ class ElggInstaller {
 	protected function settings($submissionVars) {
 		global $CONFIG;
 
-		$languages = get_installed_translations();
 		$formVars = array(
 			'sitename' => array(
 				'type' => 'text',
@@ -389,8 +410,19 @@ class ElggInstaller {
 				),
 		);
 
+		// if Apache, we give user option of having Elgg create data directory
+		//if (ElggRewriteTester::guessWebServer() == 'apache') {
+		//	$formVars['dataroot']['type'] = 'combo';
+		//	$CONFIG->translations['en']['install:settings:help:dataroot'] =
+		//			$CONFIG->translations['en']['install:settings:help:dataroot:apache'];
+		//}
+
 		if ($this->isAction) {
 			do {
+				//if (!$this->createDataDirectory($submissionVars, $formVars)) {
+				//	break;
+				//}
+
 				if (!$this->validateSettingsVars($submissionVars, $formVars)) {
 					break;
 				}
@@ -448,7 +480,7 @@ class ElggInstaller {
 				'required' => TRUE,
 				),
 		);
-
+		
 		if ($this->isAction) {
 			do {
 				if (!$this->validateAdminVars($submissionVars, $formVars)) {
@@ -492,6 +524,8 @@ class ElggInstaller {
 			$params['destination'] = 'index.php';
 		}
 
+		elgg_invalidate_simplecache();
+
 		$this->render('complete', $params);
 	}
 
@@ -709,6 +743,12 @@ class ElggInstaller {
 			session_name('Elgg');
 			session_start();
 			elgg_unregister_event_handler('boot', 'system', 'session_init');
+		} else if (!$this->isAction && $stepIndex == ($settingsIndex + 1)) {
+			// now using Elgg session handling so need to pass forward the system messages
+			// this is called on the GET of the next step
+			session_name('Elgg');
+			session_start();
+			$messages = $_SESSION['msg'];
 		}
 
 		if ($stepIndex > $dbIndex) {
@@ -745,12 +785,15 @@ class ElggInstaller {
 				}
 			}
 
-			$this->initGlobals();
-
 			set_default_config();
 
 			elgg_trigger_event('boot', 'system');
 			elgg_trigger_event('init', 'system');
+
+			// @hack finish the process of pushing system messages into new session
+			if (!$this->isAction && $stepIndex == ($settingsIndex + 1)) {
+				$_SESSION['msg'] = $messages;
+			}
 		}
 	}
 
@@ -1025,8 +1068,6 @@ class ElggInstaller {
 	protected function checkRewriteRules(&$report) {
 		global $CONFIG;
 
-		require_once(dirname(__FILE__) . "/ElggRewriteTester.php");
-
 		$tester = new ElggRewriteTester();
 		$url = elgg_get_site_url() . "rewrite.php";
 		$report['rewrite'] = array($tester->run($url, $CONFIG->path));
@@ -1221,6 +1262,39 @@ class ElggInstaller {
 	 */
 
 	/**
+	 * Create the data directory if requested
+	 *
+	 * @param array $submissionVars Submitted vars
+	 * @param array $formVars       Variables in the form
+	 * @return bool
+	 */
+	protected function createDataDirectory(&$submissionVars, $formVars) {
+		// did the user have option of Elgg creating the data directory
+		if ($formVars['dataroot']['type'] != 'combo') {
+			return TRUE;
+		}
+
+		// did the user select the option
+		if ($submissionVars['dataroot'] != 'dataroot-checkbox') {
+			return TRUE;
+		}
+
+		$dir = sanitise_filepath($submissionVars['path']) . 'data';
+		if (file_exists($dir) || mkdir($dir, 0700)) {
+			$submissionVars['dataroot'] = $dir;
+			if (!file_exists("$dir/.htaccess")) {
+				$htaccess = "Order Deny,Allow\nDeny from All\n";
+				if (!file_put_contents("$dir/.htaccess", $htaccess)) {
+					return FALSE;
+				}
+			}
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
+	/**
 	 * Validate the site settings form variables
 	 *
 	 * @param array $submissionVars Submitted vars
@@ -1229,6 +1303,7 @@ class ElggInstaller {
 	 * @return bool
 	 */
 	protected function validateSettingsVars($submissionVars, $formVars) {
+		global $CONFIG;
 
 		foreach ($formVars as $field => $info) {
 			$submissionVars[$field] = trim($submissionVars[$field]);
@@ -1239,7 +1314,7 @@ class ElggInstaller {
 			}
 		}
 
-		// check that data root is writable
+		// check that data root exists
 		if (!file_exists($submissionVars['dataroot'])) {
 			$msg = elgg_echo('install:error:datadirectoryexists', array($submissionVars['dataroot']));
 			register_error($msg);
@@ -1253,11 +1328,13 @@ class ElggInstaller {
 			return FALSE;
 		}
 
-		// check that data root is not subdirectory of Elgg root
-		if (stripos($submissionVars['dataroot'], $submissionVars['path']) !== FALSE) {
-			$msg = elgg_echo('install:error:locationdatadirectory', array($submissionVars['dataroot']));
-			register_error($msg);
-			return FALSE;
+		if (!isset($CONFIG->data_dir_override) || !$CONFIG->data_dir_override) {
+			// check that data root is not subdirectory of Elgg root
+			if (stripos($submissionVars['dataroot'], $submissionVars['path']) === 0) {
+				$msg = elgg_echo('install:error:locationdatadirectory', array($submissionVars['dataroot']));
+				register_error($msg);
+				return FALSE;
+			}
 		}
 
 		// check that email address is email address
@@ -1329,8 +1406,6 @@ class ElggInstaller {
 		$CONFIG->dataroot = $dataroot;
 		$cache = new ElggFileCache($dataroot);
 		$cache->delete('view_paths');
-		elgg_invalidate_simplecache();
-		elgg_regenerate_simplecache();
 
 		return TRUE;
 	}
@@ -1344,8 +1419,8 @@ class ElggInstaller {
 		elgg_generate_plugin_entities();
 		$plugins = elgg_get_plugins('any');
 		foreach ($plugins as $plugin) {
-			if ($plugin->manifest) {
-				if ($plugin->manifest->getActivateOnInstall()) {
+			if ($plugin->getManifest()) {
+				if ($plugin->getManifest()->getActivateOnInstall()) {
 					$plugin->activate();
 				}
 			}
@@ -1449,19 +1524,4 @@ class ElggInstaller {
 
 		return TRUE;
 	}
-
-	/**
-	 * Init globals because engine loaded within a function
-	 *
-	 * @return void
-	 */
-	protected function initGlobals() {
-		global $DB_QUERY_CACHE, $DB_DELAYED_QUERIES;
-		$DB_QUERY_CACHE = array();
-		$DB_DELAYED_QUERIES = array();
-
-		global $METASTRINGS_CACHE, $METASTRINGS_DEADNAME_CACHE;
-		$METASTRINGS_CACHE = array();
-		$METASTRINGS_DEADNAME_CACHE = array();
-	}
 }
diff --git a/install/ElggRewriteTester.php b/install/ElggRewriteTester.php
index c8a503cb8..c01510f60 100644
--- a/install/ElggRewriteTester.php
+++ b/install/ElggRewriteTester.php
@@ -30,7 +30,7 @@ class ElggRewriteTester {
 	 */
 	public function run($url, $path) {
 
-		$this->guessWebServer();
+		$this->webserver = ElggRewriteTester::guessWebServer();
 
 		$this->rewriteTestPassed = $this->runRewriteTest($url);
 
@@ -48,17 +48,17 @@ class ElggRewriteTester {
 	/**
 	 * Guess the web server from $_SERVER['SERVER_SOFTWARE']
 	 *
-	 * @return void
+	 * @return string
 	 */
-	protected function guessWebServer() {
+	public static function guessWebServer() {
 		$serverString = strtolower($_SERVER['SERVER_SOFTWARE']);
 		$possibleServers = array('apache', 'nginx', 'lighttpd', 'iis');
 		foreach ($possibleServers as $server) {
 			if (strpos($serverString, $server) !== FALSE) {
-				$this->webserver = $server;
-				return;
+				return $server;
 			}
 		}
+		return 'unknown';
 	}
 
 	/**
diff --git a/install/css/install.css b/install/css/install.css
index 8dba57949..e7290c130 100644
--- a/install/css/install.css
+++ b/install/css/install.css
@@ -62,13 +62,6 @@ ul {
 	list-style: none;
 }
 
-.clearfloat {
-	clear:both;
-	height:0;
-	font-size: 1px;
-	line-height: 0px;
-}
-
 .elgg-page {
 	width: 880px;
 	margin: auto;
@@ -88,12 +81,12 @@ ul {
 
 .elgg-page-body:after,
 .elgg-page-header:after {
-	display:block;
-	content:'.';
-	line-height:0;
-	height:0;
+	display: block;
+	content: '.';
+	line-height: 0;
+	height: 0;
 	visibility: hidden;
-	clear:both;
+	clear: both;
 }
 
 .elgg-sidebar {
@@ -101,9 +94,9 @@ ul {
 	width: 250px;
 }
 .elgg-body {
-	overflow:hidden;
+	overflow: hidden;
 	min-height: 320px;
-	padding-bottom: 60px;
+	padding-bottom: 10px;
 	position: relative;
 }
 .elgg-page-footer {
@@ -115,7 +108,7 @@ ul {
 	margin-bottom: 40px;
 }
 
-.install-nav {
+.elgg-install-nav {
 	width: 100%;
 	text-align: right;
 	position: absolute;
@@ -156,35 +149,33 @@ h3 {
 	margin: 15px 0 5px;
 }
 
+form > div {
+	margin-bottom: 15px;
+}
 label {
 	font-weight: bold;
-	color:#333333;
+	color: #333333;
 	font-size: 140%;
 }
+.elgg-combo-label {
+	font-size: 120%;
+}
 input[type="text"],
 input[type="password"]  {
 	font: 120% Arial, Helvetica, sans-serif;
 	padding: 5px;
 	border: 1px solid #cccccc;
-	color:#666666;
-	width:566px;
+	color: #666666;
+	width: 96%;
 }
 .database-settings input[type="text"],
 .database-settings input[type="password"] {
-	width:220px;
-}
-textarea {
-	width: 100%;
-	height: 100%;
-	font: 120% Arial, Helvetica, sans-serif;
-	border: solid 1px #cccccc;
-	padding: 5px;
-	color:#666666;
+	width: 220px;
 }
-textarea:focus, input[type="password"]:focus, input[type="text"]:focus {
+input[type="password"]:focus, input[type="text"]:focus {
 	border: solid 1px #4690d6;
 	background: #e4ecf5;
-	color:#333333;
+	color: #333333;
 }
 input[type="submit"] {
 	font-family: Arial, Helvetica, sans-serif;
@@ -205,12 +196,10 @@ input[type="submit"] {
 	cursor: pointer;
 	float: right;
 }
-
 input[type="submit"]:hover {
 	background: #0054a7;
 	border: 4px solid #0054a7;
 }
-
 select {
 	display: block;
 	padding: 5px;
@@ -220,7 +209,11 @@ select {
 	font-size: 90%;
 }
 
-.install-nav a {
+.elgg-require-database {
+	padding-bottom: 50px;
+}
+
+.elgg-install-nav a {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 16px;
 	font-weight: bold;
@@ -238,12 +231,13 @@ select {
 	float: right;
 }
 
-.install-nav a:hover {
+.elgg-install-nav a:hover {
 	text-decoration: none;
 	background: #0054a7;
 	border: 4px solid #0054a7;
 }
-.install-nav .disabled, .install-nav .disabled:hover {
+.elgg-install-nav .elgg-state-disabled,
+.elgg-install-nav .elgg-state-disabled:hover {
 	background: #555555;
 	border-color: #555555;
 	cursor: default;
@@ -264,6 +258,11 @@ select {
 	background: #F7DAD8;
 }
 
+.elgg-state-warning {
+	border: 1px solid #ded0a9;
+	background: #FEF5AA;
+}
+
 .elgg-body li {
 	margin-top: 5px;
 	padding: 5px;
diff --git a/install/js/install.js b/install/js/install.js
new file mode 100644
index 000000000..49b2be10c
--- /dev/null
+++ b/install/js/install.js
@@ -0,0 +1,21 @@
+
+$(function() {
+	// prevent double-submission of forms
+	$('form').submit(function() {
+		if ($(this).data('submitted')) {
+			return false;
+		}
+		$(this).data('submitted', true);
+		return true;
+	});
+
+	// toggle the disable attribute of text box based on checkbox
+	$('.elgg-combo-checkbox').click(function() {
+		if ($(this).is(':checked')) {
+			$(this).prev().attr('disabled', true);
+			$(this).prev().val('');
+		} else {
+			$(this).prev().attr('disabled', false);
+		}
+	});
+});
diff --git a/install/languages/en.php b/install/languages/en.php
index 80716069d..3e2569669 100644
--- a/install/languages/en.php
+++ b/install/languages/en.php
@@ -70,7 +70,7 @@ If you are ready to proceed, click the Next button.",
 	'install:database:help:dbhost' => 'Hostname of the MySQL server (usually localhost)',
 	'install:database:help:dbprefix' => "The prefix given to all of Elgg's tables (usually elgg_)",
 
-	'install:settings:instructions' => "We need some information about the site as we configure Elgg. If you haven't created a data directory for Elgg, please do so before completing this step.",
+	'install:settings:instructions' => 'We need some information about the site as we configure Elgg. If you haven\'t <a href="http://docs.elgg.org/wiki/Data_directory" target="_blank">created a data directory</a> for Elgg, you need to do so now.',
 
 	'install:settings:label:sitename' => 'Site Name',
 	'install:settings:label:siteemail' => 'Site Email Address',
@@ -79,12 +79,14 @@ If you are ready to proceed, click the Next button.",
 	'install:settings:label:dataroot' => 'Data Directory',
 	'install:settings:label:language' => 'Site Language',
 	'install:settings:label:siteaccess' => 'Default Site Access',
+	'install:label:combo:dataroot' => 'Elgg creates data directory',
 
 	'install:settings:help:sitename' => 'The name of your new Elgg site',
 	'install:settings:help:siteemail' => 'Email address used by Elgg for communication with users',
 	'install:settings:help:wwwroot' => 'The address of the site (Elgg usually guesses this correctly)',
 	'install:settings:help:path' => 'The directory where you put the Elgg code (Elgg usually guesses this correctly)',
 	'install:settings:help:dataroot' => 'The directory that you created for Elgg to save files (the permissions on this directory are checked when you click Next)',
+	'install:settings:help:dataroot:apache' => 'You have the option of Elgg creating the data directory or entering the directory that you already created for storing user files (the permissions on this directory are checked when you click Next)',
 	'install:settings:help:language' => 'The default language for the site',
 	'install:settings:help:siteaccess' => 'The default access level for new user created content',
 
diff --git a/js/lib/security.js b/js/lib/security.js
index fa0a6f7ef..486347b88 100644
--- a/js/lib/security.js
+++ b/js/lib/security.js
@@ -21,8 +21,8 @@ elgg.security.setToken = function(json) {
 	$('[name=__elgg_ts]').val(json.__elgg_ts);
 	$('[name=__elgg_token]').val(json.__elgg_token);
 
-	//also update all links
-	$('[href]').each(function() {
+	// also update all links that contain tokens and time stamps
+	$('[href*="__elgg_ts"][href*="__elgg_token"]').each(function() {
 		this.href = this.href
 			.replace(/__elgg_ts=\d*/, '__elgg_ts=' + json.__elgg_ts)
 			.replace(/__elgg_token=[0-9a-f]*/, '__elgg_token=' + json.__elgg_token);
diff --git a/js/lib/ui.js b/js/lib/ui.js
index 16f1f969c..692311d73 100644
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -36,6 +36,7 @@ elgg.ui.init = function () {
 elgg.ui.toggles = function(event) {
 	event.preventDefault();
 
+	// @todo might want to switch this to elgg.getSelectorFromUrlFragment().
 	var target = $(this).toggleClass('elgg-state-active').attr('href');
 
 	$(target).slideToggle('medium');
@@ -220,7 +221,7 @@ elgg.ui.initHoverMenu = function(parent) {
  * @return void
  */
 elgg.ui.requiresConfirmation = function(e) {
-	var confirmText = $(this).attr('title') || elgg.echo('question:areyousure');
+	var confirmText = $(this).attr('rel') || elgg.echo('question:areyousure');
 	if (!confirm(confirmText)) {
 		e.preventDefault();
 	}
diff --git a/js/lib/userpicker.js b/js/lib/userpicker.js
index 475af150f..826bf21a0 100644
--- a/js/lib/userpicker.js
+++ b/js/lib/userpicker.js
@@ -75,9 +75,9 @@ elgg.userpicker.removeUser = function(link, guid) {
 
 elgg.userpicker.getSearchParams = function(e) {
 	if ($(e).closest('.elgg-user-picker').find('[name=match_on]').attr('checked')) {
-		return {'match_on[]': 'friends'};
+		return {'match_on[]': 'friends', 'term' : e.term};
 	} else {
-		return {'match_on[]': 'users'};
+		return {'match_on[]': 'users', 'term' : e.term};
 	}
 }
 
diff --git a/languages/en.php b/languages/en.php
index 5fbf50142..dcba9abc3 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -81,7 +81,6 @@ $english = array(
 	'ElggPlugin:Exception:CannotIncludeFile' => 'Cannot include %s for plugin %s (guid: %s) at %s.  Check permissions!',
 	'ElggPlugin:Exception:CannotRegisterViews' => 'Cannot open views dir for plugin %s (guid: %s) at %s.  Check permissions!',
 	'ElggPlugin:Exception:CannotRegisterLanguages' => 'Cannot register languages for plugin %s (guid: %s) at %s.  Check permissions!',
-	'ElggPlugin:Exception:CannotRegisterClasses' => 'Cannot register classes for plugin %s (guid: %s) at %s.  Check permissions!',
 	'ElggPlugin:Exception:NoID' => 'No ID for plugin guid %s!',
 
 	'PluginException:ParserError' => 'Error parsing manifest with API version %s in plugin %s.',
@@ -171,6 +170,7 @@ $english = array(
 	'ConfigurationException:NoSiteID' => "No site ID has been specified.",
 	'SecurityException:APIAccessDenied' => "Sorry, API access has been disabled by the administrator.",
 	'SecurityException:NoAuthMethods' => "No authentication methods were found that could authenticate this API request.",
+	'SecurityException:UnexpectedOutputInGatekeeper' => 'Unexpected output in gatekeeper call. Halting execution for security. Search http://docs.elgg.org/ for more information.',
 	'InvalidParameterException:APIMethodOrFunctionNotSet' => "Method or function not set in call in expose_method()",
 	'InvalidParameterException:APIParametersArrayStructure' => "Parameters array structure is incorrect for call to expose method '%s'",
 	'InvalidParameterException:UnrecognisedHttpMethod' => "Unrecognised http method %s for api method '%s'",
@@ -344,8 +344,6 @@ $english = array(
 	'friends:collections:members' => "Collection members",
 	'friends:collections:edit' => "Edit collection",
 
-	'friends:river:add' => "is now a friend with %s",
-
 	'friendspicker:chararray' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
 
 	'avatar' => 'Avatar',
@@ -377,7 +375,7 @@ $english = array(
 	'profile:twitter' => "Twitter username",
 	'profile:saved' => "Your profile was successfully saved.",
 
-	'admin:appearance:profile_fields' => 'Edit profile fields',
+	'admin:appearance:profile_fields' => 'Edit Profile Fields',
 	'profile:edit:default' => 'Edit profile fields',
 	'profile:label' => "Profile label",
 	'profile:type' => "Profile type",
@@ -406,6 +404,8 @@ $english = array(
  */
 	'river' => "River",
 	'river:relationship:friend' => 'is now friends with',
+	'friends:river:add' => "is now a friend with %s",
+	'profile:river:iconupdate' => 'updated their profile icon',
 	'river:noaccess' => 'You do not have permission to view this item.',
 	'river:posted:generic' => '%s posted',
 	'riveritem:single:user' => 'a user',
@@ -573,32 +573,20 @@ $english = array(
 	'admin:widget:admin_welcome' => 'Welcome',
 	'admin:widget:admin_welcome:help' => "A short introduction to Elgg's admin area",
 	'admin:widget:admin_welcome:intro' =>
-'Welcome to Elgg!  This widget is a quick overview of setting up and maintaining your new Elgg site.',
+'Welcome to Elgg! Right now you are looking at the administration dashboard. It\'s useful for tracking what\'s happening on the site.',
 
 	'admin:widget:admin_welcome:admin_overview' =>
-'This page is the Admin Dashboard and provides a quick overview of your system. '
-. "You can <a class=\"elgg-toggler\" href=\"#widgets-add-panel\">add</a>"
-. " and rearrange widgets to show the information you care about.  The menu to the right is oranganized into"
-. " three areas:
-	<ul>
-		<li>Administer - Everyday tasks like monitoring reported content, checking online users, and viewing logs.</li>
-		<li>Configure - Configuration settings likes the site name, the active plugins, and plugin settings.</li>
-		<li>Develop - If developer settings are enabled, shows options for developers like a theme preview and event explorer.</li>
-	</ul>
+"Navigation for the administration area is provided by the menu to the right. It is organized into"
+. " three sections:
+	<dl>
+		<dt>Administer</dt><dd>Everyday tasks like monitoring reported content, checking who is online, and viewing statistics.</dd>
+		<dt>Configure</dt><dd>Occasional tasks like setting the site name or activating a plugin.</dd>
+		<dt>Develop</dt><dd>For developers who are building plugins or designing themes. (Requires a developer plugin.)</dd>
+	</dl>
 	",
 
-	'admin:widget:admin_welcome:common_links' =>
-'The first section you should visit is the <a href="%s">Plugins page</a> to activate or deactivate site features.'
-. ' If you\'re not quite ready to have users on your site, think about disabling registration and'
-. ' restricting content to logged in users on the <a href="%s">Advanced Site Settings page</a>.',
-
-	'admin:widget:admin_welcome:external_resources' =>
-"There are many resources available for help with your network.  Check the links in the footer for"
-. " <a href=\"http://docs.elgg.org/wiki/Category:Administration_FAQ\">FAQs</a>, <a href=\"http://docs.elgg.org/wiki/Administration_Manual\">"
-. "manuals</a>, <a href=\"http://blog.elgg.org/\">Elgg news</a>, and <a href=\"http://community.elgg.org/pg/groups/world/\">support forums</a>"
-. " at the <a href=\"http://community.elgg.org/\">Elgg Community</a>.",
-
-	'admin:widget:admin_welcome:outro' => 'Thank you for using Elgg!',
+	// argh, this is ugly
+	'admin:widget:admin_welcome:outro' => '<br />Be sure to check out the resources available through the footer links and thank you for using Elgg!',
 
 	'admin:footer:faq' => 'Administration FAQ',
 	'admin:footer:manual' => 'Administration Manual',
@@ -606,12 +594,24 @@ $english = array(
 	'admin:footer:blog' => 'Elgg Blog',
 
 	'admin:plugins:category:all' => 'All plugins',
+	'admin:plugins:category:active' => 'Active plugins',
+	'admin:plugins:category:inactive' => 'Inactive plugins',
 	'admin:plugins:category:admin' => 'Admin',
 	'admin:plugins:category:bundled' => 'Bundled',
 	'admin:plugins:category:content' => 'Content',
 	'admin:plugins:category:development' => 'Development',
-	'admin:plugins:category:extension' => 'Extensions',
-	'admin:plugins:category:service' => 'Service/API',
+	'admin:plugins:category:enhancement' => 'Enhancements',
+	'admin:plugins:category:api' => 'Service/API',
+	'admin:plugins:category:communication' => 'Communication',
+	'admin:plugins:category:security' => 'Security and Spam',
+	'admin:plugins:category:social' => 'Social',
+	'admin:plugins:category:multimedia' => 'Multimedia',
+	'admin:plugins:category:theme' => 'Themes',
+	'admin:plugins:category:widget' => 'Widgets',
+
+	'admin:plugins:sort:priority' => 'Priority',
+	'admin:plugins:sort:alpha' => 'Alphabetical',
+	'admin:plugins:sort:date' => 'Newest',
 
 	'admin:plugins:markdown:unknown_plugin' => 'Unknown plugin.',
 	'admin:plugins:markdown:unknown_file' => 'Unknown file.',
@@ -650,7 +650,7 @@ $english = array(
 	'admin:plugins:warning:elgg_version_unknown' => 'This plugin uses a legacy manifest file and does not specify a compatible Elgg version. It probably will not work!',
 	'admin:plugins:warning:unmet_dependencies' => 'This plugin has unmet dependencies and cannot be activated. Check dependencies under more info.',
 	'admin:plugins:warning:invalid' => '%s is not a valid Elgg plugin.  Check <a href="http://docs.elgg.org/Invalid_Plugin">the Elgg documentation</a> for troubleshooting tips.',
-	'admin:plugins:cannot_activate' => 'Cannot Activate',
+	'admin:plugins:cannot_activate' => 'cannot activate',
 
 	'admin:plugins:set_priority:yes' => "Reordered %s.",
 	'admin:plugins:set_priority:no' => "Could not reorder %s.",
@@ -668,6 +668,7 @@ $english = array(
 	'admin:plugins:simple_simple_fail' => 'Could not save settings.',
 	'admin:plugins:simple_simple_success' => 'Settings saved.',
 	'admin:plugins:simple:cannot_activate' => 'Cannot activate this plugin. Check the advanced plugin admin area for more information.',
+	'admin:plugins:warning:unmet_dependencies_active' => 'This plugin is active but has unmet dependencies. You may encounter problems. See "more info" below for details.',
 
 	'admin:plugins:dependencies:type' => 'Type',
 	'admin:plugins:dependencies:name' => 'Name',
@@ -720,7 +721,7 @@ $english = array(
 	'admin:appearance:default_widgets' => 'Default Widgets',
 	'admin:default_widgets:unknown_type' => 'Unknown widget type',
 	'admin:default_widgets:instructions' => 'Add, remove, position, and configure default widgets for the selected widget page.'
-		. '  These changes will apply only to new content on the site.',
+		. '  These changes will only affect new users on the site.',
 
 /**
  * User settings
@@ -774,6 +775,7 @@ $english = array(
 	'cancel' => "Cancel",
 	'saving' => "Saving ...",
 	'update' => "Update",
+	'preview' => "Preview",
 	'edit' => "Edit",
 	'delete' => "Delete",
 	'accept' => "Accept",
diff --git a/mod/blog/actions/blog/delete.php b/mod/blog/actions/blog/delete.php
index 6028480ff..ca4eb8a7f 100644
--- a/mod/blog/actions/blog/delete.php
+++ b/mod/blog/actions/blog/delete.php
@@ -13,7 +13,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 	if ($blog->delete()) {
 		system_message(elgg_echo('blog:message:deleted_post'));
 		if (elgg_instanceof($container, 'group')) {
-			forward("blog/group/$container->guid/owner");
+			forward("blog/group/$container->guid/all");
 		} else {
 			forward("blog/owner/$container->username");
 		}
diff --git a/mod/blog/actions/blog/save.php b/mod/blog/actions/blog/save.php
index c42845037..8be67ec6c 100644
--- a/mod/blog/actions/blog/save.php
+++ b/mod/blog/actions/blog/save.php
@@ -8,6 +8,9 @@
 // start a new sticky form session in case of failure
 elgg_make_sticky_form('blog');
 
+// save or preview
+$save = (bool)get_input('save');
+
 // store errors to pass along
 $error = FALSE;
 $error_forward_url = REFERER;
@@ -106,6 +109,11 @@ foreach ($values as $name => $default) {
 	}
 }
 
+// if preview, force status to be draft
+if ($save == false) {
+	$values['status'] = 'draft';
+}
+
 // assign values to the entity, stopping on error.
 if (!$error) {
 	foreach ($values as $name => $value) {
@@ -148,12 +156,13 @@ if (!$error) {
 				$blog->save();
 			}
 		} elseif ($old_status == 'published' && $status == 'draft') {
-			$q = "DELETE FROM {$db_prefix}river
-				WHERE object_guid = $blog->guid AND action_type = 'create'";
-			delete_data($q);
+			elgg_delete_river(array(
+				'object_guid' => $blog->guid,
+				'action_type' => 'create',
+			));
 		}
 
-		if ($blog->status == 'published') {
+		if ($blog->status == 'published' || $save == false) {
 			forward($blog->getURL());
 		} else {
 			forward("blog/edit/$blog->guid");
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 512f8f6d5..8964d5b53 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -32,7 +32,7 @@ function blog_get_page_content_read($guid = NULL) {
 	$container = $blog->getContainerEntity();
 	$crumbs_title = $container->name;
 	if (elgg_instanceof($container, 'group')) {
-		elgg_push_breadcrumb($crumbs_title, "blog/group/$container->guid/owner");
+		elgg_push_breadcrumb($crumbs_title, "blog/group/$container->guid/all");
 	} else {
 		elgg_push_breadcrumb($crumbs_title, "blog/owner/$container->username");
 	}
@@ -228,7 +228,7 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
 		$content .= $list;
 	}
 
-	$title = elgg_echo('date:month:' . date('n', $lower), array(date('Y', $lower)));
+	$title = elgg_echo('date:month:' . date('m', $lower), array(date('Y', $lower)));
 
 	return array(
 		'content' => $content,
@@ -396,7 +396,7 @@ function blog_url_forwarder($page) {
 		$guid = $matches[1];
 		$entity = get_entity($guid);
 		if ($entity) {
-			$url = "{$CONFIG->wwwroot}blog/group/$guid/owner";
+			$url = "{$CONFIG->wwwroot}blog/group/$guid/all";
 			register_error(elgg_echo("changebookmark"));
 			forward($url);
 		}
diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index f0ec96e8b..991462060 100644
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -5,6 +5,7 @@
 	<version>1.8</version>
 	<category>bundled</category>
 	<category>content</category>
+	<category>widget</category>
 	<blurb>Blog plugin</blurb>
 	<description>Adds simple blogging capabilities to your Elgg installation.</description>
 	<website>http://elgg.org/</website>
diff --git a/mod/blog/start.php b/mod/blog/start.php
index 33c6ee20d..b9911aa74 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -85,7 +85,7 @@ function blog_init() {
  *  New post:        blog/add/<guid>
  *  Edit post:       blog/edit/<guid>/<revision>
  *  Preview post:    blog/preview/<guid>
- *  Group blog:      blog/group/<guid>/owner
+ *  Group blog:      blog/group/<guid>/all
  *
  * Title is ignored
  *
@@ -178,7 +178,7 @@ function blog_owner_block_menu($hook, $type, $return, $params) {
 		$return[] = $item;
 	} else {
 		if ($params['entity']->blog_enable != "no") {
-			$url = "blog/group/{$params['entity']->guid}/owner";
+			$url = "blog/group/{$params['entity']->guid}/all";
 			$item = new ElggMenuItem('blog', elgg_echo('blog:group'), $url);
 			$return[] = $item;
 		}
diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php
index 9a1515585..6cfe6c98e 100644
--- a/mod/blog/views/default/blog/group_module.php
+++ b/mod/blog/views/default/blog/group_module.php
@@ -10,7 +10,7 @@ if ($group->blog_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-	'href' => "blog/group/$group->guid/owner",
+	'href' => "blog/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
 ));
 
diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index b2d20579f..d99f45f01 100644
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -5,6 +5,8 @@
  * @package Blog
  */
 
+$blog = get_entity($vars['guid']);
+
 $draft_warning = $vars['draft_warning'];
 if ($draft_warning) {
 	$draft_warning = '<span class="message warning">' . $draft_warning . '</span>';
@@ -12,6 +14,7 @@ if ($draft_warning) {
 
 $action_buttons = '';
 $delete_link = '';
+$preview_button = '';
 
 if ($vars['guid']) {
 	// add a delete button if editing
@@ -19,12 +22,24 @@ if ($vars['guid']) {
 	$delete_link = elgg_view('output/confirmlink', array(
 		'href' => $delete_url,
 		'text' => elgg_echo('delete'),
-		'class' => 'elgg-button elgg-button-delete elgg-state-disabled'
+		'class' => 'elgg-button elgg-button-delete elgg-state-disabled float-alt'
 	));
 }
 
-$save_button = elgg_view('input/submit', array('value' => elgg_echo('save')));
-$action_buttons = $save_button . $delete_link;
+// published blogs do not get the preview button
+if (!$vars['guid'] || ($blog && $blog->status != 'published')) {
+	$preview_button = elgg_view('input/submit', array(
+		'value' => elgg_echo('preview'),
+		'name' => 'preview',
+		'class' => 'mls',
+	));
+}
+
+$save_button = elgg_view('input/submit', array(
+	'value' => elgg_echo('save'),
+	'name' => 'save',
+));
+$action_buttons = $save_button . $preview_button . $delete_link;
 
 $title_label = elgg_echo('title');
 $title_input = elgg_view('input/text', array(
@@ -135,13 +150,15 @@ $body_input
 
 $categories_input
 
-<div class="elgg-subtext pvm mbn elgg-divide-top">
+<div class="elgg-form-footer-alt">
+	<div class="elgg-subtext mbm">
 	$save_status <span class="blog-save-status-time">$saved</span>
-</div>
+	</div>
 
-$guid_input
-$container_guid_input
+	$guid_input
+	$container_guid_input
 
-$action_buttons
+	$action_buttons
+</div>
 
 ___HTML;
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 048a68a1a..8456829fe 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -74,7 +74,7 @@ if ($full) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	$blog_info = elgg_view_image_block($owner_icon, $list_body);
 
@@ -94,7 +94,7 @@ HTML;
 		'tags' => $tags,
 		'content' => $excerpt,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($owner_icon, $list_body);
 }
diff --git a/mod/bookmarks/actions/bookmarks/delete.php b/mod/bookmarks/actions/bookmarks/delete.php
index 410a67bb7..2e9f41438 100644
--- a/mod/bookmarks/actions/bookmarks/delete.php
+++ b/mod/bookmarks/actions/bookmarks/delete.php
@@ -13,7 +13,7 @@ if (elgg_instanceof($bookmark, 'object', 'bookmarks') && $bookmark->canEdit()) {
 	if ($bookmark->delete()) {
 		system_message(elgg_echo("bookmarks:delete:success"));
 		if (elgg_instanceof($container, 'group')) {
-			forward("bookmarks/group/$container->guid/owner");
+			forward("bookmarks/group/$container->guid/all");
 		} else {
 			forward("bookmarks/owner/$container->username");
 		}
diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
index 88921dcce..72e9af9b0 100644
--- a/mod/bookmarks/manifest.xml
+++ b/mod/bookmarks/manifest.xml
@@ -5,6 +5,7 @@
 	<version>1.8</version>
 	<category>bundled</category>
 	<category>content</category>
+	<category>widget</category>
 	<blurb>Add and comment on bookmarks.</blurb>
 	<description>Adds the ability for users to bookmark internal and external sites.  Other users can then comment on the bookmarks.</description>
 	<website>http://www.elgg.org/</website>
diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
index 142e0b246..d0a9c630a 100644
--- a/mod/bookmarks/pages/bookmarks/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -12,7 +12,7 @@ $page_owner = elgg_get_page_owner_entity();
 $crumbs_title = $page_owner->name;
 
 if (elgg_instanceof($page_owner, 'group')) {
-	elgg_push_breadcrumb($crumbs_title, "bookmarks/group/$page_owner->guid/owner");
+	elgg_push_breadcrumb($crumbs_title, "bookmarks/group/$page_owner->guid/all");
 } else {
 	elgg_push_breadcrumb($crumbs_title, "bookmarks/owner/$page_owner->username");
 }
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 2dc86bc1a..1fb79deb6 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -77,7 +77,7 @@ function bookmarks_init() {
  *  View bookmark:        bookmarks/view/<guid>/<title>
  *  New bookmark:         bookmarks/add/<guid> (container: user, group, parent)
  *  Edit bookmark:        bookmarks/edit/<guid>
- *  Group bookmarks:      bookmarks/group/<guid>/owner
+ *  Group bookmarks:      bookmarks/group/<guid>/all
  *  Bookmarklet:          bookmarks/bookmarklet/<guid> (user)
  *
  * Title is ignored
@@ -222,7 +222,7 @@ function bookmarks_owner_block_menu($hook, $type, $return, $params) {
 		$return[] = $item;
 	} else {
 		if ($params['entity']->bookmarks_enable != 'no') {
-			$url = "bookmarks/group/{$params['entity']->guid}/owner";
+			$url = "bookmarks/group/{$params['entity']->guid}/all";
 			$item = new ElggMenuItem('bookmarks', elgg_echo('bookmarks:group'), $url);
 			$return[] = $item;
 		}
diff --git a/mod/bookmarks/views/default/bookmarks/group_module.php b/mod/bookmarks/views/default/bookmarks/group_module.php
index ff85c23ff..3166fc0f0 100644
--- a/mod/bookmarks/views/default/bookmarks/group_module.php
+++ b/mod/bookmarks/views/default/bookmarks/group_module.php
@@ -12,7 +12,7 @@ if ($group->bookmarks_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-	'href' => "bookmarks/group/$group->guid/owner",
+	'href' => "bookmarks/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
 ));
 
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index ab00e23c6..38b0a721a 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -65,7 +65,7 @@ if ($full && !elgg_in_context('gallery')) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 	$bookmark_info = elgg_view_image_block($owner_icon, $list_body);
 
 	$bookmark_icon = elgg_view_icon('push-pin-alt');
@@ -119,6 +119,6 @@ HTML;
 		'content' => $content,
 	);
 
-	$body = elgg_view('page/components/summary', $params);
+	$body = elgg_view('object/elements/summary', $params);
 	echo elgg_view_image_block($owner_icon, $body);
 }
\ No newline at end of file
diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
index 43df13d02..15d7192c1 100644
--- a/mod/categories/manifest.xml
+++ b/mod/categories/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>enhancement</category>
 	<blurb>Add site-wide categories</blurb>
 	<description>Site-wide Categories lets administrators define categories that users across the site can add content to.</description>
 	<website>http://www.elgg.org/</website>
diff --git a/mod/categories/views/default/settings/categories/edit.php b/mod/categories/views/default/settings/categories/edit.php
index 583292e72..3802da95a 100644
--- a/mod/categories/views/default/settings/categories/edit.php
+++ b/mod/categories/views/default/settings/categories/edit.php
@@ -14,8 +14,9 @@ if (empty($categories)) {
 }
 
 ?>
-<p>
-	<?php echo elgg_echo('categories:explanation'); ?>
-</p>
+<div>
+	<p><?php echo elgg_echo('categories:explanation'); ?></p>
 <?php
-echo elgg_view('input/tags', array('value' => $categories, 'name' => 'categories'));
+	echo elgg_view('input/tags', array('value' => $categories, 'name' => 'categories'));
+?>
+</div>
\ No newline at end of file
diff --git a/mod/custom_index/index.php b/mod/custom_index/index.php
index 94a1a16c6..e39e6ef29 100644
--- a/mod/custom_index/index.php
+++ b/mod/custom_index/index.php
@@ -60,4 +60,8 @@ $params = array(
 );
 $body = elgg_view_layout('custom_index', $params);
 
+// no RSS feed with a "widget" front page
+global $autofeed;
+$autofeed = FALSE;
+
 echo elgg_view_page('', $body);
diff --git a/mod/dashboard/manifest.xml b/mod/dashboard/manifest.xml
new file mode 100644
index 000000000..b5e9cff2e
--- /dev/null
+++ b/mod/dashboard/manifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>User Dashboard</name>
+	<author>Core developers</author>
+	<version>1.8</version>
+	<category>bundled</category>
+	<description>A widget-based dashboard for your users</description>
+	<website>http://www.elgg.org/</website>
+	<copyright>See COPYRIGHT.txt</copyright>
+	<license>GNU Public License version 2</license>
+	<requires>
+		<type>elgg_version</type>
+		<version>2010030101</version>
+	</requires>
+	<admin_interface>advanced</admin_interface>
+</plugin_manifest>
\ No newline at end of file
diff --git a/mod/dashboard/start.php b/mod/dashboard/start.php
new file mode 100644
index 000000000..4fa048b3d
--- /dev/null
+++ b/mod/dashboard/start.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * A user dashboard
+ */
+
+elgg_register_event_handler('init', 'system', 'dashboard_init');
+
+function dashboard_init() {
+	elgg_register_page_handler('dashboard', 'dashboard_page_handler');
+
+	elgg_register_menu_item('topbar', array(
+		'name' => 'dashboard',
+		'href' => 'dashboard',
+		'text' => elgg_view_icon('home') . elgg_echo('dashboard'),
+		'priority' => 450,
+		'section' => 'alt',
+	));
+}
+
+function dashboard_page_handler() {
+	// Ensure that only logged-in users can see this page
+	gatekeeper();
+
+	// Set context and title
+	elgg_set_context('dashboard');
+	elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
+	$title = elgg_echo('dashboard');
+
+	// wrap intro message in a div
+	$intro_message = elgg_view('dashboard/blurb');
+
+	$params = array(
+		'content' => $intro_message,
+		'num_columns' => 3,
+		'show_access' => false,
+	);
+	$widgets = elgg_view_layout('widgets', $params);
+
+	$body = elgg_view_layout('one_column', array('content' => $widgets));
+
+	echo elgg_view_page($title, $body);
+}
diff --git a/views/default/core/dashboard/blurb.php b/mod/dashboard/views/default/dashboard/blurb.php
index 0c4e3947a..202be1dc5 100644
--- a/views/default/core/dashboard/blurb.php
+++ b/mod/dashboard/views/default/dashboard/blurb.php
@@ -9,7 +9,7 @@
 <?php 
 	echo elgg_view('output/longtext', array(
 		'id' => 'dashboard-info',
-		'class' => 'elgg-inner pas mhs mbl',
+		'class' => 'elgg-inner elgg-border-plain pam mhs mbl mtn',
 		'value' => elgg_echo("dashboard:nowidgets"),
 	));
 
diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php
index a2db69bc4..53a9cd686 100644
--- a/mod/developers/languages/en.php
+++ b/mod/developers/languages/en.php
@@ -11,6 +11,7 @@ $english = array(
 	'admin:developers:preview' => 'Theming Preview',
 
 	// settings
+	'elgg_dev_tools:settings:explanation' => 'Control your development and debugging settings below. Some of these settings are also available on other admin pages.',
 	'developers:label:simple_cache' => 'Use simple cache',
 	'developers:help:simple_cache' => 'Turn off the file cache when developing. Otherwise, changes to your views (including css) will be ignored.',
 	'developers:label:view_path_cache' => 'Use view path cache',
@@ -26,6 +27,8 @@ $english = array(
 	'developers:debug:notice' => 'Notice',
 
 	// theme preview
+	'theme_preview:general' => 'Introduction',
+	'theme_preview:breakout' => 'Break out of iframe',
 	'theme_preview:buttons' => 'Buttons',
 	'theme_preview:components' => 'Components',
 	'theme_preview:forms' => 'Forms',
diff --git a/mod/developers/views/default/theme_preview/forms.php b/mod/developers/views/default/theme_preview/forms.php
index 60183ead9..efbe0b5a0 100644
--- a/mod/developers/views/default/theme_preview/forms.php
+++ b/mod/developers/views/default/theme_preview/forms.php
@@ -113,7 +113,6 @@
 			<?php echo elgg_view('input/userpicker', array(
 					'name' => 'f13',
 					'id' => 'f13',
-					'value' => array(new ElggUser(), new ElggUser(), new ElggUser()),
 					));
 			?>
 		</div>
diff --git a/mod/developers/views/default/theme_preview/general.php b/mod/developers/views/default/theme_preview/general.php
new file mode 100644
index 000000000..1a0b54c88
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/general.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Quick introduction to the theme preview
+ *
+ * @todo links to resources?
+ */
+?>
+
+<p>This theme preview provides a visual catalog for many of the theming elements
+	that Elgg uses. The primary css selector is listed with each theme element.
+	The preview is divided into sections that are listed in the page menu
+	(usually in the sidebar but depends on your current theme).
+</p>
+<p>
+<?php
+	echo elgg_view('output/url', array(
+		'text' => elgg_echo('theme_preview:breakout'),
+		'href' => current_page_url(),
+		'target' => '_parent',
+	));
+?>
+</p>
diff --git a/mod/diagnostics/languages/en.php b/mod/diagnostics/languages/en.php
index 0b90957f9..6d71945e3 100644
--- a/mod/diagnostics/languages/en.php
+++ b/mod/diagnostics/languages/en.php
@@ -7,7 +7,7 @@
 
 	$english = array(
 
-			'admin:utilities:diagnostics' => 'System diagnostics',
+			'admin:utilities:diagnostics' => 'System Diagnostics',
 			'diagnostics' => 'System diagnostics',
 			'diagnostics:report' => 'Diagnostics Report',
 			'diagnostics:unittester' => 'Unit Tests',
diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml
index f84b07cd4..e85b19aef 100644
--- a/mod/diagnostics/manifest.xml
+++ b/mod/diagnostics/manifest.xml
@@ -4,6 +4,8 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>development</category>
+	<category>admin</category>
 	<description>Elgg diagnostics tool</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/embed/README.txt b/mod/embed/README.txt
index 98948da3f..33c9fff65 100644
--- a/mod/embed/README.txt
+++ b/mod/embed/README.txt
@@ -171,10 +171,10 @@ CONTENTS:
 	an onClick event via Javascript.  Embed provides a helper function for
 	this:
 	
-	elggEmbedInsertContent(content, textAreaName)
+	elggEmbedInsertContent(content, textAreaId)
 	
 	Content is the pre-formatted content to insert into the text area,
-	and textAreaName is the name of the text area.  This name is
+	and textAreaId is the name of the text area.  This name is
 	sent via GET as 'internal_name.'
 	
 	
@@ -189,7 +189,7 @@ CONTENTS:
 	content into the specific text area.  Variables available within
 	this view are:
 		str content The content to insert.
-		str textAreaName The name of the textarea to receive the content.
+		str textAreaId The name of the textarea to receive the content.
 	
 	Note: Extend this view; don't override it.  It is important to correctly
 	extend this view for compatibility across multiple plugins and textarea 
diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml
index 102daa761..f61d27c23 100644
--- a/mod/embed/manifest.xml
+++ b/mod/embed/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>enhancement</category>
 	<description>Allows users to easily upload and embed media into text areas.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/embed/start.php b/mod/embed/start.php
index 78f06c158..f6f49a53f 100644
--- a/mod/embed/start.php
+++ b/mod/embed/start.php
@@ -34,10 +34,10 @@ function embed_longtext_menu($hook, $type, $items, $vars) {
 	
 	$items[] = ElggMenuItem::factory(array(
 		'name' => 'embed',
-		'href' => "embed?{$active_section}internal_name={$vars['name']}",
+		'href' => "embed?{$active_section}internal_id={$vars['id']}",
 		'text' => elgg_echo('media:insert'),
 		'rel' => 'facebox',
-		'class' => 'elgg-longtext-control',
+		'link_class' => 'elgg-longtext-control',
 		'priority' => 1,
 	));
 	
@@ -73,13 +73,13 @@ function embed_page_handler($page) {
 			elgg_sort_3d_array_by_value($sections, 'name');
 			elgg_sort_3d_array_by_value($upload_sections, 'name');
 			$active_section = get_input('active_section', NULL);
-			$internal_name = get_input('internal_name', NULL);
+			$internal_id = get_input('internal_id', NULL);
 
 			echo elgg_view('embed/embed', array(
 				'sections' => $sections,
 				'active_section' => $active_section,
 				'upload_sections' => $upload_sections,
-				'internal_name' => $internal_name
+				'internal_id' => $internal_id
 			));
 			break;
 	}
diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index 736c6ae44..44491846b 100644
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -89,9 +89,6 @@
 .embed_data .elgg-image-block  {
 	border-bottom:none;
 }
-.embed_data:last-child {
-	border-bottom:1px dotted #CCC;
-}
 .embed_modal_videolist .elgg-image img {
 	width:75px;
 	height:auto;
@@ -111,7 +108,6 @@
 	width:auto;
 	margin-top:15px;
 	margin-left:15px;
-	float:left;
 }
 .embed_data .elgg-image-block {
 	cursor:pointer;
diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php
index 06d3f48f1..eeeb1d244 100644
--- a/mod/embed/views/default/embed/embed.php
+++ b/mod/embed/views/default/embed/embed.php
@@ -12,7 +12,7 @@
 $sections = elgg_extract('sections', $vars, array());
 $active_section = elgg_extract('active_section', $vars, array_shift(array_keys($sections)));
 $upload_sections = elgg_extract('upload_sections', $vars, array());
-$internal_name = elgg_extract('internal_name', $vars);
+$internal_id = elgg_extract('internal_id', $vars);
 
 if (!$sections) {
 	$content = elgg_echo('embed:no_sections');
@@ -65,7 +65,7 @@ if (!$sections) {
 			'limit' => $limit,
 			'section' => $active_section,
 			'upload_sections' => $upload_sections,
-			'internal_name' => $internal_name
+			'internal_id' => $internal_id
 		);
 
 		// allow full override for this section
@@ -92,8 +92,8 @@ if (!$sections) {
 				} else {
 					$ecml_valid_keyword = FALSE;
 				}
-	
-				$items_content = '';
+				
+				$items_content = '<ul class="elgg-list">';
 				foreach ($embed_info['items'] as $item) {
 					$item_params = array(
 						'section' => $active_section,
@@ -103,9 +103,10 @@ if (!$sections) {
 						'icon_size' => elgg_extract('icon_size', $section_info, 'tiny'),
 					);
 	
-					$items_content .= elgg_view($view, $item_params);
+					$items_content .= '<li class="elgg-list-item">' . elgg_view($view, $item_params) . '</li>';
 				}
-	
+				$items_content .= '</ul>';
+				
 				$params['content'] = $items_content;
 				$params['count'] = $embed_info['count'];
 	
@@ -126,18 +127,25 @@ echo $content;
 <?php //@todo: JS 1.8: ugly ?>
 <script type="text/javascript">
 $(function() {
-	var internal_name = '<?php echo addslashes($internal_name); ?>';
+	var internal_id = '<?php echo addslashes($internal_id); ?>';
+
+	// Remove any existing "live" handlers
+	$('.embed_data').die('click');
+	$('.embed_section').die('click');
+	$('#facebox .elgg-pagination a').die('click');
 	
 	// insert embed codes
 	$('.embed_data').live('click', function() {
-		var embed_code = $(this).data('embed_code')
-		elggEmbedInsertContent(embed_code, internal_name);
+		var embed_code = $(this).data('embed_code');
+		elggEmbedInsertContent(embed_code, internal_id);
+		
+		return false;
 	});
 
 	// tabs
 	$('.embed_section').live('click', function() {
 		var section = $(this).attr('id');
-		var url = elgg.config.wwwroot + 'embed/embed?active_section=' + section + '&internal_name=' + internal_name;
+		var url = elgg.config.wwwroot + 'embed/embed?active_section=' + section + '&internal_id=' + internal_id;
 		$('#facebox .body .content').load(url);
 
 		return false;
@@ -149,9 +157,7 @@ $(function() {
 		return false;
 	}
 
-	$('.pagination-number').live('click', elggPaginationClick);
-	$('.pagination-next').live('click', elggPaginationClick);
-	$('.pagination-previous').live('click', elggPaginationClick);
+	$('#facebox .elgg-pagination a').live('click', elggPaginationClick);
 });
 
 </script>
diff --git a/mod/embed/views/default/embed/item/list.php b/mod/embed/views/default/embed/item/list.php
index c5c604854..89a2ffb63 100644
--- a/mod/embed/views/default/embed/item/list.php
+++ b/mod/embed/views/default/embed/item/list.php
@@ -13,8 +13,9 @@
 $item = $vars['item'];
 $section = $vars['section'];
 $target = $vars['target'];
-$ecml_keyword = (isset($vars['ecml_enabled']) && isset($vars['ecml_keyword'])) ? $vars['ecml_keyword'] : NULL;
+$ecml_keyword = (isset($vars['ecml_enabled']) && $vars['ecml_enabled'] && isset($vars['ecml_keyword'])) ? $vars['ecml_keyword'] : NULL;
 $icon_size = $vars['icon_size'];
+$owner = $item->getOwnerEntity();
 
 // @todo add entity checking.
 
@@ -23,6 +24,11 @@ $title = isset($item->name) ? $item->name : $item->title;
 // don't let it be too long
 $title = elgg_get_excerpt($title);
 
+$author_text = elgg_echo('byline', array($owner->name));
+$date = elgg_view_friendly_time($item->time_created);
+
+$subtitle = "$author_text $date";
+
 // @todo you can disable plugins that are required by other plugins
 // (embed requires ecml) so fallback to a hard-coded check to see if ecml is enabled.
 // #grumble
@@ -35,17 +41,23 @@ if ($ecml_keyword) {
 	$embed_code = elgg_view('output/url', array(
 		'href' => $item->getURL(),
 		'title' => $title,
-		'text' => $title,
+		'text' => $icon,
 		'encode_text' => FALSE
 	));
 }
 
-$icon = "<img src=\"{$item->getIcon($icon_size)}\" />";
-$info = "<p class='entity-title'>" . htmlentities($title, ENT_QUOTES, 'UTF-8') . "</p>";
-$info .= "<p class='entity-subtext'>" . elgg_view_friendly_time($vars['item']->time_created) . "</p>";
+$item_icon = elgg_view_entity_icon($item, $icon_size);
+
+$params = array(
+	'title' => $title,
+	'entity' => $item,
+	'subtitle' => $subtitle,
+	'tags' => FALSE,
+);
+$list_body = elgg_view('object/elements/summary', $params);
 
 // @todo JS 1.8: is this approach better than inline js?
-echo "<div class=\"embed_data\" id=\"embed_{$item->getGUID()}\">" . elgg_view_listing($icon, $info) . '</div>';
+echo "<div class=\"embed_data\" id=\"embed_{$item->getGUID()}\">" . elgg_view_image_block($item_icon, $list_body) . '</div>';
 echo "<script type=\"text/javascript\">
 	$('#embed_{$item->getGUID()}').data('embed_code', " . json_encode($embed_code) . ");
 </script>";
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/js.php b/mod/embed/views/default/embed/js.php
index f80d7367d..a0a2e8ff5 100644
--- a/mod/embed/views/default/embed/js.php
+++ b/mod/embed/views/default/embed/js.php
@@ -9,35 +9,39 @@
 $(function() { 
 	$('a[rel*=facebox]').facebox();
 
-	// fire off the ajax upload
-	$('#file_embed_upload').submit(function() {
-		var options = {
-			success: function(data) {
-				var info = jQuery.parseJSON(data);
-
-				if (info.status == 'success') {
-					$('.popup .content').load(elgg.get_site_url() + 'embed/embed?active_section=file');
-				} else {
-					$('.popup .content').find('form').prepend('<p>' + info.message + '</p>');
+	// Only apply the .live binding after facebox has been displayed
+	$(document).bind('afterReveal.facebox', function() {
+	
+		// fire off the ajax upload
+		$('#file_embed_upload').live('submit', function() {
+			var options = {
+				success: function(data) {
+					var info = jQuery.parseJSON(data);
+
+					if (info.status == 'success') {
+						$('.popup .content').load(elgg.get_site_url() + 'embed/embed?active_section=file');
+					} else {
+						$('.popup .content').find('form').prepend('<p>' + info.message + '</p>');
+					}
 				}
-			}
-		};
-		$(this).ajaxSubmit(options);
-		return false;
+			};
+			$(this).ajaxSubmit(options);
+			return false;
+		});
 	});
 });
-function elggEmbedInsertContent(content, textAreaName) {
+function elggEmbedInsertContent(content, textAreaId) {
 	content = ' ' + content + ' ';
 	
 	// default input.
 	// if this doesn't match anything it won't add anything.
-	$('textarea[name=' + textAreaName + ']').val($('textarea[name=' + textAreaName + ']').val() + ' ' + content);
+	$('#' + textAreaId).val($('#' + textAreaId).val() + ' ' + content);
 	
 	<?php
 		// This view includes the guts of the function to do the inserting.
 		// Anything that overrides input/longtext with its own editor
 		// needs to supply its own function here that inserts
-		// content into textAreaName.
+		// content into textAreaId.
 		// See TinyMCE as an example.
 		
 		// for compatibility
diff --git a/mod/externalpages/languages/en.php b/mod/externalpages/languages/en.php
index 196a04c0b..5f0f4ad7b 100644
--- a/mod/externalpages/languages/en.php
+++ b/mod/externalpages/languages/en.php
@@ -9,7 +9,7 @@ $english = array(
 	 * Menu items and titles
 	 */
 	'expages' => "Site pages",
-	'admin:appearance:expages' => "Site pages",
+	'admin:appearance:expages' => "Site Pages",
 	'expages:about' => "About",
 	'expages:terms' => "Terms",
 	'expages:privacy' => "Privacy",
diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php
index 051da183a..1de4d5ec8 100644
--- a/mod/externalpages/start.php
+++ b/mod/externalpages/start.php
@@ -3,7 +3,7 @@
  * Plugin for creating web pages for your site
  */
 
-register_elgg_event_handler('init', 'system', 'expages_init');
+elgg_register_event_handler('init', 'system', 'expages_init');
 
 function expages_init() {
 
diff --git a/mod/externalpages/views/default/forms/expages/edit.php b/mod/externalpages/views/default/forms/expages/edit.php
index 58c174d6e..b0060477e 100644
--- a/mod/externalpages/views/default/forms/expages/edit.php
+++ b/mod/externalpages/views/default/forms/expages/edit.php
@@ -45,11 +45,13 @@ $external_page_title = elgg_echo("expages:$type");
 
 //construct the form
 echo <<<EOT
-<h3 class="mvm">$external_page_title</h3>
-<div>$input_area</div>
-	$hidden_value
-	$hidden_type
-	$submit_input
+<div class="mtm">
+	<label>$external_page_title</label>
+	$input_area
+</div>
+$hidden_value
+$hidden_type
+$submit_input
 
 EOT;
 
diff --git a/mod/file/actions/file/delete.php b/mod/file/actions/file/delete.php
index 622d02277..72585aa36 100644
--- a/mod/file/actions/file/delete.php
+++ b/mod/file/actions/file/delete.php
@@ -27,7 +27,7 @@ if (!$file->delete()) {
 }
 
 if (elgg_instanceof($container, 'group')) {
-	forward("file/group/$container->guid/owner");
+	forward("file/group/$container->guid/all");
 } else {
 	forward("file/owner/$container->username");
 }
diff --git a/mod/file/actions/file/upload.php b/mod/file/actions/file/upload.php
index e04203f67..5d5c28bee 100644
--- a/mod/file/actions/file/upload.php
+++ b/mod/file/actions/file/upload.php
@@ -192,7 +192,7 @@ if ($new_file) {
 	if (!$ajax) {
 		$container = get_entity($container_guid);
 		if (elgg_instanceof($container, 'group')) {
-			forward("file/group/$container->guid/owner");
+			forward("file/group/$container->guid/all");
 		} else {
 			forward("file/owner/$container->username");
 		}
diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml
index 966aa1195..aac9c3f6b 100644
--- a/mod/file/manifest.xml
+++ b/mod/file/manifest.xml
@@ -5,6 +5,7 @@
 	<version>1.8</version>
 	<category>bundled</category>
 	<category>content</category>
+	<category>widget</category>
 	<description>File browser plugin</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/file/pages/file/search.php b/mod/file/pages/file/search.php
index 2fa1ea60f..77c92f444 100644
--- a/mod/file/pages/file/search.php
+++ b/mod/file/pages/file/search.php
@@ -26,7 +26,7 @@ if ($owner) {
 	if (elgg_instanceof($owner, 'user')) {
 		elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
 	} else {
-		elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/owner");
+		elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/all");
 	}
 }
 if ($friends && $owner) {
diff --git a/mod/file/pages/file/upload.php b/mod/file/pages/file/upload.php
index c19522530..d97cc038d 100644
--- a/mod/file/pages/file/upload.php
+++ b/mod/file/pages/file/upload.php
@@ -19,7 +19,7 @@ elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 if (elgg_instanceof($owner, 'user')) {
 	elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
 } else {
-	elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/owner");
+	elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/all");
 }
 elgg_push_breadcrumb($title);
 
diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index 1d7c27337..daa2a400e 100644
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -13,7 +13,7 @@ elgg_push_breadcrumb(elgg_echo('file'), 'file/all');
 
 $crumbs_title = $owner->name;
 if (elgg_instanceof($owner, 'group')) {
-	elgg_push_breadcrumb($crumbs_title, "file/group/$owner->guid/owner");
+	elgg_push_breadcrumb($crumbs_title, "file/group/$owner->guid/all");
 } else {
 	elgg_push_breadcrumb($crumbs_title, "file/owner/$owner->username");
 }
diff --git a/mod/file/start.php b/mod/file/start.php
index d4f12e903..b94dc309a 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -73,7 +73,7 @@ function file_init() {
  *  View file:       file/view/<guid>/<title>
  *  New file:        file/add/<guid>
  *  Edit file:       file/edit/<guid>
- *  Group files:     file/group/<guid>/owner
+ *  Group files:     file/group/<guid>/all
  *
  * Title is ignored
  *
@@ -152,7 +152,7 @@ function file_owner_block_menu($hook, $type, $return, $params) {
 		$return[] = $item;
 	} else {
 		if ($params['entity']->file_enable != "no") {
-			$url = "file/group/{$params['entity']->guid}/owner";
+			$url = "file/group/{$params['entity']->guid}/all";
 			$item = new ElggMenuItem('file', elgg_echo('file:group'), $url);
 			$return[] = $item;
 		}
diff --git a/mod/file/views/default/file/group_module.php b/mod/file/views/default/file/group_module.php
index de8c62098..830b1096c 100644
--- a/mod/file/views/default/file/group_module.php
+++ b/mod/file/views/default/file/group_module.php
@@ -10,7 +10,7 @@ if ($group->file_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-	'href' => "file/group/$group->guid/owner",
+	'href' => "file/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
 ));
 
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 0b58ca76f..93a21c8e6 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -82,7 +82,7 @@ if ($full && !elgg_in_context('gallery')) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	$file_info = elgg_view_image_block($file_icon, $list_body);
 
@@ -112,7 +112,7 @@ HTML;
 		'tags' => $tags,
 		'content' => $excerpt,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($file_icon, $list_body);
 }
diff --git a/mod/garbagecollector/manifest.xml b/mod/garbagecollector/manifest.xml
index 23223bc44..466e49d61 100644
--- a/mod/garbagecollector/manifest.xml
+++ b/mod/garbagecollector/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.5</version>
 	<category>bundled</category>
+	<category>admin</category>
 	<description>Perform some database cleanup tasks</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/garbagecollector/views/default/settings/garbagecollector/edit.php b/mod/garbagecollector/views/default/settings/garbagecollector/edit.php
index a0f9677a0..3ade780f9 100644
--- a/mod/garbagecollector/views/default/settings/garbagecollector/edit.php
+++ b/mod/garbagecollector/views/default/settings/garbagecollector/edit.php
@@ -9,9 +9,9 @@ $period = $vars['entity']->period;
 if (!$period) {
 	$period = 'monthly';
 }
-		
+
 ?>
-<p>
+<div>
 	<?php echo elgg_echo('garbagecollector:period'); ?>
 	
 	<?php
@@ -25,4 +25,4 @@ if (!$period) {
 			'value' => $period
 		));
 	?>
-</p>
+</div>
diff --git a/mod/groups/actions/groups/delete.php b/mod/groups/actions/groups/delete.php
index 932d03355..2ff6c339c 100644
--- a/mod/groups/actions/groups/delete.php
+++ b/mod/groups/actions/groups/delete.php
@@ -3,7 +3,12 @@
  * Delete a group
  */
 		
-$guid = (int) get_input('group_guid');
+$guid = (int) get_input('guid');
+if (!$guid) {
+	// backward compatible
+	elgg_deprecated_notice("Use 'guid' for group delete action", 1.8);
+	$guid = (int)get_input('group_guid');
+}
 $entity = get_entity($guid);
 
 if (!$entity->canEdit()) {
diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml
index 32671397d..4188aa861 100644
--- a/mod/groups/manifest.xml
+++ b/mod/groups/manifest.xml
@@ -4,6 +4,8 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>social</category>
+	<category>widget</category>
 	<description>Provides group support for elgg</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/groups/start.php b/mod/groups/start.php
index 9de7f1cc1..73bdd08a9 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -734,7 +734,7 @@ function discussion_add_to_river_menu($hook, $type, $return, $params) {
 						'href' => "#groups-reply-$object->guid",
 						'text' => elgg_view_icon('speech-bubble'),
 						'title' => elgg_echo('reply:this'),
-						'class' => "elgg-toggler",
+						'link_class' => "elgg-toggler",
 						'priority' => 50,
 					);
 					$return[] = ElggMenuItem::factory($options);
diff --git a/mod/groups/views/default/forms/groups/delete.php b/mod/groups/views/default/forms/groups/delete.php
deleted file mode 100644
index 28c2eb9bf..000000000
--- a/mod/groups/views/default/forms/groups/delete.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Group delete form body
- */
-
-$warning = elgg_echo("groups:deletewarning");
-
-echo elgg_view('input/hidden', array(
-	'name' => 'group_guid',
-	'value' => $vars['entity']->getGUID(),
-));
-
-echo elgg_view('input/submit', array(
-	'class' => "elgg-button elgg-button-delete right",
-	'value' => elgg_echo('groups:delete'),
-	'onclick' => "return confirm('$warning');",
-));
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 1a4e95513..b67134c63 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -126,7 +126,7 @@ if ($tools) {
 	}
 }
 ?>
-<div class="elgg-divide-top">
+<div class="elgg-form-footer-alt">
 <?php
 
 if (isset($vars['entity'])) {
@@ -137,5 +137,15 @@ if (isset($vars['entity'])) {
 }
 
 echo elgg_view('input/submit', array('value' => elgg_echo('save')));
+
+if (isset($vars['entity'])) {
+	$delete_url = 'action/groups/delete?guid=' . $vars['entity']->getGUID();
+	echo elgg_view('output/confirmlink', array(
+		'text' => elgg_echo('groups:delete'),
+		'href' => $delete_url,
+		'confirm' => elgg_echo('groups:deletewarning'),
+		'class' => 'elgg-button elgg-button-delete float-alt',
+	));
+}
 ?>
 </div>
diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php
index a49bbe2fb..83139c2ee 100644
--- a/mod/groups/views/default/forms/groups/invite.php
+++ b/mod/groups/views/default/forms/groups/invite.php
@@ -12,9 +12,11 @@ $friends = elgg_get_logged_in_user_entity()->getFriends('', 0);
 
 if ($friends) {
 	echo elgg_view('input/friendspicker', array('entities' => $friends, 'name' => 'user_guid', 'highlight' => 'all'));
+	echo '<div class="elgg-form-footer">';
 	echo elgg_view('input/hidden', array('name' => 'forward_url', 'value' => $forward_url));
 	echo elgg_view('input/hidden', array('name' => 'group_guid', 'value' => $group->guid));
 	echo elgg_view('input/submit', array('value' => elgg_echo('invite')));
+	echo '</div>';
 } else {
 	echo elgg_echo('groups:nofriendsatall');
 }
\ No newline at end of file
diff --git a/mod/groups/views/default/group/default.php b/mod/groups/views/default/group/default.php
index 1f1035a38..2aa377813 100644
--- a/mod/groups/views/default/group/default.php
+++ b/mod/groups/views/default/group/default.php
@@ -31,7 +31,7 @@ if ($vars['full_view']) {
 		'metadata' => $metadata,
 		'subtitle' => $group->briefdescription,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('group/elements/summary', $params);
 
 	echo elgg_view_image_block($icon, $list_body);
 }
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index 06b86d1ee..37fc5dc10 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -32,6 +32,10 @@
 	margin-bottom: 7px;
 }
 
+.groups-profile-fields .elgg-output {
+	margin: 0;
+}
+
 #groups-tools > .elgg-module {
 	float: left;
 	margin-bottom: 40px;
diff --git a/mod/groups/views/default/groups/edit.php b/mod/groups/views/default/groups/edit.php
index 2434bd14f..5076cc49a 100644
--- a/mod/groups/views/default/groups/edit.php
+++ b/mod/groups/views/default/groups/edit.php
@@ -10,9 +10,3 @@ $entity = elgg_extract('entity', $vars, null);
 $form_vars = array('enctype' => 'multipart/form-data');
 $body_vars = array('entity' => $entity);
 echo elgg_view_form('groups/edit', $form_vars, $body_vars);
-
-if ($entity) {
-	echo '<div class="delete_group">';
-	echo elgg_view_form('groups/delete', array(), array('entity' => $entity));
-	echo '</div>';
-}
diff --git a/mod/groups/views/default/groups/profile/fields.php b/mod/groups/views/default/groups/profile/fields.php
index 5cd06025f..14827f11a 100644
--- a/mod/groups/views/default/groups/profile/fields.php
+++ b/mod/groups/views/default/groups/profile/fields.php
@@ -26,12 +26,12 @@ if (is_array($profile_fields) && count($profile_fields) > 0) {
 			$options['tag_names'] = $key;
 		}
 
-		echo "<p class=\"{$even_odd}\">";
+		echo "<div class=\"{$even_odd}\">";
 		echo "<b>";
 		echo elgg_echo("groups:$key");
 		echo ": </b>";
 		echo elgg_view("output/$valtype", $options);
-		echo "</p>";
+		echo "</div>";
 
 		$even_odd = ($even_odd == 'even') ? 'odd' : 'even';
 	}
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 9589d1fb8..3a4decbe4 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -67,7 +67,7 @@ if ($full) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	$info = elgg_view_image_block($poster_icon, $list_body);
 
@@ -90,7 +90,7 @@ HTML;
 		'tags' => $tags,
 		'content' => $excerpt,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($poster_icon, $list_body);
 }
diff --git a/mod/htmlawed/manifest.xml b/mod/htmlawed/manifest.xml
index ba8978814..0c48bbd28 100644
--- a/mod/htmlawed/manifest.xml
+++ b/mod/htmlawed/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.5</version>
 	<category>bundled</category>
+	<category>security</category>
 	<description>Provides security filtering. Disabling this plugin is extremely insecure. DO NOT DISABLE.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
index e54513d01..e02c19c36 100644
--- a/mod/invitefriends/manifest.xml
+++ b/mod/invitefriends/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>social</category>
 	<description>Invite friends via email invites.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
@@ -13,4 +14,5 @@
 		<version>2010030101</version>
 	</requires>
 	<admin_interface>advanced</admin_interface>
+	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/invitefriends/views/default/forms/invitefriends/invite.php b/mod/invitefriends/views/default/forms/invitefriends/invite.php
index 2597598de..5af8b5da0 100644
--- a/mod/invitefriends/views/default/forms/invitefriends/invite.php
+++ b/mod/invitefriends/views/default/forms/invitefriends/invite.php
@@ -27,7 +27,9 @@ if (elgg_get_config('allow_registration')) {
 </div>
 HTML;
 
+	echo '<div>';
 	echo elgg_view('input/submit', array('value' => elgg_echo('send')));
+	echo '</div>';
 } else {
 	echo elgg_echo('invitefriends:registration_disabled');
 }
diff --git a/mod/likes/actions/likes/add.php b/mod/likes/actions/likes/add.php
index f56493864..7ccb19d92 100644
--- a/mod/likes/actions/likes/add.php
+++ b/mod/likes/actions/likes/add.php
@@ -18,7 +18,7 @@ if (!$entity) {
 	forward(REFERER);
 }
 
-// cannot like your own stuff
+// limit likes through a plugin hook (to prevent liking your own content for example)
 if (!$entity->canAnnotate(0, 'likes')) {
 	// plugins should register the error message to explain why liking isn't allowed
 	forward(REFERER);
diff --git a/mod/likes/actions/likes/delete.php b/mod/likes/actions/likes/delete.php
index 867d5dfef..db3036bb4 100644
--- a/mod/likes/actions/likes/delete.php
+++ b/mod/likes/actions/likes/delete.php
@@ -4,26 +4,18 @@
  *
  */
 
-// Ensure we're logged in
-if (!elgg_is_logged_in()) {
-	forward();
-}
-
-// Make sure we can get the comment in question
-$annotation_id = (int) get_input('annotation_id');
-if ($likes = elgg_get_annotation_from_id($annotation_id)) {
-
-	$entity = get_entity($likes->entity_guid);
-
-	if ($likes->canEdit()) {
-		$likes->delete();
+$likes = elgg_get_annotations(array(
+	'guid' => (int) get_input('guid'),
+	'annotation_owner_guid' => elgg_get_logged_in_user_guid(),
+	'annotation_name' => 'likes',
+));
+if ($likes) {
+	if ($likes[0]->canEdit()) {
+		$likes[0]->delete();
 		system_message(elgg_echo("likes:deleted"));
 		forward(REFERER);
 	}
-
-} else {
-	$url = "";
 }
 
 register_error(elgg_echo("likes:notdeleted"));
-forward(REFERER);
\ No newline at end of file
+forward(REFERER);
diff --git a/mod/likes/manifest.xml b/mod/likes/manifest.xml
index abd3f7c76..f63c643a6 100644
--- a/mod/likes/manifest.xml
+++ b/mod/likes/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>social</category>
 	<description>Enables users to like content on the site.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/likes/start.php b/mod/likes/start.php
index 435e7a3ab..b2aa83260 100644
--- a/mod/likes/start.php
+++ b/mod/likes/start.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Likes plugin
- * 
+ *
  */
 
 elgg_register_event_handler('init', 'system', 'likes_init');
@@ -50,32 +50,13 @@ function likes_river_menu_setup($hook, $type, $return, $params) {
 		$object = $item->getObjectEntity();
 		if (!elgg_in_context('widgets') && $item->annotation_id == 0) {
 			if ($object->canAnnotate(0, 'likes')) {
-				if (!elgg_annotation_exists($object->getGUID(), 'likes')) {
-					// user has not liked this yet
-					$url = "action/likes/add?guid={$object->getGUID()}";
-					$options = array(
-						'name' => 'like',
-						'href' => $url,
-						'text' => elgg_view('likes/display', array('entity' => $object)),
-						'is_action' => true,
-						'priority' => 100,
-					);
-				} else {
-					// user has liked this
-					$likes = elgg_get_annotations(array(
-						'guid' => $object->getGUID(),
-						'annotation_name' => 'likes',
-						'annotation_owner_guid' => elgg_get_logged_in_user_guid()
-					));
-					$url = elgg_get_site_url() . "action/likes/delete?annotation_id={$likes[0]->id}";
-					$options = array(
-						'name' => 'like',
-						'href' => $url,
-						'text' => elgg_view('likes/display', array('entity' => $object)),
-						'is_action' => true,
-						'priority' => 100,
-					);
-				}
+				$options = array(
+					'name' => 'likes',
+					'href' => false,
+					'text' => elgg_view('likes/display', array('entity' => $object)),
+					'is_action' => true,
+					'priority' => 100,
+				);
 				$return[] = ElggMenuItem::factory($options);
 			}
 		}
@@ -87,7 +68,7 @@ function likes_river_menu_setup($hook, $type, $return, $params) {
 /**
  * Count how many people have liked an entity.
  *
- * @param  ElggEntity $entity 
+ * @param  ElggEntity $entity
  *
  * @return int Number of likes
  */
diff --git a/mod/likes/views/default/likes/display.php b/mod/likes/views/default/likes/display.php
index cbfe46078..2dc50ddd0 100644
--- a/mod/likes/views/default/likes/display.php
+++ b/mod/likes/views/default/likes/display.php
@@ -28,8 +28,7 @@ if (elgg_is_logged_in() && $vars['entity']->canAnnotate(0, 'likes')) {
 			'annotation_name' => 'likes',
 			'owner_guid' => elgg_get_logged_in_user_guid()
 		);
-		$likes = elgg_get_annotations($options);
-		$url = elgg_get_site_url() . "action/likes/delete?annotation_id={$likes[0]->id}";
+		$url = elgg_get_site_url() . "action/likes/delete?guid={$guid}";
 		$params = array(
 			'href' => $url,
 			'text' => elgg_view_icon('thumbs-up-alt'),
diff --git a/mod/logrotate/languages/en.php b/mod/logrotate/languages/en.php
index e60d1b841..c3cf2d8ad 100644
--- a/mod/logrotate/languages/en.php
+++ b/mod/logrotate/languages/en.php
@@ -14,6 +14,15 @@ $english = array(
 
 	'logrotate:logrotated' => "Log rotated\n",
 	'logrotate:lognotrotated' => "Error rotating log\n",
+	
+	'logrotate:date' => 'Delete archived logs older than a',
+
+	'logrotate:week' => 'week',
+	'logrotate:month' => 'month',
+	'logrotate:year' => 'year',
+		
+	'logrotate:logdeleted' => "Log deleted\n",
+	'logrotate:lognotdeleted' => "Error deleting log\n",
 );
 
-add_translation("en", $english);
\ No newline at end of file
+add_translation("en", $english);
diff --git a/mod/logrotate/manifest.xml b/mod/logrotate/manifest.xml
index 153dfa921..ab6250ac0 100644
--- a/mod/logrotate/manifest.xml
+++ b/mod/logrotate/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.5</version>
 	<category>bundled</category>
+	<category>admin</category>
 	<description>Rotate the system log at specific intervals</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/logrotate/start.php b/mod/logrotate/start.php
index 25c01d45b..c05506d83 100644
--- a/mod/logrotate/start.php
+++ b/mod/logrotate/start.php
@@ -9,6 +9,7 @@ elgg_register_event_handler('init', 'system', 'logrotate_init');
 
 function logrotate_init() {
 	$period = elgg_get_plugin_setting('period', 'logrotate');
+	$time = elgg_get_plugin_setting('time', 'logrotate');
 	switch ($period) {
 		case 'weekly':
 		case 'monthly' :
@@ -18,14 +19,16 @@ function logrotate_init() {
 			$period = 'monthly';
 	}
 
-	// Register cron hook
-	elgg_register_plugin_hook_handler('cron', $period, 'logrotate_cron');
+	// Register cron hook for archival of logs
+	elgg_register_plugin_hook_handler('cron', $period, 'logrotate_archive_cron');
+	// Register cron hook for deletion of selected archived logs
+	elgg_register_plugin_hook_handler('cron', $time, 'logrotate_delete_cron');
 }
 
 /**
  * Trigger the log rotation.
  */
-function logrotate_cron($hook, $entity_type, $returnvalue, $params) {
+function logrotate_archive_cron($hook, $entity_type, $returnvalue, $params) {
 	$resulttext = elgg_echo("logrotate:logrotated");
 
 	$day = 86400;
@@ -51,3 +54,69 @@ function logrotate_cron($hook, $entity_type, $returnvalue, $params) {
 
 	return $returnvalue . $resulttext;
 }
+
+/**
+ * Trigger the log deletion.
+ */
+function logrotate_delete_cron($hook, $entity_type, $returnvalue, $params) {
+	$resulttext = elgg_echo("logrotate:logdeleted");
+
+	$day = 86400;
+
+	$offset = 0;
+	$period = elgg_get_plugin_setting('time', 'logrotate');
+	switch ($period) {
+		case 'weekly':
+			$offset = $day * 7;
+			break;
+		case 'yearly':
+			$offset = $day * 365;
+			break;
+		case 'monthly':
+		default:
+			// assume 28 days even if a month is longer. Won't cause data loss.
+			$offset = $day * 28;
+	}
+
+	if (!log_browser_delete_log($offset)) {
+		$resulttext = elgg_echo("logrotate:lognotdeleted");
+	}
+
+	return $returnvalue . $resulttext;
+}
+
+/**
+ * This function deletes archived copies of the system logs that are older than specified.
+ *
+ * @param int $time_of_delete An offset in seconds from now to delete (useful for log deletion)
+ */
+
+function log_browser_delete_log($time_of_delete) {
+	global $CONFIG;
+
+	$offset = (int)$time_of_delete;
+	$now = time();
+
+	$ts = $now - $offset;
+
+	$FLAG = 1;      
+	$result = mysql_query("SHOW TABLES like '{$CONFIG->dbprefix}system_log_%'");
+	while ($showtablerow = mysql_fetch_array($result)) {
+		//To obtain time of archival
+		$log_time = explode("{$CONFIG->dbprefix}system_log_", $showtablerow[0]);
+		if ($log_time < $ts) {
+			//If the time of archival is before the required offset then delete
+			if (!mysql_query("DROP TABLE $showtablerow[0]")) {
+				$FLAG = 0;
+			}	
+		}
+	}
+
+	//Check if the appropriate tables have been deleted and return true if yes
+	if ($FLAG) {
+		return true;
+	} else {
+		return false;
+	}
+
+}
diff --git a/mod/logrotate/views/default/settings/logrotate/edit.php b/mod/logrotate/views/default/settings/logrotate/edit.php
index c73bec52c..32d59faa5 100644
--- a/mod/logrotate/views/default/settings/logrotate/edit.php
+++ b/mod/logrotate/views/default/settings/logrotate/edit.php
@@ -6,12 +6,16 @@
  */
 
 $period = $vars['entity']->period;
+$time = $vars['entity']->time;
 if (!$period) {
 	$period = 'monthly';
 }
-		
+
+if (!$time) {
+	$time = 'monthly';
+}		
 ?>
-<p>
+<div>
 	<?php echo elgg_echo('logrotate:period'); ?>
 	
 	<?php
@@ -25,4 +29,20 @@ if (!$period) {
 			'value' => $period
 		));
 	?>
-</p>
+
+	<?php echo elgg_echo('</div><div>'); ?>
+
+	<?php echo elgg_echo('logrotate:date'); ?>
+	
+	<?php
+		echo elgg_view('input/pulldown', array(
+			'internalname' => 'params[time]',
+			'options_values' => array(
+				'weekly' => elgg_echo('logrotate:week'),
+				'monthly' => elgg_echo('logrotate:month'),
+				'yearly' => elgg_echo('logrotate:year'),
+			),
+			'value' => $time
+		));
+	?>
+</div>
diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml
index 602c991d2..25c42ee93 100644
--- a/mod/messageboard/manifest.xml
+++ b/mod/messageboard/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>widget</category>
 	<description>This plugin allows users to put a message board on their profile for other users to post comments.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/messageboard/pages/messageboard/owner.php b/mod/messageboard/pages/messageboard/owner.php
index 7fd88a9d4..58021c29e 100644
--- a/mod/messageboard/pages/messageboard/owner.php
+++ b/mod/messageboard/pages/messageboard/owner.php
@@ -24,7 +24,7 @@ if ($history_user) {
 	$title = elgg_echo('messageboard:owner_history', array($history_user->name, $page_owner->name));
 
 	if ($page_owner instanceof ElggGroup) {
-		$mb_url = "messageboard/group/$page_owner->guid/owner";
+		$mb_url = "messageboard/group/$page_owner->guid/all";
 	} else {
 		$mb_url = "messageboard/owner/$page_owner->username";
 	}
diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php
index 899df19c3..efe453286 100644
--- a/mod/messageboard/start.php
+++ b/mod/messageboard/start.php
@@ -36,7 +36,7 @@ function messageboard_init() {
  *  User's messageboard:               messageboard/owner/<username>
  *  Y's history of posts on X's board: messageboard/owner/<X>/history/<Y>
  *  New post:                          messageboard/add/<guid> (container: user or group)
- *  Group messageboard:                messageboard/group/<guid>/owner
+ *  Group messageboard:                messageboard/group/<guid>/all (not implemented)
  *
  * @param array $page Array of page elements
  * @return bool
diff --git a/mod/messageboard/views/default/messageboard/js.php b/mod/messageboard/views/default/messageboard/js.php
index 131c96c8a..5d89fcd69 100644
--- a/mod/messageboard/views/default/messageboard/js.php
+++ b/mod/messageboard/views/default/messageboard/js.php
@@ -1,16 +1,18 @@
-
+//<script>
 elgg.provide('elgg.messageboard');
 
 elgg.messageboard.init = function() {
 	var form = $('form[name=elgg-messageboard]');
 	form.find('input[type=submit]').live('click', elgg.messageboard.submit);
 
-	// can't undelete because of init load order
-	form.parent().find('a.elgg-requires-confirmation').removeClass('elgg-requires-confirmation');
-	// delegate() instead of live() because live() has to be at the top level of chains...can't use parent().
+	// remove the default binding for confirmation since we're doing extra stuff.
+	// @todo remove if we add a hook to the requires confirmation callback
+	form.parent().find('a.elgg-requires-confirmation')
+		.click(elgg.messageboard.deletePost)
 
-	// delete is a little-known operator in JS. IE loses its mind if you name a method that.
-	form.parent().delegate('.elgg-button-delete a', 'click', elgg.messageboard.deletePost);
+		// double whammy for in case the load order changes.
+		.unbind('click', elgg.ui.requiresConfirmation)
+		.removeClass('elgg-requires-confirmation');
 }
 
 elgg.messageboard.submit = function(e) {
diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php
index 55b12f29b..63f389e6a 100644
--- a/mod/messageboard/views/default/widgets/messageboard/content.php
+++ b/mod/messageboard/views/default/widgets/messageboard/content.php
@@ -23,7 +23,7 @@ $options = array(
 echo elgg_list_annotations($options);
 
 if ($owner instanceof ElggGroup) {
-	$url = "messageboard/group/$owner->guid/owner";
+	$url = "messageboard/group/$owner->guid/all";
 } else {
 	$url = "messageboard/owner/$owner->username";
 }
diff --git a/mod/messages/languages/en.php b/mod/messages/languages/en.php
index 8e4cd015f..2002905b7 100644
--- a/mod/messages/languages/en.php
+++ b/mod/messages/languages/en.php
@@ -88,6 +88,9 @@ $english = array(
 	'messages:nomessages' => "There are no messages.",
 	'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.",
+
+	'messages:deleted_sender' => 'Deleted user',
+
 );
 		
 add_translation("en", $english);
\ No newline at end of file
diff --git a/mod/messages/manifest.xml b/mod/messages/manifest.xml
index e70ec0dee..66ca4b444 100644
--- a/mod/messages/manifest.xml
+++ b/mod/messages/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>communication</category>
 	<description>Elgg internal messages plugin. This plugin lets user send each other messages.</description>
 	<copyright>See COPYRIGHT.txt</copyright>
 	<website>http://www.elgg.org/</website>
@@ -12,5 +13,6 @@
 		<type>elgg_version</type>
 		<version>2010030101</version>
 	</requires>
+	<activate_on_install>true</activate_on_install>
 	<admin_interface>simple</admin_interface>
 </plugin_manifest>
diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
index b52b86a3a..b2d127d85 100644
--- a/mod/messages/views/default/object/messages.php
+++ b/mod/messages/views/default/object/messages.php
@@ -19,11 +19,16 @@ if ($full) {
 if ($message->toId == elgg_get_page_owner_guid()) {
 	// received
 	$user = get_entity($message->fromId);
-	$icon = elgg_view_entity_icon($user, 'tiny');
-	$user_link = elgg_view('output/url', array(
-		'href' => "messages/compose?send_to=$user->guid",
-		'text' => $user->name,
-	));
+	if ($user) {
+		$icon = elgg_view_entity_icon($user, 'tiny');
+		$user_link = elgg_view('output/url', array(
+			'href' => "messages/compose?send_to=$user->guid",
+			'text' => $user->name,
+		));
+	} else {
+		$icon = '';
+		$user_link = elgg_echo('messages:deleted_sender');
+	}
 
 	if ($message->readYet) {
 		$class = 'message read';
@@ -34,11 +39,17 @@ if ($message->toId == elgg_get_page_owner_guid()) {
 } else {
 	// sent
 	$user = get_entity($message->toId);
-	$icon = elgg_view_entity_icon($user, 'tiny');
-	$user_link = elgg_view('output/url', array(
-		'href' => "messages/compose?send_to=$user->guid",
-		'text' => elgg_echo('messages:to_user', array($user->name)),
-	));
+
+	if ($user) {
+		$icon = elgg_view_entity_icon($user, 'tiny');
+		$user_link = elgg_view('output/url', array(
+			'href' => "messages/compose?send_to=$user->guid",
+			'text' => elgg_echo('messages:to_user', array($user->name)),
+		));
+	} else {
+		$icon = '';
+		$user_link = elgg_echo('messages:deleted_sender');
+	}
 
 	$class = 'message read';
 }
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index d286d37a3..b059db487 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -325,7 +325,7 @@ if (!isset($vars['replacement'])) {
 
 ?>
 
-	<div class="elgg-divide-top mtm ptm">
+	<div class="elgg-form-footer-alt">
 <?php
 echo elgg_view('input/submit', array(
 	'value' => elgg_echo('save'),
diff --git a/mod/oauth_api/manifest.xml b/mod/oauth_api/manifest.xml
index 121c2e774..a0e3c4fda 100644
--- a/mod/oauth_api/manifest.xml
+++ b/mod/oauth_api/manifest.xml
@@ -3,8 +3,9 @@
 	<name>OAuth API</name>
 	<author>Core developers</author>
 	<version>1.8</version>
-	<category>bundled</category>
 	<description>Provides OAuth libraries and API support.</description>
+	<category>bundled</category>
+	<category>api</category>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
 	<license>GNU Public License version 2</license>
diff --git a/mod/pages/actions/pages/delete.php b/mod/pages/actions/pages/delete.php
index 077561b1e..dfa0de98d 100644
--- a/mod/pages/actions/pages/delete.php
+++ b/mod/pages/actions/pages/delete.php
@@ -33,7 +33,7 @@ if ($page) {
 				}
 			}
 			if (elgg_instanceof($container, 'group')) {
-				forward("pages/group/$container->guid/owner");
+				forward("pages/group/$container->guid/all");
 			} else {
 				forward("pages/owner/$container->username");
 			}
diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml
index e5e23f546..4b5e5c747 100644
--- a/mod/pages/manifest.xml
+++ b/mod/pages/manifest.xml
@@ -5,6 +5,7 @@
 	<version>1.8</version>
 	<category>bundled</category>
 	<category>content</category>
+	<category>widget</category>
 	<description>Elgg Pages</description>
 	<website>http://www.elgg.org</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/pages/pages/pages/history.php b/mod/pages/pages/pages/history.php
index 7ed5ad7f7..a7ef57b6b 100644
--- a/mod/pages/pages/pages/history.php
+++ b/mod/pages/pages/pages/history.php
@@ -20,7 +20,7 @@ if (!$container) {
 elgg_set_page_owner_guid($container->getGUID());
 
 if (elgg_instanceof($container, 'group')) {
-	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner");
+	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/all");
 } else {
 	elgg_push_breadcrumb($container->name, "pages/owner/$container->username");
 }
diff --git a/mod/pages/pages/pages/revision.php b/mod/pages/pages/pages/revision.php
index f542f5201..83d72286c 100644
--- a/mod/pages/pages/pages/revision.php
+++ b/mod/pages/pages/pages/revision.php
@@ -27,7 +27,7 @@ if (!$container) {
 $title = $page->title . ": " . elgg_echo('pages:revision');
 
 if (elgg_instanceof($container, 'group')) {
-	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner");
+	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/all");
 } else {
 	elgg_push_breadcrumb($container->name, "pages/owner/$container->username");
 }
diff --git a/mod/pages/pages/pages/view.php b/mod/pages/pages/pages/view.php
index d3503709d..b73bc985c 100644
--- a/mod/pages/pages/pages/view.php
+++ b/mod/pages/pages/pages/view.php
@@ -22,7 +22,7 @@ if (!$container) {
 $title = $page->title;
 
 if (elgg_instanceof($container, 'group')) {
-	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner");
+	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/all");
 } else {
 	elgg_push_breadcrumb($container->name, "pages/owner/$container->username");
 }
@@ -33,7 +33,7 @@ $content = elgg_view_entity($page, true);
 $content .= elgg_view_comments($page);
 
 $buttons = '';
-if ($page->canEdit()) {
+if (elgg_get_logged_in_user_guid() == $page->getOwnerGuid()) {
 	$url = "pages/add/$page->guid";
 	$buttons = elgg_view('output/url', array(
 			'text' => elgg_echo('pages:newchild'),
diff --git a/mod/pages/start.php b/mod/pages/start.php
index a8df99bef..744306649 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -25,7 +25,7 @@ function pages_init() {
 	// Register a url handler
 	elgg_register_entity_url_handler('object', 'page_top', 'pages_url');
 	elgg_register_entity_url_handler('object', 'page', 'pages_url');
-	register_extender_url_handler('pages_revision_url', 'annotation', 'page');
+	elgg_register_annotation_url_handler('page', 'pages_revision_url');
 
 	// Register some actions
 	$action_base = elgg_get_plugins_path() . 'pages/actions/pages';
@@ -65,7 +65,7 @@ function pages_init() {
 		'description' => 'longtext',
 		'tags' => 'tags',
 		'access_id' => 'access',
-		'write_access_id' => 'access',
+		'write_access_id' => 'write_access',
 	));
 
 	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'pages_owner_block_menu');
@@ -95,7 +95,7 @@ function pages_init() {
  *  Edit page:        pages/edit/<guid>
  *  History of page:  pages/history/<guid>
  *  Revision of page: pages/revision/<id>
- *  Group pages:      pages/group/<guid>/owner
+ *  Group pages:      pages/group/<guid>/all
  *
  * Title is ignored
  *
@@ -208,7 +208,7 @@ function pages_owner_block_menu($hook, $type, $return, $params) {
 		$return[] = $item;
 	} else {
 		if ($params['entity']->pages_enable != "no") {
-			$url = "pages/group/{$params['entity']->guid}/owner";
+			$url = "pages/group/{$params['entity']->guid}/all";
 			$item = new ElggMenuItem('pages', elgg_echo('pages:group'), $url);
 			$return[] = $item;
 		}
@@ -231,6 +231,15 @@ function pages_entity_menu_setup($hook, $type, $return, $params) {
 		return $return;
 	}
 
+	// remove delete if not owner or admin
+	if (!elgg_is_admin_logged_in() && elgg_get_logged_in_user_guid() != $entity->getOwnerGuid()) {
+		foreach ($return as $index => $item) {
+			if ($item->getName() == 'delete') {
+				unset($return[$index]);
+			}
+		}
+	}
+
 	$options = array(
 		'name' => 'history',
 		'text' => elgg_echo('pages:history'),
diff --git a/mod/pages/views/default/input/write_access.php b/mod/pages/views/default/input/write_access.php
new file mode 100644
index 000000000..69277ca20
--- /dev/null
+++ b/mod/pages/views/default/input/write_access.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Write access
+ *
+ * Removes the public option found in input/access
+ *
+ * @uses $vars['value'] The current value, if any
+ * @uses $vars['options_values']
+ * @uses $vars['name'] The name of the input field
+ * @uses $vars['entity'] Optional. The entity for this access control (uses write_access_id)
+ */
+
+$options = get_write_access_array();
+unset($options[ACCESS_PUBLIC]);
+
+$defaults = array(
+	'class' => 'elgg-input-access',
+	'disabled' => FALSE,
+	'value' => get_default_access(),
+	'options_values' => $options,
+);
+
+if (isset($vars['entity'])) {
+	$defaults['value'] = $vars['entity']->write_access_id;
+	unset($vars['entity']);
+}
+
+$vars = array_merge($defaults, $vars);
+
+if ($vars['value'] == ACCESS_DEFAULT) {
+	$vars['value'] = get_default_access();
+}
+$vars['value'] = ($vars['value'] == ACCESS_PUBLIC) ? ACCESS_LOGGED_IN : $vars['value'];
+
+echo elgg_view('input/dropdown', $vars);
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 756c542b4..2ad44e38c 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -18,6 +18,13 @@ if (!$page) {
 	return TRUE;
 }
 
+// pages used to use Public for write access
+if ($page->write_access_id == ACCESS_PUBLIC) {
+	// this works because this metadata is public
+	$page->write_access_id = ACCESS_LOGGED_IN;
+}
+
+
 if ($revision) {
 	$annotation = $revision;
 } else {
@@ -75,7 +82,7 @@ if ($full) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	$info = elgg_view_image_block($page_icon, $list_body);
 
@@ -96,7 +103,7 @@ HTML;
 		'tags' => $tags,
 		'content' => $excerpt,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($page_icon, $list_body);
 }
diff --git a/mod/pages/views/default/pages/group_module.php b/mod/pages/views/default/pages/group_module.php
index 6befb1c65..1d3437e18 100644
--- a/mod/pages/views/default/pages/group_module.php
+++ b/mod/pages/views/default/pages/group_module.php
@@ -13,7 +13,7 @@ if ($group->pages_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-	'href' => "pages/group/$group->guid/owner",
+	'href' => "pages/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
 ));
 
diff --git a/mod/profile/start.php b/mod/profile/start.php
index d91b66371..2c38fdd2d 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -7,6 +7,10 @@
 
 elgg_register_event_handler('init', 'system', 'profile_init', 1);
 
+// Metadata on users needs to be independent
+// outside of init so it happens earlier in boot. See #3316
+register_metadata_as_independent('user');
+
 /**
  * Profile init function
  */
@@ -16,8 +20,6 @@ function profile_init() {
 	// will dictate the URL for all ElggUser objects
 	elgg_register_entity_url_handler('user', 'all', 'profile_url');
 
-	// Metadata on users needs to be independent
-	register_metadata_as_independent('user');
 
 	elgg_register_simplecache_view('icon/user/default/tiny');
 	elgg_register_simplecache_view('icon/user/default/topbar');
@@ -127,4 +129,4 @@ function profile_default_widgets_hook($hook, $type, $return, $params) {
 	);
 
 	return $return;
-}
\ No newline at end of file
+}
diff --git a/mod/profile/views/default/profile/details.php b/mod/profile/views/default/profile/details.php
index 04d95001d..3af5cb756 100644
--- a/mod/profile/views/default/profile/details.php
+++ b/mod/profile/views/default/profile/details.php
@@ -25,12 +25,12 @@ if (is_array($profile_fields) && sizeof($profile_fields) > 0) {
 			//This function controls the alternating class
 			$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
 			?>
-			<p class="<?php echo $even_odd; ?>">
+			<div class="<?php echo $even_odd; ?>">
 				<b><?php echo elgg_echo("profile:{$shortname}"); ?>: </b>
 				<?php
 					echo elgg_view("output/{$valtype}", array('value' => $user->$shortname));
 				?>
-			</p>
+			</div>
 			<?php
 		}
 	}
@@ -45,7 +45,7 @@ if (!elgg_get_config('profile_custom_fields')) {
 		if ($user->description) {
 			echo "<p class='profile-aboutme-title'><b>" . elgg_echo("profile:aboutme") . "</b></p>";
 			echo "<div class='profile-aboutme-contents'>";
-			echo elgg_view('output/longtext', array('value' => $user->description));
+			echo elgg_view('output/longtext', array('value' => $user->description, 'class' => 'mtn'));
 			echo "</div>";
 		}
 	}
diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php
index c93398034..48d7ff24f 100644
--- a/mod/profile/views/default/profile/owner_block.php
+++ b/mod/profile/views/default/profile/owner_block.php
@@ -22,7 +22,7 @@ $admin = elgg_extract('admin', $menu, array());
 
 $profile_actions = '';
 if (elgg_is_logged_in() && $actions) {
-	$profile_actions = '<ul class="elgg-menu">';
+	$profile_actions = '<ul class="elgg-menu profile-action-menu mvm">';
 	foreach ($actions as $action) {
 		$profile_actions .= '<li>' . $action->getContent(array('class' => 'elgg-button elgg-button-action')) . '</li>';
 	}
diff --git a/mod/reportedcontent/languages/en.php b/mod/reportedcontent/languages/en.php
index 407717082..c047644e3 100644
--- a/mod/reportedcontent/languages/en.php
+++ b/mod/reportedcontent/languages/en.php
@@ -23,8 +23,8 @@ $english = array(
 	'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:objecttitle' => 'Page title',
+	'reportedcontent:objecturl' => 'Page url',
 	'reportedcontent:reason' => 'Reason for report',
 	'reportedcontent:description' => 'Why are you reporting this?',
 	'reportedcontent:address' => 'Location of the item',
diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php
index 044a40012..b8c443450 100644
--- a/mod/reportedcontent/views/default/object/reported_content.php
+++ b/mod/reportedcontent/views/default/object/reported_content.php
@@ -21,7 +21,8 @@ if ($report->state == 'archived') {
 ?>
 
 <div class="reported-content <?php echo $reportedcontent_background; ?>">
-	<div class="clearfix controls">
+	<div class="clearfix">
+		<div class="clearfix controls">
 <?php
 	if ($report->state != 'archived') {
 		$params = array(
@@ -40,28 +41,29 @@ if ($report->state == 'archived') {
 	);
 	echo elgg_view('output/url', $params);
 ?>
+		</div>
+		<p>
+			<b><?php echo elgg_echo('reportedcontent:by'); ?>:</b>
+			<?php echo elgg_view('output/url', array(
+				'href' => $reporter->getURL(),
+				'text' => $reporter->name
+			));
+			?>,
+			<?php echo elgg_view_friendly_time($report->time_created); ?>
+		</p>
+		<p>
+			<b><?php echo elgg_echo('reportedcontent:objecttitle'); ?>:</b>
+			<?php echo $report->title; ?>
+			<br />
+			<?php echo elgg_view('output/url', array(
+				'href' => "#report-$report->guid",
+				'text' => elgg_echo('reportedcontent:moreinfo'),
+				'class' => "elgg-toggler",
+			));
+			?>
+		</p>
 	</div>
-	<p>
-		<b><?php echo elgg_echo('reportedcontent:by'); ?>:</b>
-		<?php echo elgg_view('output/url', array(
-			'href' => $reporter->getURL(),
-			'text' => $reporter->name
-		));
-		?>,
-		<?php echo elgg_view_friendly_time($report->time_created); ?>
-	</p>
-	<p>
-		<b><?php echo elgg_echo('reportedcontent:objecttitle'); ?>:</b>
-		<?php echo $report->title; ?>
-		<br />
-		<?php echo elgg_view('output/url', array(
-			'href' => "#report-$report->guid",
-			'text' => elgg_echo('reportedcontent:moreinfo'),
-			'class' => "elgg-toggler",
-		));
-		?>
-	</p>
-	<div class="hidden" id="report-<?php echo $report->getGUID();?>">
+	<div class="report-details hidden" id="report-<?php echo $report->getGUID();?>">
 		<p>
 			<b><?php echo elgg_echo('reportedcontent:objecturl'); ?>:</b>
 			<?php echo elgg_view('output/url', array(
diff --git a/mod/reportedcontent/views/default/reportedcontent/admin_css.php b/mod/reportedcontent/views/default/reportedcontent/admin_css.php
index b1e96f56c..2eba964a1 100644
--- a/mod/reportedcontent/views/default/reportedcontent/admin_css.php
+++ b/mod/reportedcontent/views/default/reportedcontent/admin_css.php
@@ -28,5 +28,19 @@
 }
 .reported-content .controls {
 	float: right;
-	margin: 14px 5px 0 0;
+	margin: 0 0 0 10px;
+}
+.report-details {
+	background-color: white;
+	padding: 5px;
+	margin-bottom: 5px;
+	max-width: 500px;
+	
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.elgg-widget-content .reported-content .elgg-button {
+	display: block;
+	margin: 5px;
 }
diff --git a/mod/search/README.txt b/mod/search/README.txt
index fe87f3334..63b490e28 100644
--- a/mod/search/README.txt
+++ b/mod/search/README.txt
@@ -1,262 +1,281 @@
+= Elgg Search =
+
 Full text search developer's reference.
 
-CONTENTS:
-	1.  Overview
-	2.  Search and Custom Plugins
-	3.  Controlling Search Results
-		3.1  Entities Returned
-		3.2  Custom Search
-	4.  Controlling Search Views
-		4.1  Entities
-		4.2  Listing
-		4.3  Layout
-	5.  Hints and Quirks
+== Contents ==
 
+1. Overview
+2. Search and Custom Plugins
+3. Controlling Search Results
+	1. Entities Returned
+	2. Custom Search
+4. Controlling Search Views
+	1. Entities
+	2. Listing
+	3. Layout
+5. Hints and Quirks
 
-1.  OVERVIEW
 
-	* All entities are searched through title and description using
-	MySQL's native fulltext search when possible, and LIKE %...% when not.
-	This can be overridden on a type/subtype basis.
-	
-	* Entities are displayed in a standard list view consisting of a 
-	title, blurb, and icon of the owning entity.  This can be overridden 
-	on a type/subtype basis.
-	
-	* Search is separated based upon types/subtypes pairs and any 
-	registered custom search.
-	
-	* METADATA, ANNOTATIONS, AND PRIVATE DATA ARE NOT SEARCHED.  
-	These are used in a variety of ways by plugin authors and generally 
-	should not be displayed.  There are exceptions (profile fields and 
-	comments) but if a plugin needs to match against metadata, 
-	annotations, or private data it must register a search hook itself.
+== 1. Overview ==
 
+All entities are searched through title and description using
+MySQL's native fulltext search when possible, and `LIKE %...%` when not.
+This can be overridden on a type/subtype basis.
 
-2.  SEARCH AND CUSTOM PLUGINS
+Entities are displayed in a standard list view consisting of a 
+title, blurb, and icon of the owning entity.  This can be overridden 
+on a type/subtype basis.
 
-	* To appear in search you must register your entity type and subtype
-	by saying in your plugin's init function:
-	
-		register_entity_type($type, $subtype);
-	
-	If you are extending ElggObject with your own class, it is also advised 
-	to add a subtype in your plugin's run_once function by saying:
-	
-		add_subtype($type, $subtype, $class);
+Search is separated based upon types/subtypes pairs and any 
+registered custom search.
 
-	* If your plugin uses ElggEntity's standard title and description, 
-	and you don't need a custom display, there is nothing else you need 
-	to do for your results to appear in search.  If you would like more
-	granular control of search, continue below.
+**METADATA, ANNOTATIONS, AND PRIVATE DATA ARE NOT SEARCHED BY DEFAULT!**
 
-3.0  CONTROLLING SEARCH RESULTS
+These are used in a variety of ways by plugin authors and generally 
+should not be displayed.  There are exceptions (profile fields and 
+comments) but if a plugin needs to match against metadata, 
+annotations, or private data it must register a search hook itself.
 
-	* Search results can be controlled at a object:subtype level.
-	
-	* You can specify your own search types by responding to a hook.
 
-	
-3.1  CONTROLLING SEARCH RESULTS - ENTITIES RETURNED
+== 2. Search and Custom Plugins ==
 
-	* You can override the default search by responding to the search/type
-	or search/type:subtype hook.  Generally, you will be replying to 
-	search/object:subtype.
+To appear in search you must register your entity type and subtype
+by saying in your plugin's init function:
 
-	* Search will first trigger a hook for search/type:subtype.  If no 
-	results are returned (but not FALSE, see below) a hook for search/type 
-	will be triggered.  
-	
-	* FALSE returned for any search hook will halt results for that 
-	type/subtype.
-	
-	* Register plugin hooks like this:
-	
-		register_plugin_hook('search', 'object:my_subtype',
-			'my_subtype_search_hook');
-	
-	* The hooked function is provided with details about the search query
-	in $param.  These include:
-		query
-		offset
-		limit
-		search_type
-		type - Entity type. (Not applicable for custom searches)
-		subtype - Entity subtype.  (Not applicable for custom searches)
-		owner_guid
-		friends - Should only entities by friends of the logged in 
-			user be searched? (@todo)
-		pagination - Show pagination?
-	
-	* The hooked function should respond to search triggers with the 
-	following:
-		array(
-			'count' => A count of ALL entities found,
-			'entities' => An array of entities.
-		)
-	
-	This information is passed directly to the search view, so if you are 
-	registering your own custom hook, you can provide more 
-	information to display in your custom view. 
-	
-	* For each entity in the returned array, search expects two pieces of
-	volatile data: search_matched_title and search_matched_description.
-	Set these by saying:
-	
-		$entity->setVolatileData('data_name', 'data_value');
-		
-	Again, if you are customizing your search views, you can add anything
-	you need.
+	register_entity_type($type, $subtype);
 
+If you are extending ElggObject with your own class, it is also advised 
+to add a subtype in your plugin's run_once function by saying:
 
-3.2  CONTROLLING SEARCH RESULTS - CUSTOM SEARCH
-	
-	* Non-entities, including information from 3rd party applications,
-	can easily be included in search by registering a custom search hook
-	that responds to the search_types/get_types trigger:
-	
-		register_plugin_hook('search_types', 'get_types', 
-			'my_custom_search_hook_function');
+	add_subtype($type, $subtype, $class);
+
+If your plugin uses ElggEntity's standard title and description, 
+and you don't need a custom display, there is nothing else you need 
+to do for your results to appear in search.  If you would like more
+granular control of search, continue below.
+
+
+== 3. Controlling Search Results ==
+
+Search results can be controlled at a object:subtype level.
 	
-	In this function, append to the array sent in $value with the name of 
-	your custom search:
+You can specify your own search types by responding to a hook.
+
+
+=== 3.1 Controlling Search Results - Entities Returned ===
+
+You can override the default search by responding to the search/type
+or search/type:subtype hook.  Generally, you will be replying to 
+search/object:subtype.
+
+Search will first trigger a hook for search/type:subtype.  If no 
+results are returned (but not FALSE, see below) a hook for search/type 
+will be triggered.  
+
+FALSE returned for any search hook will halt results for that 
+type/subtype.
+
+Register plugin hooks like this:
+
+	register_plugin_hook('search', 'object:my_subtype',
+		'my_subtype_search_hook');
+
+The hooked function is provided with details about the search query
+in $param.  These include:
+
+* query
+* offset
+* limit
+* search_type
+* type - Entity type. (Not applicable for custom searches)
+* subtype - Entity subtype.  (Not applicable for custom searches)
+* owner_guid
+* friends - Should only entities by friends of the logged in
+	user be searched? (@todo)
+* pagination - Show pagination?
+
+The hooked function should respond to search triggers with the 
+following:
+
+	array(
+		'count' => A count of ALL entities found,
+		'entities' => An array of entities.
+	)
+
+This information is passed directly to the search view, so if you are 
+registering your own custom hook, you can provide more 
+information to display in your custom view. 
+
+For each entity in the returned array, search expects two pieces of
+volatile data: search_matched_title and search_matched_description.
+Set these by saying:
+
+	$entity->setVolatileData('data_name', 'data_value');
+
+Again, if you are customizing your search views, you can add anything
+you need.
+
+
+=== 3.2  Controlling Search Results - Custom Search ===
 	
-		function my_custom_search_hook_function($hook, $type, 
+Non-entities, including information from 3rd party applications,
+can easily be included in search by registering a custom search hook
+that responds to the search_types/get_types trigger:
+
+	register_plugin_hook('search_types', 'get_types',
+		'my_custom_search_hook_function');
+
+In this function, append to the array sent in $value with the name of 
+your custom search:
+
+	function my_custom_search_hook_function($hook, $type,
 		$value, $params) {
-			$value[] = 'my_custom_search';
-			return $value;
-		}
-	
-	Search will trigger a hook for search/my_custom_search, which your 
-	plugin should respond to as detailed in section 3.1 above.
 
+		$value[] = 'my_custom_search';
+		return $value;
+	}
 
-4.0  CONTROLLING SEARCH VIEWS
-	* Three types views are used for displaying search: entity, listing, 
-	and layout.
+Search will trigger a hook for search/my_custom_search, which your 
+plugin should respond to as detailed in section 3.1 above.
 
-	* Each view has a default that standardizes the display of entities
-	regardless of type, subtype, or search type.
 
-	* The entity and listing views can be customized based upon a type,
-	subtype, or custom search type of the results.
+== 4.0  Controlling Search Views ==
+Three types views are used for displaying search: entity, listing, 
+and layout.
 
-	* The layout view can be customized based upon the original search 
-	type. NB: This can be different to the types for the results.
+Each view has a default that standardizes the display of entities
+regardless of type, subtype, or search type.
 
-	* The entity view controls how each individual result is formatted.
+The entity and listing views can be customized based upon a type,
+subtype, or custom search type of the results.
 
-	* The listing view control how each group of listings is formatted.
+The layout view can be customized based upon the original search 
+type. NB: This can be different to the types for the results.
 
-	* The listing layout controls how each full result set is formatted.
+The entity view controls how each individual result is formatted.
 
+The listing view controls how each group of listings is formatted.
 
-4.1  CONTROLLING SEARCH VIEWS - ENTITIES
+The listing layout controls how each full result set is formatted.
 
-	* The default view for entities is search/entity.
 
-	* Search views are separate from the object/entity views because
-	view types might not match entity types.
-	
-	* The default search listing view iterates through each entity
-	found and passes to the entity view.  See 3.3 for more information
-	about listing views.
-	
-	* Entity views are discovered in the following order.  The first search
-	view found is used.
-		search/type/subtype/entity (For entity-based searches only)
-		search/type/entity
-		search/entity
-		
-	* The following parameters are passed in $vars to the entity view by 
-	the default listing view:
-		entity => The current returned entity
-		results => The results from the search/type:subtype hook
-		params => The params passed to the search/type:subtype hook
-		
-	* Example: To create an entity view for an ElggObject of subtype blog,
-	create a file called:
-		views/default/search/object/blog/entity.php
-		
-	To create an entity view for a custom search mysearch, create a file
-	called:
-		views/default/search/mysearch/entity.php
-	
-	
-4.2  CONTROLLING SEARCH VIEWS - LISTING
+=== 4.1  Controlling Search Views - Entities ===
+
+The default view for entities is search/entity.
+
+Search views are separate from the object/entity views because
+view types might not match entity types.
+
+The default search listing view iterates through each entity
+found and passes to the entity view.  See 3.3 for more information
+about listing views.
+
+Entity views are discovered in the following order.  The first search
+view found is used.
+
+	search/type/subtype/entity (For entity-based searches only)
+	search/type/entity
+	search/entity
 
-	* The default search view is search/listing.
+The following parameters are passed in $vars to the entity view by 
+the default listing view:
+
+	entity => The current returned entity
+	results => The results from the search/type:subtype hook
+	params => The params passed to the search/type:subtype hook
+
+Example: To create an entity view for an ElggObject of subtype blog,
+create a file called:
+
+	views/default/search/object/blog/entity.php
+
+To create an entity view for a custom search mysearch, create a file
+called:
+
+	views/default/search/mysearch/entity.php
 	
-	* For each entity in the returned array, search expects two pieces of
-	volatile data: search_matched_title and search_matched_description.
 	
-	* Listing views are discovered in the following order.  The first 
-	search view found is used.
-		search/type/subtype/listing (For entity-based searches only)
-		search/type/listing
-		search/listing
-		
-	* The view is called with the following in $vars:
-		results => The results from the search/type:subtype hook
-		params => The params passed to the search/type:subtype hook
-		
-	* Example: To create a listing view for ElggObjects with the subtype 
-	of blog, create a file called:
-		views/default/search/object/blog/listing.php
-		
-	To create a listing view for the custom search mysearch, create a file
-	called:
-		views/default/search/mysearch/listing.php
+=== 4.2  Controlling Search Views - Listing
+
+The default search view is search/listing.
+
+For each entity in the returned array, search expects two pieces of
+volatile data: search_matched_title and search_matched_description.
+
+Listing views are discovered in the following order.  The first 
+search view found is used.
+	search/type/subtype/listing (For entity-based searches only)
+	search/type/listing
+	search/listing
+
+The view is called with the following in $vars:
+	results => The results from the search/type:subtype hook
+	params => The params passed to the search/type:subtype hook
+
+Example: To create a listing view for ElggObjects with the subtype 
+of blog, create a file called:
+
+	views/default/search/object/blog/listing.php
+
+To create a listing view for the custom search mysearch, create a file
+called:
+
+	views/default/search/mysearch/listing.php
 		
 
-4.3  CONTROLLING SEARCH VIEWS - LAYOUT
-	
-	* The default layout view for search is search/layout, which calls
-	to elgg_view_layout(two_column_left_sidebar', '', $entity_results);
+=== 4.3  Controlling Search Views - Layout ===
 	
-	* Layouts can be overridden only when not searching all entities.
-	
-	* Layout views are discovered in the following order.  The first search
-	view found is used.
-		search/type/subtype/layout (For entity-based searches only)
-		search/type/layout
-		search/layout
-
-	* The following parameters are passed in $vars to the layout view:
-		body => The HTML formatted list of results.
-		params => The original params for the search.
-
-	* Example: To create a layout view for ElggObjects with the subtype 
-	of blog, create a file called:
-		views/default/search/object/blog/layout.php
-		
-	To create a layout view for the custom search mysearch, create a file
-	called:
-		views/default/search/mysearch/layout.php
+The default layout view for search is search/layout, which calls
+to `elgg_view_layout(two_column_left_sidebar', '', $entity_results);`
 
+Layouts can be overridden only when not searching all entities.
 
-5.  HINTS AND QUIRKS
+Layout views are discovered in the following order.  The first search
+view found is used.
 
-	* Use search_get_relevant_substring() to extract and highlight 
-	relevant substrings for the search_match_title and description.
-	
-	* If searching in 3rd party applications, create a temporary 
-	ElggObject to hold the results.  No need to save it since search 
-	uses volatile data.
-		$entity = new ElggObject();
-		$entity->owner_guid = use_magic_to_match_to_a_real_user();
-		$entity->setVolatileData('search_matched_title', 
-			'3rd Party Integration');
-		$entity->setVolatileData('search_matched_description', 
-			'Searching is fun!');
-		
-		return array(
-			'count' => $count,
-			'entities' => array($entity)
-		);
+	search/type/subtype/layout (For entity-based searches only)
+	search/type/layout
+	search/layout
+
+The following parameters are passed in $vars to the layout view:
+
+	body => The HTML formatted list of results.
+	params => The original params for the search.
+
+Example: To create a layout view for ElggObjects with the subtype 
+of blog, create a file called:
+
+	views/default/search/object/blog/layout.php
+
+To create a layout view for the custom search mysearch, create a file
+called:
+
+	views/default/search/mysearch/layout.php
+
+
+== 5.  Hints and Quirks ==
+
+Use search_get_relevant_substring() to extract and highlight 
+relevant substrings for the search_match_title and description.
+
+If searching in 3rd party applications, create a temporary 
+ElggObject to hold the results.  No need to save it since search 
+uses volatile data.
+
+	$entity = new ElggObject();
+	$entity->owner_guid = use_magic_to_match_to_a_real_user();
+	$entity->setVolatileData('search_matched_title',
+		'3rd Party Integration');
+	$entity->setVolatileData('search_matched_description',
+		'Searching is fun!');
+
+	return array(
+		'count' => $count,
+		'entities' => array($entity)
+	);
 
-	* MySQL's fulltext engine returns *ZERO* rows if more than 50% of 
-	the rows searched match.
+MySQL's fulltext engine returns *ZERO* rows if more than 50% of 
+the rows searched match.
 
-	* The default search hooks for users and groups ignore subtypes.
-	See http://trac.elgg.org/elgg/ticket/1499
+The default search hooks for users and groups ignore subtypes.
+See [trac ticket 1499](http://trac.elgg.org/elgg/ticket/1499)
diff --git a/mod/tagcloud/manifest.xml b/mod/tagcloud/manifest.xml
index 8ca4d10ea..6fcad14e2 100644
--- a/mod/tagcloud/manifest.xml
+++ b/mod/tagcloud/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Cash Costello</author>
 	<version>1.0</version>
 	<category>bundled</category>
+	<category>widget</category>
 	<description>Widget-based tag clouds.</description>
 	<website>http://cashcostello.com/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php
index b55fb11d0..1b9d71c56 100644
--- a/mod/thewire/languages/en.php
+++ b/mod/thewire/languages/en.php
@@ -43,7 +43,7 @@ $english = array(
 	 */
 	'thewire:posted' => "Your message was successfully posted to the wire.",
 	'thewire:deleted' => "The wire post was successfully deleted.",
-	'thewire:blank' => "Sorry, you need to enter come text before we can post this.",
+	'thewire:blank' => "Sorry, you need to enter some text before we can post this.",
 	'thewire:notfound' => "Sorry, we could not find the specified wire post.",
 	'thewire:notdeleted' => "Sorry. We could not delete this wire post.",
 
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 770f8bce0..0e6bd7794 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -12,7 +12,7 @@
  * Nathan Koterba
  */
 
-register_elgg_event_handler('init', 'system', 'thewire_init');
+elgg_register_event_handler('init', 'system', 'thewire_init');
 
 /**
  * The Wire initialization
@@ -52,24 +52,23 @@ function thewire_init() {
 	// Register a URL handler for thewire posts
 	elgg_register_entity_url_handler('object', 'thewire', 'thewire_url');
 
-	// Your thewire widget
-	add_widget_type('thewire', elgg_echo('thewire'), elgg_echo("thewire:widget:desc"));
+	elgg_register_widget_type('thewire', elgg_echo('thewire'), elgg_echo("thewire:widget:desc"));
 
-	// Register entity type
+	// Register for search
 	elgg_register_entity_type('object', 'thewire');
 
 	// Register granular notification for this type
 	register_notification_object('object', 'thewire', elgg_echo('thewire:notify:subject'));
 
 	// Listen to notification events and supply a more useful message
-	register_plugin_hook('notify:entity:message', 'object', 'thewire_notify_message');
+	elgg_register_plugin_hook_handler('notify:entity:message', 'object', 'thewire_notify_message');
 
 	// Register actions
 	$action_base = $CONFIG->pluginspath . 'thewire/actions';
-	register_action("thewire/add", false, "$action_base/add.php");
-	register_action("thewire/delete", false, "$action_base/delete.php");
+	elgg_register_action("thewire/add", "$action_base/add.php");
+	elgg_register_action("thewire/delete", "$action_base/delete.php");
 
-	register_plugin_hook('unit_test', 'system', 'thewire_test');
+	elgg_register_plugin_hook_handler('unit_test', 'system', 'thewire_test');
 }
 
 /**
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 7beb197ee..3ae347711 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -51,7 +51,7 @@ $params = array(
 	'content' => thewire_filter($post->description),
 	'tags' => false,
 );
-$list_body = elgg_view('page/components/summary', $params);
+$list_body = elgg_view('object/elements/summary', $params);
 
 echo elgg_view_image_block($owner_icon, $list_body);
 
diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml
index a3df59e3d..5e69055d8 100644
--- a/mod/tinymce/manifest.xml
+++ b/mod/tinymce/manifest.xml
@@ -4,7 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
-	<category>extension</category>
+	<category>enhancement</category>
 	<description>TinyMCE plugin.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/tinymce/start.php b/mod/tinymce/start.php
index 1b641ff86..3b662308a 100644
--- a/mod/tinymce/start.php
+++ b/mod/tinymce/start.php
@@ -23,7 +23,7 @@ function tinymce_longtext_menu($hook, $type, $items, $vars) {
 	
 	$items[] = ElggMenuItem::factory(array(
 		'name' => 'tinymce_toggler',
-		'class' => 'tinymce-toggle-editor elgg-longtext-control',
+		'link_class' => 'tinymce-toggle-editor elgg-longtext-control',
 		'href' => "#{$vars['id']}",
 		'text' => elgg_echo('tinymce:remove'),
 	));
diff --git a/mod/tinymce/vendor/tinymce/changelog.txt b/mod/tinymce/vendor/tinymce/changelog.txt
index 7ca00d134..a7c6bb650 100644
--- a/mod/tinymce/vendor/tinymce/changelog.txt
+++ b/mod/tinymce/vendor/tinymce/changelog.txt
@@ -1,3 +1,253 @@
+Version 3.4.2 (2011-04-07)

+	Added new 'paste_text_sticky_default' option to paste plugin, enables you to set the default state for paste as plain text.

+	Added new autoresize_bottom_margin option to autoresize plugin that enables you to add an extra margin at the bottom. Patch contributed by Andrew Ozz.

+	Rewritten the fullpage plugin to handle style contents better and have a more normalized behavior across browsers.

+	Fixed bug where contents inserted with mceInsertContent wasn't parsed using the default dom parser.

+	Fixed bug where blocks containing a single anchor element would be treated as empty.

+	Fixed bug where merging of table cells on IE 6, 7 wouldn't look correctly until the contents was refreshed.

+	Fixed bug where context menu wouldn't work properly on Safari since it was passing out the ctrl key as pressed.

+	Fixed bug where image border color/style values were overwritten by advimage plugin.

+	Fixed bug where setting border in advimage plugin would throw error in IE.

+	Fixed bug where empty anchors list in link settings wasn't hidden.

+	Fixed bug where xhtmlextras popups were missing localized popup-size parameters.

+	Fixed bug where the context menu wouldn't select images on WebKit browsers.

+	Fixed bug where paste plugin wouldn't properly extract the contents on WebKit due to recent changes in browser behavior.

+	Fixed bug where focus of the editor would get on control contents on IE lost due to a bug in the ColorSplitButton control.

+	Fixed bug where contextmenu wasn't disabled on noneditable elements.

+	Fixed bug where getStyle function would trigger error when called on element without style property.

+	Fixed bug where editor fail to load if Javascript Compressor was used.

+	Fixed bug where list-style-type=lower-greek would produce errors in IE<8.

+	Fixed bug where spellchecker plugin would produce errors on IE6-7.

+	Fixed bug where theme_advanced_containers configuration option causes error.

+	Fixed bug where the mceReplaceContent command would produce an error since it didn't correctly handle a return value.

+	Fixed bug where you couldn't enter float point values for em in dialog input fields since it wouldn't be considered a valid size.

+	Fixed bug in xhtmlxtras plugin where it wasn't possible to remove some attributes in the attributes dialog.

+Version 3.4.1 (2011-03-24)

+	Added significantly improved list handling via the new 'lists' plugin.

+	Added 'autolink' plugin to enable automatically linking URLs. Similar to the behavior IE has by default.

+	Added 'theme_advanced_show_current_color' setting to enable the forecolor and backcolor buttons to continuously show the current text color.

+	Added 'contextmenu_never_use_native' setting to disable the ctrl-right-click showing the native browser context menu behaviour.

+	Added 'paste_enable_default_filters' setting to enable the default paste filters to be disabled.

+	Fixed bug where selection locations on undo/redo didn't work correctly on specific contents.

+	Fixed bug where an exception would be trown on IE when loading TinyMCE inside an iframe.

+	Fixed bug where some ascii numeric entities wasn't properly decoded.

+	Fixed bug where some non western language codes wasn't properly decoded/encoded.

+	Fixed bug where undo levels wasn't created when deleting contents on IE.

+	Fixed bug where the initial undo levels bookmark wasn't updated correctly.

+	Fixed bug where search/replace wouldn't be scoped to editor instances on IE8.

+	Fixed bug where IE9 would produce two br elements after block elements when pasting.

+	Fixed bug where IE would place the caret at an incorrect position after a paste operation.

+	Fixed bug where a paste operation using the keyboard would add an extra undo level.

+	Fixed bug where some attributes/elements wasn't correctly filtered when invalid contents was inserted.

+	Fixed bug where the table plugin couldn't correctly handle invalid table structures.

+	Fixed bug where charset and title of the page were handled incorrectly by the fullpage plugin.

+	Fixed bug where toggle states on some of the list boxes didn't update correctly.

+	Fixed bug where sub/sub wouldn't work correctly when done as a caret action in Chrome 10.

+	Fixed bug where the constrain proportions checkbox wouldn't work in the media plugin.

+	Fixed bug where block elements containing trailing br elements wouldn't treated properly if they where invalid.

+	Fixed bug where the color picker dialog wouldn't be rendered correctly when using the o2k7 theme.

+	Fixed bug where setting border=0 using advimage plugin invalid style attribute content was created in Chrome.

+	Fixed bug with references to non-existing images in css of fullpage plugin.

+	Fixed bug where item could be unselected in spellchecker's language selector.

+	Fixed bug where some mispelled words could be not highlighted using spellchecker plugin.

+	Fixed bug where spellchecking would merge some words on IE.

+	Fixed bug where spellchecker context menu was not always positioned correctly.

+	Fixed bug with empty anchors list in advlink popup when Invisible Elements feature was disabled.

+	Fixed bug where older IE versions wouldn't properly handle some elements if they where placed at the top of editor contents.

+	Fixed bug where selecting the whole table would enable table tools for cells and rows.

+	Fixed bug where it wasn't possible to replace selected contents on IE when pasting using the paste plugin.

+	Fixed bug where setting text color in fullpage plugin doesn't work.

+	Fixed bug where the state of checkboxes in media plugin wouldn't be set correctly.

+	Fixed bug where black spade suit character was not included in special character selector.

+	Fixed bug where setting invalid values for table cell size would throw an error in IE.

+	Fixed bug where spellchecking would remove whitespace characters from PRE block in IE.

+	Fixed bug where HR was inserted inside P elements instead of splitting them.

+	Fixed bug where extra, empty span tags were added when using a format with both selector and inline modes.

+	Fixed bug where bullet lists weren't always detected correctly.

+	Fixed bug where deleting some paragraphs on IE would cause an exception.

+	Fixed bug where the json encoder logic wouldn't properly encode \ characters.

+	Fixed bug where the onChange event would be fired when the editor was first initialized.

+	Fixed bug where mceSelected wouldn't be removed properly from output even if it's an internal class.

+	Fixed issue with table background colors not being transparent. This improves compliance with users browser color preferences.

+	Fixed issue where styles were not included when using the full page plugin.

+	Fixed issue where drag/drop operations wasn't properly added to the undo levels.

+	Fixed issue where colors wasn't correctly applied to elements with underline decoration.

+	Fixed issue where deleting some paragraphs on IE would cause an exception.

+Version 3.4 (2011-03-10)

+	Added accessibility example with various accessibility options contributed by Ephox.

+	Fixed bug where attributes wasn't properly handled in the xhtmlxtras plugin.

+	Fixed bug where the image.htm had some strange td artifacts probably due to auto merging.

+	Fixed bug where the ToolbarGroup had an missing reference to this in it's destroy method.

+	Fixed bug with the resizeBy function in the advanced theme where it was scaled by the wrong parent.

+	Fixed bug where an exception would be thrown by the element if the page was served in xhtml mode.

+	Fixed bug where mceInsertContent would throw an exception when page was served in xhtml mode.

+	Fixed bug where you couldn't select a forground/background color when page was served in xhtml mode.

+	Fixed bug where the editor would scroll to the toolbar when clicked due to a call to focus in ListBox.

+	Fixed bug where pages with rtl dir wouldn't render split buttons correctly when using the o2k7 theme.

+	Fixed bug where anchor elements with names wasn't properly collapsed as they where in 3.3.x.

+	Fixed bug where WebKit wouldn't properly handle image selection if it was done left to right.

+	Fixed bug where the formatter would align images when the selection range was collapsed.

+	Fixed bug where the image button would be active when the selection range was collapsed.

+	Fixed bug where the element_format option wasn't used by the new (X)HTML serializer logic.

+	Fixed bug where the table cell/row dialogs would produce empty attributes.

+	Fixed bug where the tfoot wouldn't be added to the top of the table.

+	Fixed bug where the formatter would merge siblings with white space between them.

+	Fixed bug where pasting headers and paragraphs would produce an extra paragraph.

+	Fixed bug where the ColorSplitButton would throw an exception if you clicked out side a color.

+	Fixed bug where IE9 wouldn't properly produce new paragraphs on enter if the current paragraph had formatting.

+	Fixed bug where multiple BR elements at end of block elements where removed.

+	Fixed bug where fullscreen plugin wouldn't correctly display the edit area on IE6 for long pages.

+	Fixed bug where paste plugin wouldn't properly encode raw entities when pasting in plain text mode.

+	Fixed bug where the search/replace plugin wouldn't work correctly on IE 9.

+	Fixed so the drop menus doesn't get an outline border visible when focused, patch contributed by Ephox.

+	Fixed so the values entered in the color picker are forced to hex values.

+	Removed dialog workaround for IE 9 beta since the RC is now out and people should upgrade.

+	Removed obsolete calls in various plugins to the mceBeginUndoLevel command.

+Version 3.4b3 (2011-02-10)

+	Added WAI-ARIA support for the main UI and dialogs this feature was contributed by Ephox.

+	Added iframe support to media plugin in order to handle the new YouTube HTML5 video formats.

+	Fixed bug where anchors would wrap the text contents after it due to a bug in the DomParser logic.

+	Fixed bug where the selected state wouldn't be removed on ListBox controls when a menu item was selected.

+	Fixed bug where IE could throw an unspecified error exception when the getBookmark logic was executed.

+	Fixed bug where IE would throw an invalid argument error when focus was applied to an empty editor instance.

+	Fixed bug where applying inline format wouldn't work if the start cell in the selection was empty.

+	Fixed bug where auto detection logic for YouTube and Google Video wouldn't work in the new media plugin.

+	Fixed bug where td elements would get a colspan/rowspan of 1 when created by the table plugin.

+	Fixed bug where removal/padding of empty elements wasn't handled correctly.

+	Fixed bug where internal elements would show up in element path.

+	Fixed bug where internal elements would get serialized as valid output.

+	Fixed bug where color wasn't correctly applied to anchor elements.

+	Fixed bug where float option in the style plugin dialog wouldn't be handled correctly on WebKit.

+	Fixed bug where the tinymce.dom.TreeWalker prev function wouldn't walk the DOM correctly.

+	Fixed bug where mceInsertContent command could produce empty block elements after the inserted content.

+	Fixed bug where mceInsertContent command wouldn't apply visual aids on tables and similar elements.

+	Fixed bug where empty block elements would get double br bogus elements in them.

+	Fixed bug where the color menu wouldn't apply the color correctly on IE when the viewport was to small.

+	Fixed bug where right clicking out side the body element of the editor iframe would prevent paste from working on IE.

+	Fixed bug where the onContextMenu event wouldn't fire correctly on IE if you clicked out side the body element.

+	Fixed bug where the onContextMenu event wouldn't fire correctly on modern Opera versions that now support it by default.

+	Fixed bug where legacy content wasn't converted correctly when inserted using mceInsertContent or through the source dialog.

+	Fixed bug where resizing images or tables wouldn't update the style attribute correctly or leave data-mce prefixed attributes.

+	Fixed bug where adding links wouldn't work correctly when using TinyMCE jQuery version with jQuery 1.5.

+	Fixed bug where single quotes inside param elements wasn't treated correctly by the media plugin.

+	Fixed bug where pasting plain text in WebKit wouldn't work correctly. It will now auto detect the WebKit bug and use plain text mode.

+	Fixed bug where the DomParser would fail to move out invalid elements within invalid elements on complex contents.

+	Fixed bug where paste as plain text would not decode html entities properly.

+	Fixed bug where large paragraphs would cause incorrect scrolling behavior if you would split them using enter.

+	Fixed bug where the SaxParser wouldn't properly parse some specific short ended elements.

+	Fixed so mceReplaceContent supports caret position and makes sure that the contents inserted gets validated.

+	Fixed so unnecessary traling br elements in blocks gets removed on Gecko/WebKit when using mceInsertContent command.

+	Moved some plugin css contents into the skin content css files to reduce the number of http requests.

+	Moved some plugin specific images into the theme img directory since they can then be shared.

+Version 3.4b2 (2011-01-13)

+	Added new custom flash player, this player supports mp4 and flv and has skin support.

+	Fixed so mceInsertContent handles context correctly to enforce valid nesting of elements.

+	Fixed bug where scrolling would become jerky on IE on some contents.

+	Fixed bug where paste as plain text would throw exception of missing entities setting.

+	Fixed bug where anchor nodes where removed by the new serializer engine.

+	Fixed bug where IE would crash if when backspace where used on some specific contents.

+	Fixed bug where pasting of plain text in WebKit would result in merging of text lines.

+	Fixed bug where it wasn't possible to delete images or tables using backspace on IE9.

+	Fixed bug where urls in styles would generate a JS error due to incorrect scope.

+	Fixed bug where copy paste from Java applications would produce extra contents in FF on Mac.

+	Fixed bug where the verify_html option wouldn't allow all elements and attributes.

+Version 3.4b1 (2010-12-20)

+	Added new serialization engine that increases performance and enforces valid output according to the specified schema settings.

+	Added new HTML parser logic used by the serialization engine and can handle malformed html contents.

+	Added new valid_children config option, enables more fine grain control of elements can be inside other elements.

+	Added new entities encoding logic boost performance and will only encode entities based on context i.e. attributes/text nodes.

+	Added new protect setting that enables users to protect template items from being removed by the serializer logic.

+	Added new {$caret} marker for the mceInsertContent command. Makes it possible to move the caret to a specific position when inserting contents.

+	Added new validation of anchor names. Only valid W3C names will be accepted.

+	Replaced the internal _mce_ prefixed attributes to the more standard HTML5 data-mce- prefix. This will also resolve future browser santiaztion issues.

+	Fixed bug where the paste plugin wouldn't convert Word lists with more than 9 items to real ol lists. Patch contributed by Mike (yogaboy).

+	Fixed bug where clicking on a format title would produce errors if the current selection didn't have any formats.

+	Fixed bug where paste of simple texts wouldn't work correctly in Gecko using the paste plugin since it keeps block formatting.

+	Fixed bug where confirm dialogs didn't display correctly due to resent IE9 fixes.

+	Fixed bug where spaces in URLs wouldn't be properly encoded to %20 if the user entered them in the link dialogs. Patch contributed by Ephox.

+	Fixed bug where the image alignment buttons wouldn't reposition the resize handles on FF due to a browser issue. Patch contributed by Ephox.

+	Fixed bug where the compareBoundaryPoints method of the IE Range class didn't work correctly. Patch contributed by Ephox.

+	Fixed bug where selection of elements using double click wouldn't select the clicked element but rather the parent node on FF. Patch contributed by Ephox.

+	Fixed bug where IE would scroll the user to the current selection causing parent document to scroll as well. Patch contributed by Ephox.

+	Fixed bug where style compression would incorrectly compress items with different values. It now only compresses if the values are the same. Patch contributed by Ephox.

+	Fixed bug where FF would add non breaking spaces outside TD elements if formatting was applied to table cells. Patch contributed by Ephox.

+	Fixed bug where the caret position would be lost on WebKit browsers if you pasted images multiple times. Patch contributed by Ephox.

+	Fixed bug where non word contents like * would be counted as words in the wordcount pluging. Patch contributed by David Balatero.

+	Fixed bug where the toggle absolute button in the layer plugin wouldn't remove the existing internal style attribute first.

+	Fixed bug where the autosave plugin would generate an exception on IE if the user had disabled userdata persistence.

+	Fixed bug where the paste plugin would remove dashed classes on IE since the regexps didn't include that character.

+	Fixed bug where applying text color would not add spans inside link elements. This is needed due to CSS style inheritance.

+	Fixed bug where applying block formats to empty elements wouldn't render correctly on IE.

+	Fixed bug where the searchreplace plugin would add a f or r character when shortcuts where used on IE while using default dialogs.

+	Fixed bug where Opera wouldn't load scripts correctly since the onreadystate would fire even though the script wasn't loaded.

+	Fixed issue where &nbsp; wouldn't be handled correctly in the bbcode plugin if entity_encoding was set to raw.

+	Fixed issue where contents would flicker since the content css files where asynchronously loaded.

+	Fixed bug where WebKit wouldn't create links on images with a float style.

+Version 3.3.9.3 (2010-12-20)

+	Fixed issue where WebKit wouldn't correctly apply ins/del in xhtmlxtras plugin.

+	Fixed bug where paste as plaintext on WebKit wouldn't produce br and p elements correctly.

+	Fixed bug where the confirm dialog texts would be incorrectly placed due to recent IE 9 workarounds in the window.css.

+	Fixed bug where applying text color would not add spans inside link elements. This is needed due to CSS style inheritance.

+Version 3.3.9.2 (2010-09-29)

+	Fixed bug where placing the caret in IE 9 beta 1 would not work correctly if you clicked out side the document body element.

+	Fixed bug where IE 9 beta 1 wouldn't resize the editor correctly since the events didn't fire as previous versions did.

+	Fixed bug where FF would produce an error message when being rendered inside a hidden div element.

+	Fixed bug where resize logic could produce a cookie with a width/height less than the size of the container.

+	Fixed bug where content_css wouldn't populate the styles dropdown correctly.

+Version 3.3.9.1 (2010-09-23)

+	Fixed bug where WebKit browsers wouldn't activate the image button when images where selected.

+	Fixed bug where Opera Presto 10.60 deletes elements when restoring bookmarks.

+	Fixed bug where IE9 beta1 doesn't handle regexp replacement values correctly.

+	Fixed bug where IE9 beta1 didn't render the inline dialogs correctly due to a bug with CSS clip.

+	Fixed bug where IE9 beta1 would produce error messages on load since they removed the document.recalc method.

+	Fixed bug where IE9 beta1 would produce <html xmlns=""> since they haven't implemented document.implementation.createDocument correctly.

+	Fixed bug where IE9 beta1 would searchreplace doesn't work since their native DOM Range doesn't have a find method.

+	Fixed bug where IE9 beta1 would render the source view incorrectly due to incorrect viewport size measurements.

+	Fixed bug where IE9 beta1 would crash when running the basic functionality unit tests.

+	Fixed bug where IE9 beta1 would wrap elements in blocks correctly due to changes to the selection object.

+	Fixed bug where IE9 beta1 would fail to insert contents since they havn't implemented the createContextualFragment method in their DOM Range.

+	Fixed bug where IE9 beta1 would fail to handle image selection since they currently doesn't support control selections in their DOM Range.

+	Fixed bug where IE9 beta1 would fail to load scripts since they fire the onload event before the scripts are parsed and executed.

+Version 3.3.9 (2010-09-08)

+	Fixed bug where inserting table rows into a table with subtable would produce an incorrect column count.

+	Fixed bug where the selection of cells in a table with subtables could produce invalid selections.

+	Fixed bug where the table plugin would produce a script error if you tried to move the caret before a first child table.

+	Fixed bug where the keep_styles feature on IE would move the caret to an incorrect location at the end of list blocks.

+	Fixed so attributes from legacy elements such as font gets retained when they get converted to spans.

+	Fixed minor issue where the select boxes wouldn't be set the not set by default in the table dialog.

+Version 3.3.8 (2010-06-30)

+	On IE8+ and FireFox 3.5+, dragging an image now correctly adds an undo

+	event.

+	Fixed bug where WebKit would not move the caret to a correct position after a paste operation.

+	Fixed bug where WebKit would produce a div wrapper element when pasting some contents.

+	Fixed bug where the visual chars and nonbreaking plugin wouldn't show nbsp elements correctly.

+	Fixed bug where the format states would be enabled even after the format was removed.

+	Fixed bug where the delete key would move the caret to an incorrect position.

+	Fixed bug where it wasn't possible to toggle of the current font size/family/style by clicking the title item.

+	Fixed bug where the abbr element wouldn't get serialized correctly on IE6.

+	Fixed so that the examples checks if they are executed from the local file system since that might not work properly.

+Version 3.3.7 (2010-06-10)

+	Fixed bug where context menu would produce an error on IE if you right clicked twice and left clicked once.

+	Fixed bug where resizing of the window on WebKit browsers in fullscreen mode wouldn't position the statusbar correctly.

+	Fixed bug where IE would produce an error if the editor was empty and you where undoing to that initial level.

+	Fixed bug where setting the table background on gecko would produce \" entities inside the url style property.

+	Fixed bug where the button states wouldn't be updated correctly on IE if you placed the caret inside the new element.

+	Fixed bug where undo levels wasn't properly added after applying styles or font sizes.

+	Fixed bug where IE would throw an error if you used "select all" on empty elements and applied formatting to that.

+	Fixed bug where IE could select one extra character when you did a bookmark call on a caret location.

+	Fixed bug where IE could produce a script error on delete since it would sometimes produce an invalid DOM.

+	Fixed bug where IE would return the wrong start element if the whole element was selected.

+	Fixed bug where formatting states wasn't updated on IE if you pressed enter at the end of a block with formatting.

+	Fixed bug where submenus for the context menu wasn't removed correctly when the editor was destroyed.

+	Fixed bug where Gecko could select the wrong element after applying format to multiple elements.

+	Fixed bug where Gecko would delete parts of the previous element if the selection range was a element selection.

+	Fixed bug where Gecko would not merge paragraph elements correctly if they contained br elements.

+	Fixed bug where the cleanup button could produce span artifacts if you pressed it twice in a row.

+	Fixed bug where the fullpage plugin header/footer would be have it's header reseted to it's initial state on undo.

+	Fixed bug where an empty paragraph would be collapsed if you performed a cleanup while having the caret inside it.

+	Fixed a few memory leaks on IE especially with drop menus in listboxes and the spellchecker.

+	Fixed so formats applied to the current caret gets merged to reduce the number of output elements.

+	Added the latest version of Sizzle for the CSS selector logic to fix a compatibility issue with prototype.

 Version 3.3.6 (2010-05-20)

 	Fixed bug where a editor.focus call could produce errors on IE in very specific scenarios.

 	Fixed bug where Gecko would produce an error if you unformatted text inside an empty element.

diff --git a/mod/tinymce/vendor/tinymce/examples/accessibility.html b/mod/tinymce/vendor/tinymce/examples/accessibility.html
new file mode 100644
index 000000000..69059403c
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/accessibility.html
@@ -0,0 +1,101 @@
+<!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>Full featured example</title>

+

+<!-- TinyMCE -->

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

+<script type="text/javascript">

+	tinyMCE.init({

+		// General options

+		mode : "textareas",

+		theme : "advanced",

+		plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",

+

+		// Theme options

+		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

+		theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",

+		theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",

+		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",

+		theme_advanced_toolbar_location : "top",

+		theme_advanced_toolbar_align : "left",

+		theme_advanced_statusbar_location : "bottom",

+		theme_advanced_resizing : true,

+

+		// Example content CSS (should be your site CSS)

+		// using false to ensure that the default browser settings are used for best Accessibility

+		// ACCESSIBILITY SETTINGS
+		content_css : false,

+		// Use browser preferred colors for dialogs.
+		browser_preferred_colors : true,

+		detect_highcontrast : true,

+

+		// Drop lists for link/image/media/template dialogs

+		template_external_list_url : "lists/template_list.js",

+		external_link_list_url : "lists/link_list.js",

+		external_image_list_url : "lists/image_list.js",

+		media_external_list_url : "lists/media_list.js",

+

+		// Style formats

+		style_formats : [

+			{title : 'Bold text', inline : 'b'},

+			{title : 'Red text', inline : 'span', styles : {color : '#ff0000'}},

+			{title : 'Red header', block : 'h1', styles : {color : '#ff0000'}},

+			{title : 'Example 1', inline : 'span', classes : 'example1'},

+			{title : 'Example 2', inline : 'span', classes : 'example2'},

+			{title : 'Table styles'},

+			{title : 'Table row 1', selector : 'tr', classes : 'tablerow1'}

+		],

+

+		// Replace values for the template plugin

+		template_replace_values : {

+			username : "Some User",

+			staffid : "991234"

+		}

+	});

+</script>

+<!-- /TinyMCE -->

+

+</head>

+<body>

+

+<form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true">

+	<div>

+		<h3>Full featured example, with Accessibility settings enabled</h3>

+

+		<p>

+			This page has got the TinyMCE set up to work with configurations related to accessiblity enabled.

+			In particular
+			<ul>
+			<li>the <strong>content_css</strong> is set to false, to ensure that all default browser styles are used, </li>
+			<li>the <strong>browser_preferred_colors</strong> dialog option is used to ensure that default css is used for dialogs, </li>
+			<li>and the <strong>detect_highcontrast</strong> option has been set to ensure that highcontrast mode in Windows browsers
+			is detected and the toolbars are displayed in a high contrast mode.</li>
+			</ul>
+		</p>

+

+		<!-- Gets replaced with TinyMCE, remember HTML in a textarea should be encoded -->

+		<div>

+			<textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 80%">

+				&lt;p&gt;

+					This is some example text that you can edit inside the &lt;strong&gt;TinyMCE editor&lt;/strong&gt;.

+				&lt;/p&gt;

+				&lt;p&gt;

+				Nam nisi elit, cursus in rhoncus sit amet, pulvinar laoreet leo. Nam sed lectus quam, ut sagittis tellus. Quisque dignissim mauris a augue rutrum tempor. Donec vitae purus nec massa vestibulum ornare sit amet id tellus. Nunc quam mauris, fermentum nec lacinia eget, sollicitudin nec ante. Aliquam molestie volutpat dapibus. Nunc interdum viverra sodales. Morbi laoreet pulvinar gravida. Quisque ut turpis sagittis nunc accumsan vehicula. Duis elementum congue ultrices. Cras faucibus feugiat arcu quis lacinia. In hac habitasse platea dictumst. Pellentesque fermentum magna sit amet tellus varius ullamcorper. Vestibulum at urna augue, eget varius neque. Fusce facilisis venenatis dapibus. Integer non sem at arcu euismod tempor nec sed nisl. Morbi ultricies, mauris ut ultricies adipiscing, felis odio condimentum massa, et luctus est nunc nec eros.

+				&lt;/p&gt;

+			</textarea>

+		</div>

+

+		<br />

+		<input type="submit" name="save" value="Submit" />

+		<input type="reset" name="reset" value="Reset" />

+	</div>

+</form>

+

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

+</body>

+</html>
diff --git a/mod/tinymce/vendor/tinymce/examples/css/content.css b/mod/tinymce/vendor/tinymce/examples/css/content.css
new file mode 100644
index 000000000..a76c38a2f
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/css/content.css
@@ -0,0 +1,105 @@
+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;

+}

+

+td {

+	font-family: Verdana, Arial, Helvetica, sans-serif;

+	font-size: 10px;

+}

+

+pre {

+	font-family: Verdana, Arial, Helvetica, sans-serif;

+	font-size: 10px;

+}

+

+.example1 {

+	font-weight: bold;

+	font-size: 14px

+}

+

+.example2 {

+	font-weight: bold;

+	font-size: 12px;

+	color: #FF0000

+}

+

+.tablerow1 {

+	background-color: #BBBBBB;

+}

+

+thead {

+	background-color: #FFBBBB;

+}

+

+tfoot {

+	background-color: #BBBBFF;

+}

+

+th {

+	font-family: Verdana, Arial, Helvetica, sans-serif;

+	font-size: 13px;

+}

+

+/* Basic formats */

+

+.bold {

+	font-weight: bold;

+}

+

+.italic {

+	font-style: italic;

+}

+

+.underline {

+	text-decoration: underline;

+}

+

+/* Global align classes */

+

+.left {

+	text-align: inherit;

+}

+

+.center {

+	text-align: center;

+}

+

+.right {

+	text-align: right;

+}

+

+.full {

+	text-align: justify

+}

+

+/* Image and table specific aligns */

+

+img.left, table.left {

+	float: left;

+	text-align: inherit;

+}

+

+img.center, table.center {

+	margin-left: auto;

+	margin-right: auto;

+	text-align: inherit;

+}

+

+img.center {

+	display: block;

+}

+

+img.right, table.right {

+	float: right;

+	text-align: inherit;

+}

diff --git a/mod/tinymce/vendor/tinymce/examples/css/word.css b/mod/tinymce/vendor/tinymce/examples/css/word.css
new file mode 100644
index 000000000..049a39fbd
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/css/word.css
@@ -0,0 +1,53 @@
+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;

+}

+

+p {margin:0; padding:0;}

+

+td {

+	font-family: Verdana, Arial, Helvetica, sans-serif;

+	font-size: 10px;

+}

+

+pre {

+	font-family: Verdana, Arial, Helvetica, sans-serif;

+	font-size: 10px;

+}

+

+.example1 {

+	font-weight: bold;

+	font-size: 14px

+}

+

+.example2 {

+	font-weight: bold;

+	font-size: 12px;

+	color: #FF0000

+}

+

+.tablerow1 {

+	background-color: #BBBBBB;

+}

+

+thead {

+	background-color: #FFBBBB;

+}

+

+tfoot {

+	background-color: #BBBBFF;

+}

+

+th {

+	font-family: Verdana, Arial, Helvetica, sans-serif;

+	font-size: 13px;

+}

diff --git a/mod/tinymce/vendor/tinymce/examples/custom_formats.html b/mod/tinymce/vendor/tinymce/examples/custom_formats.html
new file mode 100644
index 000000000..ba9d1eb0c
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/custom_formats.html
@@ -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>Custom formats example</title>

+

+<!-- TinyMCE -->

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

+<script type="text/javascript">

+	tinyMCE.init({

+		// General options

+		mode : "textareas",

+		theme : "advanced",

+		plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",

+

+		// Theme options

+		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

+		theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",

+		theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",

+		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",

+		theme_advanced_toolbar_location : "top",

+		theme_advanced_toolbar_align : "left",

+		theme_advanced_statusbar_location : "bottom",

+		theme_advanced_resizing : true,

+

+		// Example content CSS (should be your site CSS)

+		content_css : "css/content.css",

+

+		// Drop lists for link/image/media/template dialogs

+		template_external_list_url : "lists/template_list.js",

+		external_link_list_url : "lists/link_list.js",

+		external_image_list_url : "lists/image_list.js",

+		media_external_list_url : "lists/media_list.js",

+

+		// Style formats

+		style_formats : [

+			{title : 'Bold text', inline : 'b'},

+			{title : 'Red text', inline : 'span', styles : {color : '#ff0000'}},

+			{title : 'Red header', block : 'h1', styles : {color : '#ff0000'}},

+			{title : 'Example 1', inline : 'span', classes : 'example1'},

+			{title : 'Example 2', inline : 'span', classes : 'example2'},

+			{title : 'Table styles'},

+			{title : 'Table row 1', selector : 'tr', classes : 'tablerow1'}

+		],

+

+		formats : {

+			alignleft : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'left'},

+			aligncenter : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'center'},

+			alignright : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'right'},

+			alignfull : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'full'},

+			bold : {inline : 'span', 'classes' : 'bold'},

+			italic : {inline : 'span', 'classes' : 'italic'},

+			underline : {inline : 'span', 'classes' : 'underline', exact : true},

+			strikethrough : {inline : 'del'}

+		},

+

+		// Replace values for the template plugin

+		template_replace_values : {

+			username : "Some User",

+			staffid : "991234"

+		}

+	});

+</script>

+<!-- /TinyMCE -->

+

+</head>

+<body>

+

+<form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true">

+	<div>

+		<h3>Custom formats example</h3>

+

+		<p>

+			This example shows you how to override the default formats for bold, italic, underline, strikethough and alignment to use classes instead of inline styles.

+			There are more examples on how to use TinyMCE in the <a href="http://tinymce.moxiecode.com/examples/">Wiki</a>.

+		</p>

+

+		<!-- Gets replaced with TinyMCE, remember HTML in a textarea should be encoded -->

+		<div>

+			<textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 80%">

+				&lt;p&gt;

+					This is some example text that you can edit inside the &lt;strong&gt;TinyMCE editor&lt;/strong&gt;.

+				&lt;/p&gt;

+				&lt;p&gt;

+				Nam nisi elit, cursus in rhoncus sit amet, pulvinar laoreet leo. Nam sed lectus quam, ut sagittis tellus. Quisque dignissim mauris a augue rutrum tempor. Donec vitae purus nec massa vestibulum ornare sit amet id tellus. Nunc quam mauris, fermentum nec lacinia eget, sollicitudin nec ante. Aliquam molestie volutpat dapibus. Nunc interdum viverra sodales. Morbi laoreet pulvinar gravida. Quisque ut turpis sagittis nunc accumsan vehicula. Duis elementum congue ultrices. Cras faucibus feugiat arcu quis lacinia. In hac habitasse platea dictumst. Pellentesque fermentum magna sit amet tellus varius ullamcorper. Vestibulum at urna augue, eget varius neque. Fusce facilisis venenatis dapibus. Integer non sem at arcu euismod tempor nec sed nisl. Morbi ultricies, mauris ut ultricies adipiscing, felis odio condimentum massa, et luctus est nunc nec eros.

+				&lt;/p&gt;

+			</textarea>

+		</div>

+

+		<!-- Some integration calls -->

+		<a href="javascript:;" onmousedown="tinyMCE.get('elm1').show();">[Show]</a>

+		<a href="javascript:;" onmousedown="tinyMCE.get('elm1').hide();">[Hide]</a>

+		<a href="javascript:;" onmousedown="tinyMCE.get('elm1').execCommand('Bold');">[Bold]</a>

+		<a href="javascript:;" onmousedown="alert(tinyMCE.get('elm1').getContent());">[Get contents]</a>

+		<a href="javascript:;" onmousedown="alert(tinyMCE.get('elm1').selection.getContent());">[Get selected HTML]</a>

+		<a href="javascript:;" onmousedown="alert(tinyMCE.get('elm1').selection.getContent({format : 'text'}));">[Get selected text]</a>

+		<a href="javascript:;" onmousedown="alert(tinyMCE.get('elm1').selection.getNode().nodeName);">[Get selected element]</a>

+		<a href="javascript:;" onmousedown="tinyMCE.execCommand('mceInsertContent',false,'<b>Hello world!!</b>');">[Insert HTML]</a>

+		<a href="javascript:;" onmousedown="tinyMCE.execCommand('mceReplaceContent',false,'<b>{$selection}</b>');">[Replace selection]</a>

+

+		<br />

+		<input type="submit" name="save" value="Submit" />

+		<input type="reset" name="reset" value="Reset" />

+	</div>

+</form>

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

+</body>

+</html>

diff --git a/mod/tinymce/vendor/tinymce/examples/full.html b/mod/tinymce/vendor/tinymce/examples/full.html
new file mode 100644
index 000000000..e4d187e88
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/full.html
@@ -0,0 +1,101 @@
+<!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>Full featured example</title>

+<meta http-equiv="X-UA-Compatible" content="IE=edge" />

+<!-- TinyMCE -->

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

+<script type="text/javascript">

+	tinyMCE.init({

+		// General options

+		mode : "textareas",

+		theme : "advanced",

+		plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",

+

+		// Theme options

+		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

+		theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",

+		theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",

+		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",

+		theme_advanced_toolbar_location : "top",

+		theme_advanced_toolbar_align : "left",

+		theme_advanced_statusbar_location : "bottom",

+		theme_advanced_resizing : true,

+

+		// Example content CSS (should be your site CSS)

+		content_css : "css/content.css",

+

+		// Drop lists for link/image/media/template dialogs

+		template_external_list_url : "lists/template_list.js",

+		external_link_list_url : "lists/link_list.js",

+		external_image_list_url : "lists/image_list.js",

+		media_external_list_url : "lists/media_list.js",

+

+		// Style formats

+		style_formats : [

+			{title : 'Bold text', inline : 'b'},

+			{title : 'Red text', inline : 'span', styles : {color : '#ff0000'}},

+			{title : 'Red header', block : 'h1', styles : {color : '#ff0000'}},

+			{title : 'Example 1', inline : 'span', classes : 'example1'},

+			{title : 'Example 2', inline : 'span', classes : 'example2'},

+			{title : 'Table styles'},

+			{title : 'Table row 1', selector : 'tr', classes : 'tablerow1'}

+		],

+

+		// Replace values for the template plugin

+		template_replace_values : {

+			username : "Some User",

+			staffid : "991234"

+		}

+	});

+</script>

+<!-- /TinyMCE -->

+

+</head>

+<body>

+

+<form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true">

+	<div>

+		<h3>Full featured example</h3>

+

+		<p>

+			This page shows all available buttons and plugins that are included in the TinyMCE core package.

+			There are more examples on how to use TinyMCE in the <a href="http://tinymce.moxiecode.com/examples/">Wiki</a>.

+		</p>

+

+		<!-- Gets replaced with TinyMCE, remember HTML in a textarea should be encoded -->

+		<div>

+			<textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 80%">

+				&lt;p&gt;

+					This is some example text that you can edit inside the &lt;strong&gt;TinyMCE editor&lt;/strong&gt;.

+				&lt;/p&gt;

+				&lt;p&gt;

+				Nam nisi elit, cursus in rhoncus sit amet, pulvinar laoreet leo. Nam sed lectus quam, ut sagittis tellus. Quisque dignissim mauris a augue rutrum tempor. Donec vitae purus nec massa vestibulum ornare sit amet id tellus. Nunc quam mauris, fermentum nec lacinia eget, sollicitudin nec ante. Aliquam molestie volutpat dapibus. Nunc interdum viverra sodales. Morbi laoreet pulvinar gravida. Quisque ut turpis sagittis nunc accumsan vehicula. Duis elementum congue ultrices. Cras faucibus feugiat arcu quis lacinia. In hac habitasse platea dictumst. Pellentesque fermentum magna sit amet tellus varius ullamcorper. Vestibulum at urna augue, eget varius neque. Fusce facilisis venenatis dapibus. Integer non sem at arcu euismod tempor nec sed nisl. Morbi ultricies, mauris ut ultricies adipiscing, felis odio condimentum massa, et luctus est nunc nec eros.

+				&lt;/p&gt;

+			</textarea>

+		</div>

+

+		<!-- Some integration calls -->

+		<a href="javascript:;" onclick="tinyMCE.get('elm1').show();return false;">[Show]</a>

+		<a href="javascript:;" onclick="tinyMCE.get('elm1').hide();return false;">[Hide]</a>

+		<a href="javascript:;" onclick="tinyMCE.get('elm1').execCommand('Bold');return false;">[Bold]</a>

+		<a href="javascript:;" onclick="alert(tinyMCE.get('elm1').getContent());return false;">[Get contents]</a>

+		<a href="javascript:;" onclick="alert(tinyMCE.get('elm1').selection.getContent());return false;">[Get selected HTML]</a>

+		<a href="javascript:;" onclick="alert(tinyMCE.get('elm1').selection.getContent({format : 'text'}));return false;">[Get selected text]</a>

+		<a href="javascript:;" onclick="alert(tinyMCE.get('elm1').selection.getNode().nodeName);return false;">[Get selected element]</a>

+		<a href="javascript:;" onclick="tinyMCE.execCommand('mceInsertContent',false,'<b>Hello world!!</b>');return false;">[Insert HTML]</a>

+		<a href="javascript:;" onclick="tinyMCE.execCommand('mceReplaceContent',false,'<b>{$selection}</b>');return false;">[Replace selection]</a>

+

+		<br />

+		<input type="submit" name="save" value="Submit" />

+		<input type="reset" name="reset" value="Reset" />

+	</div>

+</form>

+

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

+</body>

+</html>

diff --git a/mod/tinymce/vendor/tinymce/examples/index.html b/mod/tinymce/vendor/tinymce/examples/index.html
new file mode 100644
index 000000000..6ebfbea57
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">

+<html>

+<head>

+	<title>TinyMCE examples</title>

+</head>

+<frameset cols="180,80%">

+	<frame src="menu.html" name="menu" />

+	<frame src="full.html" name="main" />

+</frameset>

+</html>

diff --git a/mod/tinymce/vendor/tinymce/examples/lists/image_list.js b/mod/tinymce/vendor/tinymce/examples/lists/image_list.js
new file mode 100644
index 000000000..7ba049a24
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/lists/image_list.js
@@ -0,0 +1,9 @@
+// This list may be created by a server logic page PHP/ASP/ASPX/JSP in some backend system.

+// There images will be displayed as a dropdown in all image dialogs if the "external_link_image_url"

+// option is defined in TinyMCE init.

+

+var tinyMCEImageList = new Array(

+	// Name, URL

+	["Logo 1", "media/logo.jpg"],

+	["Logo 2 Over", "media/logo_over.jpg"]

+);

diff --git a/mod/tinymce/vendor/tinymce/examples/lists/link_list.js b/mod/tinymce/vendor/tinymce/examples/lists/link_list.js
new file mode 100644
index 000000000..0d464331f
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/lists/link_list.js
@@ -0,0 +1,10 @@
+// This list may be created by a server logic page PHP/ASP/ASPX/JSP in some backend system.

+// There links will be displayed as a dropdown in all link dialogs if the "external_link_list_url"

+// option is defined in TinyMCE init.

+

+var tinyMCELinkList = new Array(

+	// Name, URL

+	["Moxiecode", "http://www.moxiecode.com"],

+	["Freshmeat", "http://www.freshmeat.com"],

+	["Sourceforge", "http://www.sourceforge.com"]

+);

diff --git a/mod/tinymce/vendor/tinymce/examples/lists/media_list.js b/mod/tinymce/vendor/tinymce/examples/lists/media_list.js
new file mode 100644
index 000000000..79b3f1bfe
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/lists/media_list.js
@@ -0,0 +1,14 @@
+// This list may be created by a server logic page PHP/ASP/ASPX/JSP in some backend system.

+// There flash movies will be displayed as a dropdown in all media dialog if the "media_external_list_url"

+// option is defined in TinyMCE init.

+

+var tinyMCEMediaList = [

+	// Name, URL

+	["Some Flash", "media/sample.swf"],

+	["Some Quicktime", "media/sample.mov"],

+	["Some AVI", "media/sample.avi"],

+	["Some RealMedia", "media/sample.rm"],

+	["Some Shockwave", "media/sample.dcr"],

+	["Some Video", "media/sample.mp4"],

+	["Some FLV", "media/sample.flv"],

+];
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/examples/lists/template_list.js b/mod/tinymce/vendor/tinymce/examples/lists/template_list.js
new file mode 100644
index 000000000..e06d35788
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/lists/template_list.js
@@ -0,0 +1,9 @@
+// This list may be created by a server logic page PHP/ASP/ASPX/JSP in some backend system.

+// There templates will be displayed as a dropdown in all media dialog if the "template_external_list_url"

+// option is defined in TinyMCE init.

+

+var tinyMCETemplateList = [

+	// Name, URL, Description

+	["Simple snippet", "templates/snippet1.htm", "Simple HTML snippet."],

+	["Layout", "templates/layout1.htm", "HTML Layout."]

+];
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/examples/media/logo.jpg b/mod/tinymce/vendor/tinymce/examples/media/logo.jpg
new file mode 100644
index 000000000..ad535d671
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/media/logo.jpg
diff --git a/mod/tinymce/vendor/tinymce/examples/media/logo_over.jpg b/mod/tinymce/vendor/tinymce/examples/media/logo_over.jpg
new file mode 100644
index 000000000..79fcd884a
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/media/logo_over.jpg
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.avi b/mod/tinymce/vendor/tinymce/examples/media/sample.avi
new file mode 100644
index 000000000..238bb688a
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/media/sample.avi
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.dcr b/mod/tinymce/vendor/tinymce/examples/media/sample.dcr
new file mode 100644
index 000000000..353b3ce67
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/media/sample.dcr
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.flv b/mod/tinymce/vendor/tinymce/examples/media/sample.flv
new file mode 100644
index 000000000..799d137e6
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/media/sample.flv
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.mov b/mod/tinymce/vendor/tinymce/examples/media/sample.mov
new file mode 100644
index 000000000..9c0a0932c
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/media/sample.mov
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.ram b/mod/tinymce/vendor/tinymce/examples/media/sample.ram
new file mode 100644
index 000000000..e2ce04cf7
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/media/sample.ram
@@ -0,0 +1 @@
+http://streaming.uga.edu/samples/ayp_lan.rm
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.rm b/mod/tinymce/vendor/tinymce/examples/media/sample.rm
new file mode 100644
index 000000000..8947706e0
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/media/sample.rm
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.swf b/mod/tinymce/vendor/tinymce/examples/media/sample.swf
new file mode 100644
index 000000000..9f5fc4ac5
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/media/sample.swf
diff --git a/mod/tinymce/vendor/tinymce/examples/menu.html b/mod/tinymce/vendor/tinymce/examples/menu.html
new file mode 100644
index 000000000..e48650abd
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/menu.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

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

+<head>

+<title>Menu</title>

+<style>

+a {display:block;}

+</style>

+</head>

+<body>

+<h3>Examples</h3>

+<a href="full.html" target="main">Full featured</a>

+<a href="simple.html" target="main">Simple theme</a>

+<a href="skins.html" target="main">Skin support</a>

+<a href="word.html" target="main">Word processor</a>

+<a href="custom_formats.html" target="main">Custom formats</a>

+<a href="accessibility.html" target="main">Accessibility Options</a>

+</body>

+</html>

diff --git a/mod/tinymce/vendor/tinymce/examples/simple.html b/mod/tinymce/vendor/tinymce/examples/simple.html
new file mode 100644
index 000000000..70720caa1
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/simple.html
@@ -0,0 +1,47 @@
+<!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>Simple theme example</title>

+

+<!-- TinyMCE -->

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

+<script type="text/javascript">

+	tinyMCE.init({

+		mode : "textareas",

+		theme : "simple"

+	});

+</script>

+<!-- /TinyMCE -->

+

+</head>

+<body>

+

+<form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true">

+	<h3>Simple theme example</h3>

+

+	<p>

+		This page shows you the simple theme and it's core functionality you can extend it by changing the code use the advanced theme if you need to configure/add more buttons etc.

+		There are more examples on how to use TinyMCE in the <a href="http://tinymce.moxiecode.com/examples/">Wiki</a>.

+	</p>

+

+	<!-- Gets replaced with TinyMCE, remember HTML in a textarea should be encoded -->

+	<textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 80%">

+		&lt;p&gt;

+			This is some example text that you can edit inside the &lt;strong&gt;TinyMCE editor&lt;/strong&gt;.

+		&lt;/p&gt;

+		&lt;p&gt;

+		Nam nisi elit, cursus in rhoncus sit amet, pulvinar laoreet leo. Nam sed lectus quam, ut sagittis tellus. Quisque dignissim mauris a augue rutrum tempor. Donec vitae purus nec massa vestibulum ornare sit amet id tellus. Nunc quam mauris, fermentum nec lacinia eget, sollicitudin nec ante. Aliquam molestie volutpat dapibus. Nunc interdum viverra sodales. Morbi laoreet pulvinar gravida. Quisque ut turpis sagittis nunc accumsan vehicula. Duis elementum congue ultrices. Cras faucibus feugiat arcu quis lacinia. In hac habitasse platea dictumst. Pellentesque fermentum magna sit amet tellus varius ullamcorper. Vestibulum at urna augue, eget varius neque. Fusce facilisis venenatis dapibus. Integer non sem at arcu euismod tempor nec sed nisl. Morbi ultricies, mauris ut ultricies adipiscing, felis odio condimentum massa, et luctus est nunc nec eros.

+		&lt;/p&gt;

+	</textarea>

+

+	<br />

+	<input type="submit" name="save" value="Submit" />

+	<input type="reset" name="reset" value="Reset" />

+</form>

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

+</body>

+</html>

diff --git a/mod/tinymce/vendor/tinymce/examples/skins.html b/mod/tinymce/vendor/tinymce/examples/skins.html
new file mode 100644
index 000000000..c15085885
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/skins.html
@@ -0,0 +1,216 @@
+<!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>Skin support example</title>

+

+<!-- TinyMCE -->

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

+<script type="text/javascript">

+	// Default skin

+	tinyMCE.init({

+		// General options

+		mode : "exact",

+		elements : "elm1",

+		theme : "advanced",

+		plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

+

+		// Theme options

+		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

+		theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",

+		theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",

+		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",

+		theme_advanced_toolbar_location : "top",

+		theme_advanced_toolbar_align : "left",

+		theme_advanced_statusbar_location : "bottom",

+		theme_advanced_resizing : true,

+

+		// Example content CSS (should be your site CSS)

+		content_css : "css/content.css",

+

+		// Drop lists for link/image/media/template dialogs

+		template_external_list_url : "lists/template_list.js",

+		external_link_list_url : "lists/link_list.js",

+		external_image_list_url : "lists/image_list.js",

+		media_external_list_url : "lists/media_list.js",

+

+		// Replace values for the template plugin

+		template_replace_values : {

+			username : "Some User",

+			staffid : "991234"

+		}

+	});

+

+	// O2k7 skin

+	tinyMCE.init({

+		// General options

+		mode : "exact",

+		elements : "elm2",

+		theme : "advanced",

+		skin : "o2k7",

+		plugins : "lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

+

+		// Theme options

+		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

+		theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",

+		theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",

+		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",

+		theme_advanced_toolbar_location : "top",

+		theme_advanced_toolbar_align : "left",

+		theme_advanced_statusbar_location : "bottom",

+		theme_advanced_resizing : true,

+

+		// Example content CSS (should be your site CSS)

+		content_css : "css/content.css",

+

+		// Drop lists for link/image/media/template dialogs

+		template_external_list_url : "lists/template_list.js",

+		external_link_list_url : "lists/link_list.js",

+		external_image_list_url : "lists/image_list.js",

+		media_external_list_url : "lists/media_list.js",

+

+		// Replace values for the template plugin

+		template_replace_values : {

+			username : "Some User",

+			staffid : "991234"

+		}

+	});

+

+	// O2k7 skin (silver)

+	tinyMCE.init({

+		// General options

+		mode : "exact",

+		elements : "elm3",

+		theme : "advanced",

+		skin : "o2k7",

+		skin_variant : "silver",

+		plugins : "lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

+

+		// Theme options

+		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

+		theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",

+		theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",

+		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",

+		theme_advanced_toolbar_location : "top",

+		theme_advanced_toolbar_align : "left",

+		theme_advanced_statusbar_location : "bottom",

+		theme_advanced_resizing : true,

+

+		// Example content CSS (should be your site CSS)

+		content_css : "css/content.css",

+

+		// Drop lists for link/image/media/template dialogs

+		template_external_list_url : "lists/template_list.js",

+		external_link_list_url : "lists/link_list.js",

+		external_image_list_url : "lists/image_list.js",

+		media_external_list_url : "lists/media_list.js",

+

+		// Replace values for the template plugin

+		template_replace_values : {

+			username : "Some User",

+			staffid : "991234"

+		}

+	});

+

+	// O2k7 skin (silver)

+	tinyMCE.init({

+		// General options

+		mode : "exact",

+		elements : "elm4",

+		theme : "advanced",

+		skin : "o2k7",

+		skin_variant : "black",

+		plugins : "lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

+

+		// Theme options

+		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

+		theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",

+		theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",

+		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",

+		theme_advanced_toolbar_location : "top",

+		theme_advanced_toolbar_align : "left",

+		theme_advanced_statusbar_location : "bottom",

+		theme_advanced_resizing : true,

+

+		// Example content CSS (should be your site CSS)

+		content_css : "css/content.css",

+

+		// Drop lists for link/image/media/template dialogs

+		template_external_list_url : "lists/template_list.js",

+		external_link_list_url : "lists/link_list.js",

+		external_image_list_url : "lists/image_list.js",

+		media_external_list_url : "lists/media_list.js",

+

+		// Replace values for the template plugin

+		template_replace_values : {

+			username : "Some User",

+			staffid : "991234"

+		}

+	});

+</script>

+<!-- /TinyMCE -->

+

+</head>

+<body>

+

+<form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true">

+	<h3>Skin support example</h3>

+

+	<p>

+		This page displays the two skins that TinyMCE comes with. You can make your own by creating a CSS file in themes/advanced/skins/<yout skin>/ui.css

+		There are more examples on how to use TinyMCE in the <a href="http://tinymce.moxiecode.com/examples/">Wiki</a>.

+	</p>

+

+	<!-- Gets replaced with TinyMCE, remember HTML in a textarea should be encoded -->

+	<textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 80%">

+		&lt;p&gt;

+			This is some example text that you can edit inside the &lt;strong&gt;TinyMCE editor&lt;/strong&gt;.

+		&lt;/p&gt;

+		&lt;p&gt;

+		Nam nisi elit, cursus in rhoncus sit amet, pulvinar laoreet leo. Nam sed lectus quam, ut sagittis tellus. Quisque dignissim mauris a augue rutrum tempor. Donec vitae purus nec massa vestibulum ornare sit amet id tellus. Nunc quam mauris, fermentum nec lacinia eget, sollicitudin nec ante. Aliquam molestie volutpat dapibus. Nunc interdum viverra sodales. Morbi laoreet pulvinar gravida. Quisque ut turpis sagittis nunc accumsan vehicula. Duis elementum congue ultrices. Cras faucibus feugiat arcu quis lacinia. In hac habitasse platea dictumst. Pellentesque fermentum magna sit amet tellus varius ullamcorper. Vestibulum at urna augue, eget varius neque. Fusce facilisis venenatis dapibus. Integer non sem at arcu euismod tempor nec sed nisl. Morbi ultricies, mauris ut ultricies adipiscing, felis odio condimentum massa, et luctus est nunc nec eros.

+		&lt;/p&gt;

+	</textarea>

+

+	<br />

+

+	<textarea id="elm2" name="elm2" rows="15" cols="80" style="width: 80%">

+		&lt;p&gt;

+			This is some example text that you can edit inside the &lt;strong&gt;TinyMCE editor&lt;/strong&gt;.

+		&lt;/p&gt;

+		&lt;p&gt;

+		Nam nisi elit, cursus in rhoncus sit amet, pulvinar laoreet leo. Nam sed lectus quam, ut sagittis tellus. Quisque dignissim mauris a augue rutrum tempor. Donec vitae purus nec massa vestibulum ornare sit amet id tellus. Nunc quam mauris, fermentum nec lacinia eget, sollicitudin nec ante. Aliquam molestie volutpat dapibus. Nunc interdum viverra sodales. Morbi laoreet pulvinar gravida. Quisque ut turpis sagittis nunc accumsan vehicula. Duis elementum congue ultrices. Cras faucibus feugiat arcu quis lacinia. In hac habitasse platea dictumst. Pellentesque fermentum magna sit amet tellus varius ullamcorper. Vestibulum at urna augue, eget varius neque. Fusce facilisis venenatis dapibus. Integer non sem at arcu euismod tempor nec sed nisl. Morbi ultricies, mauris ut ultricies adipiscing, felis odio condimentum massa, et luctus est nunc nec eros.

+		&lt;/p&gt;

+	</textarea>

+

+	<br />

+

+	<textarea id="elm3" name="elm3" rows="15" cols="80" style="width: 80%">

+		&lt;p&gt;

+			This is some example text that you can edit inside the &lt;strong&gt;TinyMCE editor&lt;/strong&gt;.

+		&lt;/p&gt;

+		&lt;p&gt;

+		Nam nisi elit, cursus in rhoncus sit amet, pulvinar laoreet leo. Nam sed lectus quam, ut sagittis tellus. Quisque dignissim mauris a augue rutrum tempor. Donec vitae purus nec massa vestibulum ornare sit amet id tellus. Nunc quam mauris, fermentum nec lacinia eget, sollicitudin nec ante. Aliquam molestie volutpat dapibus. Nunc interdum viverra sodales. Morbi laoreet pulvinar gravida. Quisque ut turpis sagittis nunc accumsan vehicula. Duis elementum congue ultrices. Cras faucibus feugiat arcu quis lacinia. In hac habitasse platea dictumst. Pellentesque fermentum magna sit amet tellus varius ullamcorper. Vestibulum at urna augue, eget varius neque. Fusce facilisis venenatis dapibus. Integer non sem at arcu euismod tempor nec sed nisl. Morbi ultricies, mauris ut ultricies adipiscing, felis odio condimentum massa, et luctus est nunc nec eros.

+		&lt;/p&gt;

+	</textarea>

+

+	<br />

+

+	<textarea id="elm4" name="elm4" rows="15" cols="80" style="width: 80%">

+		&lt;p&gt;

+			This is some example text that you can edit inside the &lt;strong&gt;TinyMCE editor&lt;/strong&gt;.

+		&lt;/p&gt;

+		&lt;p&gt;

+		Nam nisi elit, cursus in rhoncus sit amet, pulvinar laoreet leo. Nam sed lectus quam, ut sagittis tellus. Quisque dignissim mauris a augue rutrum tempor. Donec vitae purus nec massa vestibulum ornare sit amet id tellus. Nunc quam mauris, fermentum nec lacinia eget, sollicitudin nec ante. Aliquam molestie volutpat dapibus. Nunc interdum viverra sodales. Morbi laoreet pulvinar gravida. Quisque ut turpis sagittis nunc accumsan vehicula. Duis elementum congue ultrices. Cras faucibus feugiat arcu quis lacinia. In hac habitasse platea dictumst. Pellentesque fermentum magna sit amet tellus varius ullamcorper. Vestibulum at urna augue, eget varius neque. Fusce facilisis venenatis dapibus. Integer non sem at arcu euismod tempor nec sed nisl. Morbi ultricies, mauris ut ultricies adipiscing, felis odio condimentum massa, et luctus est nunc nec eros.

+		&lt;/p&gt;

+	</textarea>

+

+	<br />

+	<input type="submit" name="save" value="Submit" />

+	<input type="reset" name="reset" value="Reset" />

+</form>

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

+</body>

+</html>

diff --git a/mod/tinymce/vendor/tinymce/examples/templates/layout1.htm b/mod/tinymce/vendor/tinymce/examples/templates/layout1.htm
new file mode 100644
index 000000000..a38df3e68
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/templates/layout1.htm
@@ -0,0 +1,15 @@
+<table border="1">

+	<thead>

+		<tr>

+			<td>Column 1</td>

+			<td>Column 2</td>

+		</tr>

+	</thead>

+

+	<tbody>

+		<tr>

+			<td>Username: {$username}</td>

+			<td>Staffid: {$staffid}</td>

+		</tr>

+	</tbody>

+</table>

diff --git a/mod/tinymce/vendor/tinymce/examples/templates/snippet1.htm b/mod/tinymce/vendor/tinymce/examples/templates/snippet1.htm
new file mode 100644
index 000000000..b2520beaf
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/templates/snippet1.htm
@@ -0,0 +1 @@
+This is just some <strong>code</strong>.

diff --git a/mod/tinymce/vendor/tinymce/examples/word.html b/mod/tinymce/vendor/tinymce/examples/word.html
new file mode 100644
index 000000000..d827b6fed
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/word.html
@@ -0,0 +1,72 @@
+<!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>Word processor example</title>

+<meta http-equiv="X-UA-Compatible" content="IE=edge" />

+<!-- TinyMCE -->

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

+<script type="text/javascript">

+	tinyMCE.init({

+		// General options

+		mode : "textareas",

+		theme : "advanced",

+		skin : "o2k7",

+		plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

+

+		// Theme options

+		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",

+		theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",

+		theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",

+		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",

+		theme_advanced_toolbar_location : "top",

+		theme_advanced_toolbar_align : "left",

+		theme_advanced_statusbar_location : "bottom",

+		theme_advanced_resizing : true,

+

+		// Example word content CSS (should be your site CSS) this one removes paragraph margins

+		content_css : "css/word.css",

+

+		// Drop lists for link/image/media/template dialogs

+		template_external_list_url : "lists/template_list.js",

+		external_link_list_url : "lists/link_list.js",

+		external_image_list_url : "lists/image_list.js",

+		media_external_list_url : "lists/media_list.js",

+

+		// Replace values for the template plugin

+		template_replace_values : {

+			username : "Some User",

+			staffid : "991234"

+		}

+	});

+</script>

+<!-- /TinyMCE -->

+

+</head>

+<body>

+

+<form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true">

+	<h3>Word processor example</h3>

+

+	<p>

+		This page shows you how to configure TinyMCE to work more like common word processors.

+		There are more examples on how to use TinyMCE in the <a href="http://tinymce.moxiecode.com/examples/">Wiki</a>.

+	</p>

+

+	<!-- Gets replaced with TinyMCE, remember HTML in a textarea should be encoded -->

+	<textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 80%">

+		&lt;p&gt;This is the first paragraph.&lt;/p&gt;

+		&lt;p&gt;This is the second paragraph.&lt;/p&gt;

+		&lt;p&gt;This is the third paragraph.&lt;/p&gt;

+	</textarea>

+

+	<br />

+	<input type="submit" name="save" value="Submit" />

+	<input type="reset" name="reset" value="Reset" />

+</form>

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

+</body>

+</html>

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
index ea4a1b0e1..8a80d46b1 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
@@ -12,9 +12,54 @@ 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.",

+invalid_data:"{#field} is invalid",

+invalid_data_number:"{#field} must be a number",

+invalid_data_min:"{#field} must be a number greater than {#min}",

+invalid_data_size:"{#field} must be a number or percentage",

 more_colors:"More colors"

 },

+colors:{

+'000000':'Black',

+'993300':'Burnt orange',

+'333300':'Dark olive',

+'003300':'Dark green',

+'003366':'Dark azure',

+'000080':'Navy Blue',

+'333399':'Indigo',

+'333333':'Very dark gray',

+'800000':'Maroon',

+'FF6600':'Orange',

+'808000':'Olive',

+'008000':'Green',

+'008080':'Teal',

+'0000FF':'Blue',

+'666699':'Grayish blue',

+'808080':'Gray',

+'FF0000':'Red',

+'FF9900':'Amber',

+'99CC00':'Yellow green',

+'339966':'Sea green',

+'33CCCC':'Turquoise',

+'3366FF':'Royal blue',

+'800080':'Purple',

+'999999':'Medium gray',

+'FF00FF':'Magenta',

+'FFCC00':'Gold',

+'FFFF00':'Yellow',

+'00FF00':'Lime',

+'00FFFF':'Aqua',

+'00CCFF':'Sky blue',

+'993366':'Brown',

+'C0C0C0':'Silver',

+'FF99CC':'Pink',

+'FFCC99':'Peach',

+'FFFF99':'Light yellow',

+'CCFFCC':'Pale green',

+'CCFFFF':'Pale cyan',

+'99CCFF':'Light sky blue',

+'CC99FF':'Plum',

+'FFFFFF':'White'

+},

 contextmenu:{

 align:"Alignment",

 left:"Left",

@@ -151,7 +196,8 @@ langs:"Languages",
 wait:"Please wait...",

 sug:"Suggestions",

 no_sug:"No suggestions",

-no_mpell:"No misspellings found."

+no_mpell:"No misspellings found.",

+learn_word:"Learn word" 

 },

 pagebreak:{

 desc:"Insert page break."

@@ -167,4 +213,11 @@ upper_roman:"Upper roman",
 circle:"Circle",

 disc:"Disc",

 square:"Square"

-}}});
\ No newline at end of file
+},

+aria:{

+rich_text_area:"Rich Text Area"

+},

+wordcount:{

+words: 'Words: '

+}

+}});
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
index 873bfd8d3..ad6a7b698 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
@@ -1,5 +1,7 @@
 tinyMCE.addI18n('en.advhr_dlg',{

+normal:"Normal",

 width:"Width",

+widthunits:"Units",

 size:"Height",

 noshade:"No shadow"

 });
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
index fc37b2aec..843e1f8f0 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
@@ -8,43 +8,44 @@
 	<script type="text/javascript" src="../../utils/form_utils.js"></script>

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

 </head>

-<body>

+<body role="application">

 <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>

+			<li id="general_tab" class="current" aria-controls="general_panel"><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 class="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>

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

+					<tr role="group" aria-labelledby="width_label">

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

+						<td class="nowrap">

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

+							<span style="display:none;" id="width_unit_label">{#advhr_dlg.widthunits}</span>

+							<select name="width2" id="width2" aria-labelledby="width_unit_label">

+								<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="">{#advhr_dlg.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>

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
index 79cff3f19..ed16b3d4a 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
@@ -10,13 +10,14 @@
 	<script type="text/javascript" src="js/image.js"></script>

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

 </head>

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

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

+<body id="advimage" style="display: none" role="application" aria-labelledby="app_title">

+	<span id="app_title" style="display:none">{#advimage_dlg.dialog_title}</span>

+	<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>

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

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

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

 			</ul>

 		</div>

 

@@ -25,15 +26,15 @@
 				<fieldset>

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

 

-						<table class="properties">

+						<table role="presentation" 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">

+								<td colspan="2"><table role="presentation" 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>

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

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

 									</tr>

-								  </table></td>

+								</table></td>

 							</tr>

 							<tr>

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

@@ -60,7 +61,7 @@
 				<fieldset>

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

 

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

+					<table role="presentation" 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();"> 

@@ -86,17 +87,19 @@
 							</td>

 						</tr>

 

-						<tr>

+						<tr role="group" aria-labelledby="widthlabel">

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

 							<td class="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

+								<span style="display:none" id="width_voiceLabel">{#advimage_dlg.width}</span>

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

+								<span style="display:none" id="height_voiceLabel">{#advimage_dlg.height}</span>

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

 							</td>

 						</tr>

 

 						<tr>

 							<td>&nbsp;</td>

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

+							<td><table role="presentation" 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>

@@ -142,18 +145,18 @@
 				<fieldset>

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

 

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

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

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

 

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

+					<table role="presentation" 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"> 

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

 									<tr> 

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

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

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

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

 									</tr>

-								  </table></td>

+								</table></td>

 							</tr>

 							<tr>

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

@@ -161,12 +164,12 @@
 							</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"> 

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

 									<tr> 

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

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

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

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

 									</tr> 

-								  </table></td> 

+								</table></td> 

 							</tr>

 							<tr>

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

@@ -178,7 +181,7 @@
 				<fieldset>

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

 

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

+					<table role="presentation" 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> 

@@ -211,12 +214,12 @@
 

 						<tr>

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

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

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

 									<tr>

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

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

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

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

 									</tr>

-								</table></td> 

+							</table></td> 

 						</tr>

 					</table>

 				</fieldset>

@@ -227,6 +230,6 @@
 			<input type="submit" id="insert" name="insert" value="{#insert}" />

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

 		</div>

-    </form>

+	</form>

 </body> 

 </html> 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
index 3bda86a2d..72c9cbf63 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
@@ -142,7 +142,7 @@ var ImageDialog = {
 		}

 

 		tinymce.extend(args, {

-			src : nl.src.value,

+			src : nl.src.value.replace(/ /g, '%20'),

 			width : nl.width.value,

 			height : nl.height.value,

 			alt : nl.alt.value,

@@ -177,6 +177,8 @@ var ImageDialog = {
 			ed.undoManager.add();

 		}

 

+		tinyMCEPopup.editor.execCommand('mceRepaint');

+		tinyMCEPopup.editor.focus();

 		tinyMCEPopup.close();

 	},

 

@@ -359,7 +361,7 @@ var ImageDialog = {
 	},

 

 	updateStyle : function(ty) {

-		var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value});

+		var dom = tinyMCEPopup.dom, b, bStyle, bColor, v, isIE = tinymce.isIE, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value});

 

 		if (tinyMCEPopup.editor.settings.inline_styles) {

 			// Handle align

@@ -378,14 +380,27 @@ var ImageDialog = {
 

 			// Handle border

 			if (ty == 'border') {

+				b = img.style.border ? img.style.border.split(' ') : [];

+				bStyle = dom.getStyle(img, 'border-style');

+				bColor = dom.getStyle(img, 'border-color');

+

 				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';

+						img.style.border = isIE ? '0' : '0 none none';

+					else {

+						if (b.length == 3 && b[isIE ? 2 : 1])

+							bStyle = b[isIE ? 2 : 1];

+						else if (!bStyle || bStyle == 'none')

+							bStyle = 'solid';

+						if (b.length == 3 && b[isIE ? 0 : 2])

+							bColor = b[isIE ? 0 : 2];

+						else if (!bColor || bColor == 'none')

+							bColor = 'black';

+						img.style.border = v + 'px ' + bStyle + ' ' + bColor;

+					}

 				}

 			}

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
index f493d196f..d8f11e030 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
@@ -28,6 +28,8 @@ alt:"Image description",
 list:"Image list",

 border:"Border",

 dimensions:"Dimensions",

+width:"Width",

+height:"Height",

 vspace:"Vertical space",

 hspace:"Horizontal space",

 align:"Alignment",

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
index b78e82f76..837c937c6 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
@@ -30,8 +30,6 @@ function init() {
 

 	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

@@ -41,6 +39,13 @@ function init() {
 	else

 		document.getElementById("linklisthrefcontainer").innerHTML = html;

 

+	// Anchor list

+	html = getAnchorListHTML('anchorlist','href');

+	if (html == "")

+		document.getElementById("anchorlistrow").style.display = 'none';

+	else

+		document.getElementById("anchorlistcontainer").innerHTML = html;

+

 	// Resize some elements

 	if (isVisible('hrefbrowser'))

 		document.getElementById('href').style.width = '260px';

@@ -360,20 +365,22 @@ function 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>';

+	var ed = tinyMCEPopup.editor, nodes = ed.dom.select('a'), name, i, len, html = "";

 

-	for (i=0; i<nodes.length; i++) {

-		if ((name = inst.dom.getAttrib(nodes[i], "name")) != "")

+	for (i=0, len=nodes.length; i<len; i++) {

+		if ((name = ed.dom.getAttrib(nodes[i], "name")) != "")

 			html += '<option value="#' + name + '">' + name + '</option>';

 	}

 

-	html += '</select>';

+	if (html == "")

+		return "";

+

+	html = '<select id="' + id + '" name="' + id + '" class="mceAnchorList"'

+		+ ' onchange="this.form.' + target + '.value=this.options[this.selectedIndex].value"'

+		+ '>'

+		+ '<option value="">---</option>'

+		+ html

+		+ '</select>';

 

 	return html;

 }

@@ -389,7 +396,6 @@ function insertAction() {
 

 	// 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);

@@ -398,12 +404,10 @@ function insertAction() {
 		return;

 	}

 

-	tinyMCEPopup.execCommand("mceBeginUndoLevel");

-

 	// Create new anchor elements

 	if (elm == null) {

 		inst.getDoc().execCommand("unlink", false, null);

-		tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});

+		tinyMCEPopup.execCommand("mceInsertLink", 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++)

@@ -425,7 +429,7 @@ function insertAction() {
 

 function setAllAttribs(elm) {

 	var formObj = document.forms[0];

-	var href = formObj.href.value;

+	var href = formObj.href.value.replace(/ /g, '%20');

 	var target = getSelectValue(formObj, 'targetlist');

 

 	setAttrib(elm, 'href', href);

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
index c71ffbd0f..19dff2936 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
@@ -3,8 +3,8 @@ 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?",

+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 be an external link. Do you want to add the required http:// prefix?",

 list:"Link list",

 general_tab:"General",

 popup_tab:"Popup",

@@ -32,6 +32,8 @@ popup_location:"Show location bar",
 popup_resizable:"Make window resizable",

 popup_dependent:"Dependent (Mozilla/Firefox only)",

 popup_size:"Size",

+width:"Width",

+height:"Height",

 popup_position:"Position (X/Y)",

 id:"Id",

 style:"Style",

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
index 876669c6b..8ab7c2a95 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
@@ -9,37 +9,38 @@
 	<script type="text/javascript" src="js/advlink.js"></script>

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

 </head>

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

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

-		<div class="tabs">

+<body id="advlink" style="display: none" role="application" onload="javascript:mcTabs.displayTab('general_tab','general_panel', true);" aria-labelledby="app_label">

+	<span class="mceVoiceLabel" id="app_label" style="display:none;">{#advlink_dlg.title}</span>

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

+		<div class="tabs" role="presentation">

 			<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>

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

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

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

+				<li id="advanced_tab" aria-controls="advanced_panel"><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 class="panel_wrapper" role="presentation">

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

 				<fieldset>

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

 

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

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

 						<tr>

-						  <td class="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>

+							<td class="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);" aria-required="true" /></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"><select id="linklisthref"><option value=""></option></select></td>

 						</tr>

-						<tr>

+						<tr id="anchorlistrow">

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

 							<td colspan="2" id="anchorlistcontainer"><select id="anchorlist"><option value=""></option></select></td>

 						</tr>

@@ -70,7 +71,7 @@
 					<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">

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

 						<tr>

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

 							<td>

@@ -86,18 +87,22 @@
 							<td class="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 class="nowrap"><label>{#advlink_dlg.popup_size}</label>&nbsp;</td>

+						<tr role="group" aria-labelledby="popup_size_label">

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

 							<td class="nowrap">

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

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

+								<span style="display:none" id="width_voiceLabel">{#advlink_dlg.width}</span>

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

+								<span style="display:none" id="height_voiceLabel">{#advlink_dlg.height}</span>

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

 							</td>

 						</tr>

-						<tr>

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

+						<tr role="group" aria-labelledby="popup_position_label center_hint">

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

 							<td class="nowrap">

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

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

+								<span style="display:none" id="x_voiceLabel">X</span>

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

+								<span style="display:none" id="y_voiceLabel">Y</span>

+								<input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" aria-labelledby="y_voiceLabel" /> <span id="center_hint">(c /c = center)</span>

 							</td>

 						</tr>

 					</table>

@@ -105,7 +110,7 @@
 					<fieldset>

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

 

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

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

 							<tr>

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

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

@@ -139,7 +144,7 @@
 			<fieldset>

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

 

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

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

 						<tr>

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

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

@@ -259,7 +264,7 @@
 			<fieldset>

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

 

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

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

 						<tr>

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

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

@@ -328,6 +333,6 @@
 			<input type="submit" id="insert" name="insert" value="{#insert}" />

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

 		</div>

-    </form>

+	</form>

 </body>

 </html>

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
index 02d16971a..8895112b5 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square")},createControl:function(d,b){var f=this,e,h;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){h=f[d][0]}function c(i,k){var j=true;a(k.styles,function(m,l){if(f.editor.dom.getStyle(i,l)!=m){j=false;return false}});return j}function g(){var k,i=f.editor,l=i.dom,j=i.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,h)){i.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(h){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,h.styles);k.removeAttribute("_mce_style")}}}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){g()}});e.onRenderMenu.add(function(i,j){j.onShowMenu.add(function(){var m=f.editor.dom,l=m.getParent(f.editor.selection.getNode(),"ol,ul"),k;if(l||h){k=f[d];a(j.items,function(n){var o=true;n.setSelected(0);if(l&&!n.isDisabled()){a(k,function(p){if(p.id==n.id){if(!c(l,p)){o=false;return false}}});if(o){n.setSelected(1)}}});if(!l){j.items[h.id].setSelected(1)}}});j.add({id:f.editor.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle"}).setDisabled(1);a(f[d],function(k){k.id=f.editor.dom.uniqueId();j.add({id:k.id,title:k.title,onclick:function(){h=k;g()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square");if(tinymce.isIE&&/MSIE [2-7]/.test(navigator.userAgent)){d.isIE7=true}},createControl:function(d,b){var f=this,e,h;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){h=f[d][0]}function c(i,k){var j=true;a(k.styles,function(m,l){if(f.editor.dom.getStyle(i,l)!=m){j=false;return false}});return j}function g(){var k,i=f.editor,l=i.dom,j=i.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,h)){i.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(h){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,h.styles);k.removeAttribute("data-mce-style")}}i.focus()}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){g()}});e.onRenderMenu.add(function(i,j){j.onShowMenu.add(function(){var m=f.editor.dom,l=m.getParent(f.editor.selection.getNode(),"ol,ul"),k;if(l||h){k=f[d];a(j.items,function(n){var o=true;n.setSelected(0);if(l&&!n.isDisabled()){a(k,function(p){if(p.id==n.id){if(!c(l,p)){o=false;return false}}});if(o){n.setSelected(1)}}});if(!l){j.items[h.id].setSelected(1)}}});j.add({id:f.editor.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle",titleItem:true}).setDisabled(1);a(f[d],function(k){if(f.isIE7&&k.styles.listStyleType=="lower-greek"){return}k.id=f.editor.dom.uniqueId();j.add({id:k.id,title:k.title,onclick:function(){h=k;g()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
index a61887a92..13ef02ddd 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
@@ -35,6 +35,9 @@
 			// Setup number formats from config or default

 			t.numlist = ed.getParam("advlist_number_styles") || buildFormats("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");

 			t.bullist = ed.getParam("advlist_bullet_styles") || buildFormats("default,circle,disc,square");

+

+			if (tinymce.isIE && /MSIE [2-7]/.test(navigator.userAgent))

+				t.isIE7 = true;

 		},

 

 		createControl: function(name, cm) {

@@ -72,12 +75,12 @@
 					// Append styles to new list element

 					if (format) {

 						list = dom.getParent(sel.getNode(), 'ol,ul');

-

 						if (list) {

 							dom.setStyles(list, format.styles);

-							list.removeAttribute('_mce_style');

+							list.removeAttribute('data-mce-style');

 						}

 					}

+					ed.focus();

 				};

 

 				btn = cm.createSplitButton(name, {

@@ -122,9 +125,13 @@
 						}

 					});

 

-					menu.add({id : t.editor.dom.uniqueId(), title : 'advlist.types', 'class' : 'mceMenuItemTitle'}).setDisabled(1);

+					menu.add({id : t.editor.dom.uniqueId(), title : 'advlist.types', 'class' : 'mceMenuItemTitle', titleItem: true}).setDisabled(1);

 

 					each(t[name], function(item) {

+						// IE<8 doesn't support lower-greek, skip it

+						if (t.isIE7 && item.styles.listStyleType == 'lower-greek')

+							return;

+

 						item.id = t.editor.dom.uniqueId();

 

 						menu.add({id : item.id, title : item.title, onclick : function() {

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
new file mode 100644
index 000000000..de56d96fc
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;if(tinyMCE.isIE){return}a.onKeyDown.add(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}if(f.shiftKey&&f.keyCode==48){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng().cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("mceInsertLink",false,h[1]+h[2]);i.selection.moveToBookmark(k);if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js
new file mode 100644
index 000000000..4917edc53
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js
@@ -0,0 +1,169 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2011, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.AutolinkPlugin', {
+	/**
+	* 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) {
+		var t = this;
+
+		// Internet Explorer has built-in automatic linking
+		if (tinyMCE.isIE)
+			return;
+
+		// Add a key down handler
+		ed.onKeyDown.add(function(ed, e) {
+			if (e.keyCode == 13)
+				return t.handleEnter(ed);
+			if (e.shiftKey && e.keyCode == 48)
+				return t.handleEclipse(ed);
+			});
+
+		// Add a key up handler
+		ed.onKeyUp.add(function(ed, e) {
+			if (e.keyCode == 32)
+				return t.handleSpacebar(ed);
+			});
+	       },
+
+		handleEclipse : function(ed) {
+			this.parseCurrentLine(ed, -1, '(', true);
+		},
+
+		handleSpacebar : function(ed) {
+			 this.parseCurrentLine(ed, 0, '', true);
+		 },
+
+		handleEnter : function(ed) {
+			this.parseCurrentLine(ed, -1, '', false);
+		},
+
+		parseCurrentLine : function(ed, end_offset, delimiter, goback) {
+			var r, end, start, endContainer, bookmark, text, matches, prev, len;
+
+			// We need at least five characters to form a URL,
+			// hence, at minimum, five characters from the beginning of the line.
+			r = ed.selection.getRng().cloneRange();
+			if (r.startOffset < 5) {
+				// During testing, the caret is placed inbetween two text nodes. 
+				// The previous text node contains the URL.
+				prev = r.endContainer.previousSibling;
+				if (prev == null) {
+					if (r.endContainer.firstChild == null || r.endContainer.firstChild.nextSibling == null)
+						return;
+
+					prev = r.endContainer.firstChild.nextSibling;
+				}
+				len = prev.length;
+				r.setStart(prev, len);
+				r.setEnd(prev, len);
+
+				if (r.endOffset < 5)
+					return;
+
+				end = r.endOffset;
+				endContainer = prev;
+			} else {
+				endContainer = r.endContainer;
+
+				// Get a text node
+				if (endContainer.nodeType != 3 && endContainer.firstChild) {
+					while (endContainer.nodeType != 3 && endContainer.firstChild)
+						endContainer = endContainer.firstChild;
+
+					r.setStart(endContainer, 0);
+					r.setEnd(endContainer, endContainer.nodeValue.length);
+				}
+
+				if (r.endOffset == 1)
+					end = 2;
+				else
+					end = r.endOffset - 1 - end_offset;
+			}
+
+			start = end;
+
+			do
+			{
+				// Move the selection one character backwards.
+				r.setStart(endContainer, end - 2);
+				r.setEnd(endContainer, end - 1);
+				end -= 1;
+
+				// Loop until one of the following is found: a blank space, &nbsp;, delimeter, (end-2) >= 0
+			} while (r.toString() != ' ' && r.toString() != '' && r.toString().charCodeAt(0) != 160 && (end -2) >= 0 && r.toString() != delimiter);
+
+			if (r.toString() == delimiter || r.toString().charCodeAt(0) == 160) {
+				r.setStart(endContainer, end);
+				r.setEnd(endContainer, start);
+				end += 1;
+			} else if (r.startOffset == 0) {
+				r.setStart(endContainer, 0);
+				r.setEnd(endContainer, start);
+			}
+			else {
+				r.setStart(endContainer, end);
+				r.setEnd(endContainer, start);
+			}
+
+			text = r.toString();
+			matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.)(.+)$/i);
+
+			if (matches) {
+				if (matches[1] == 'www.') {
+					matches[1] = 'http://www.';
+				}
+
+				bookmark = ed.selection.getBookmark();
+
+				ed.selection.setRng(r);
+				tinyMCE.execCommand('mceInsertLink',false, matches[1] + matches[2]);
+				ed.selection.moveToBookmark(bookmark);
+
+				// TODO: Determine if this is still needed.
+				if (tinyMCE.isWebKit) {
+					// move the caret to its original position
+					ed.selection.collapse(false);
+					var max = Math.min(endContainer.length, start + 1);
+					r.setStart(endContainer, max);
+					r.setEnd(endContainer, max);
+					ed.selection.setRng(r);
+				}
+			}
+		},
+
+		/**
+		* 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 : 'Autolink',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('autolink', tinymce.plugins.AutolinkPlugin);
+})();
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
index 1676b154a..10687a921 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this;if(a.getParam("fullscreen_is_enabled")){return}function b(){var h=a.getDoc(),e=h.body,j=h.documentElement,g=tinymce.DOM,i=d.autoresize_min_height,f;f=tinymce.isIE?e.scrollHeight:j.offsetHeight;if(f>d.autoresize_min_height){i=f}g.setStyle(g.get(a.id+"_ifr"),"height",i+"px");if(d.throbbing){a.setProgressState(false);a.setProgressState(true)}}d.editor=a;d.autoresize_min_height=a.getElement().offsetHeight;a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onInit.add(function(f,e){f.setProgressState(true);d.throbbing=true;f.getBody().style.overflowY="hidden"});a.onLoadContent.add(function(f,e){b();setTimeout(function(){b();f.setProgressState(false);d.throbbing=false},1250)})}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this,e=0;if(a.getParam("fullscreen_is_enabled")){return}function b(){var i=a.getDoc(),f=i.body,k=i.documentElement,h=tinymce.DOM,j=d.autoresize_min_height,g;g=tinymce.isIE?f.scrollHeight:k.offsetHeight;g=d.bottom_margin+g;if(g>d.autoresize_min_height){j=g}if(j!==e){h.setStyle(h.get(a.id+"_ifr"),"height",j+"px");e=j}if(d.throbbing){a.setProgressState(false);a.setProgressState(true)}}d.editor=a;d.autoresize_min_height=a.getElement().offsetHeight;d.bottom_margin=parseInt(a.getParam("autoresize_bottom_margin",50));a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onInit.add(function(g,f){g.setProgressState(true);d.throbbing=true;g.getBody().style.overflowY="hidden"});a.onLoadContent.add(function(g,f){b();setTimeout(function(){b();g.setProgressState(false);d.throbbing=false},1250)})}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
index c260b7a24..50af21aac 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
@@ -26,7 +26,7 @@
 		 * @param {string} url Absolute URL to where the plugin is located.
 		 */
 		init : function(ed, url) {
-			var t = this;
+			var t = this, oldSize = 0;
 
 			if (ed.getParam('fullscreen_is_enabled'))
 				return;
@@ -40,12 +40,18 @@
 				// Get height differently depending on the browser used
 				myHeight = tinymce.isIE ? b.scrollHeight : de.offsetHeight;
 
+				// Bottom margin
+				myHeight = t.bottom_margin + myHeight;
+
 				// Don't make it smaller than the minimum height
 				if (myHeight > t.autoresize_min_height)
 					resizeHeight = myHeight;
 
 				// Resize content element
-				DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
+				if ( resizeHeight !== oldSize ) {
+					DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
+					oldSize = resizeHeight;
+				}
 
 				// if we're throbbing, we'll re-throb to match the new size
 				if (t.throbbing) {
@@ -59,6 +65,9 @@
 			// Define minimum height
 			t.autoresize_min_height = ed.getElement().offsetHeight;
 
+			// Add margin at the bottom for better UX
+			t.bottom_margin = parseInt( ed.getParam('autoresize_bottom_margin', 50) );
+
 			// Add appropriate listeners for resizing content area
 			ed.onChange.add(resize);
 			ed.onSetContent.add(resize);
@@ -116,4 +125,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('autoresize', tinymce.plugins.AutoResizePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
index b33ebfb7c..7f49107e6 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
@@ -1 +1 @@
-(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent().replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){h.storeDraft();i.nodeChanged()},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},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:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();m.save("TinyMCE")},getItem:function(l){var m=i.getElement();m.load("TinyMCE");return m.getAttribute(l)},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent();if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,i=h.storage;if(i){content=i.getItem(h.key);if(content){h.editor.setContent(content);h.onRestoreDraft.dispatch(h,{content:content})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
\ No newline at end of file
+(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent({draft:true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){h.storeDraft();i.nodeChanged()},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},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:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();try{m.save("TinyMCE")}catch(o){}},getItem:function(l){var m=i.getElement();try{m.load("TinyMCE");return m.getAttribute(l)}catch(n){return null}},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent({draft:true});if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,i=h.storage;if(i){content=i.getItem(h.key);if(content){h.editor.setContent(content);h.onRestoreDraft.dispatch(h,{content:content})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
index d8cc1120f..061cf1351 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
@@ -106,7 +106,7 @@
 			ed.addButton(RESTORE_DRAFT, {

 				title : PLUGIN_NAME + ".restore_content",

 				onclick : function() {

-					if (ed.getContent().replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi, "").length > 0) {

+					if (ed.getContent({draft: true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi, "").length > 0) {

 						// Show confirm dialog if the editor isn't empty

 						ed.windowManager.confirm(

 							PLUGIN_NAME + ".warning_message",

@@ -257,15 +257,24 @@
 

 								userDataElement.setAttribute(key, value);

 								userDataElement.expires = self.getExpDate();

-								userDataElement.save("TinyMCE");

+

+								try {

+									userDataElement.save("TinyMCE");

+								} catch (e) {

+									// Ignore, saving might fail if "Userdata Persistence" is disabled in IE

+								}

 							},

 

 							getItem : function(key) {

 								var userDataElement = ed.getElement();

 

-								userDataElement.load("TinyMCE");

-

-								return userDataElement.getAttribute(key);

+								try {

+									userDataElement.load("TinyMCE");

+									return userDataElement.getAttribute(key);

+								} catch (e) {

+									// Ignore, loading might fail if "Userdata Persistence" is disabled in IE

+									return null;

+								}

 							},

 

 							removeItem : function(key) {

@@ -303,7 +312,7 @@
 					return;

 

 				// Store contents if the contents if longer than the minlength of characters

-				content = editor.getContent();

+				content = editor.getContent({draft: true});

 				if (content.length > editor.settings.autosave_minlength) {

 					expires = self.getExpDate();

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
index 930fdff0a..8f8821fd6 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.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(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/&nbsp;/gi," ");b(/&quot;/gi,'"');b(/&lt;/gi,"<");b(/&gt;/gi,">");b(/&amp;/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.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(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/&nbsp;|\u00a0/gi," ");b(/&quot;/gi,'"');b(/&lt;/gi,"<");b(/&gt;/gi,">");b(/&amp;/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 5586637f3..4e7eb3377 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -79,7 +79,7 @@
 			rep(/<br>/gi,"\n");

 			rep(/<p>/gi,"");

 			rep(/<\/p>/gi,"\n");

-			rep(/&nbsp;/gi," ");

+			rep(/&nbsp;|\u00a0/gi," ");

 			rep(/&quot;/gi,"\"");

 			rep(/&lt;/gi,"<");

 			rep(/&gt;/gi,">");

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
index 52cf79e0b..8e041ea59 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(d){var f=this,g;f.editor=d;f.onContextMenu=new tinymce.util.Dispatcher(this);d.onContextMenu.add(function(h,i){if(!i.ctrlKey){if(g){h.selection.setRng(g)}f._getMenu(h).showMenu(i.clientX,i.clientY);a.add(h.getDoc(),"click",e);a.cancel(i)}});function e(h,i){g=null;if(i&&i.button==2){g=h.selection.getRng();return}if(f._menu){f._menu.removeAll();f._menu.destroy();a.remove(h.getDoc(),"click",e)}}d.onMouseDown.add(e);d.onKeyDown.add(e)},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(h){var l=this,f=l._menu,i=h.selection,e=i.isCollapsed(),d=i.getNode()||h.getBody(),g,k,j;if(f){f.removeAll();f.destroy()}k=b.getPos(h.getContentAreaContainer());j=b.getPos(h.getContainer());f=h.controlManager.createDropMenu("contextmenu",{offset_x:k.x+h.getParam("contextmenu_offset_x",0),offset_y:k.y+h.getParam("contextmenu_offset_y",0),constrain:1});l._menu=f;f.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(e);f.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(e);f.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((d.nodeName=="A"&&!h.dom.getAttrib(d,"name"))||!e){f.addSeparator();f.add({title:"advanced.link_desc",icon:"link",cmd:h.plugins.advlink?"mceAdvLink":"mceLink",ui:true});f.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}f.addSeparator();f.add({title:"advanced.image_desc",icon:"image",cmd:h.plugins.advimage?"mceAdvImage":"mceImage",ui:true});f.addSeparator();g=f.addMenu({title:"contextmenu.align"});g.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});g.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});g.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});g.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});l.onContextMenu.dispatch(l,f,d,e);return f}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
\ No newline at end of file
+(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(e){var h=this,f,d,i;h.editor=e;d=e.settings.contextmenu_never_use_native;h.onContextMenu=new tinymce.util.Dispatcher(this);f=e.onContextMenu.add(function(j,k){if((i!==0?i:k.ctrlKey)&&!d){return}a.cancel(k);if(k.target.nodeName=="IMG"){j.selection.select(k.target)}h._getMenu(j).showMenu(k.clientX||k.pageX,k.clientY||k.pageX);a.add(j.getDoc(),"click",function(l){g(j,l)});j.nodeChanged()});e.onRemove.add(function(){if(h._menu){h._menu.removeAll()}});function g(j,k){i=0;if(k&&k.button==2){i=k.ctrlKey;return}if(h._menu){h._menu.removeAll();h._menu.destroy();a.remove(j.getDoc(),"click",g)}}e.onMouseDown.add(g);e.onKeyDown.add(g);e.onKeyDown.add(function(j,k){if(k.shiftKey&&!k.ctrlKey&&!k.altKey&&k.keyCode===121){a.cancel(k);f(j,k)}})},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(h){var l=this,f=l._menu,i=h.selection,e=i.isCollapsed(),d=i.getNode()||h.getBody(),g,k,j;if(f){f.removeAll();f.destroy()}k=b.getPos(h.getContentAreaContainer());j=b.getPos(h.getContainer());f=h.controlManager.createDropMenu("contextmenu",{offset_x:k.x+h.getParam("contextmenu_offset_x",0),offset_y:k.y+h.getParam("contextmenu_offset_y",0),constrain:1,keyboard_focus:true});l._menu=f;f.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(e);f.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(e);f.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((d.nodeName=="A"&&!h.dom.getAttrib(d,"name"))||!e){f.addSeparator();f.add({title:"advanced.link_desc",icon:"link",cmd:h.plugins.advlink?"mceAdvLink":"mceLink",ui:true});f.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}f.addSeparator();f.add({title:"advanced.image_desc",icon:"image",cmd:h.plugins.advimage?"mceAdvImage":"mceImage",ui:true});f.addSeparator();g=f.addMenu({title:"contextmenu.align"});g.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});g.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});g.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});g.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});l.onContextMenu.dispatch(l,f,d,e);return f}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
index 25ad9dd70..4328f4b11 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
@@ -27,10 +27,12 @@
 		 * @param {string} url Absolute URL to where the plugin is located.

 		 */

 		init : function(ed) {

-			var t = this, lastRng;

+			var t = this, showMenu, contextmenuNeverUseNative, realCtrlKey;

 

 			t.editor = ed;

 

+			contextmenuNeverUseNative = ed.settings.contextmenu_never_use_native;

+

 			/**

 			 * This event gets fired when the context menu is shown.

 			 *

@@ -40,25 +42,37 @@
 			 */

 			t.onContextMenu = new tinymce.util.Dispatcher(this);

 

-			ed.onContextMenu.add(function(ed, e) {

-				if (!e.ctrlKey) {

-					// Restore the last selection since it was removed

-					if (lastRng)

-						ed.selection.setRng(lastRng);

+			showMenu = ed.onContextMenu.add(function(ed, e) {

+				// Block TinyMCE menu on ctrlKey and work around Safari issue

+				if ((realCtrlKey !== 0 ? realCtrlKey : e.ctrlKey) && !contextmenuNeverUseNative)

+					return;

 

-					t._getMenu(ed).showMenu(e.clientX, e.clientY);

-					Event.add(ed.getDoc(), 'click', hide);

-					Event.cancel(e);

-				}

+				Event.cancel(e);

+

+				// Select the image if it's clicked. WebKit would other wise expand the selection

+				if (e.target.nodeName == 'IMG')

+					ed.selection.select(e.target);

+

+				t._getMenu(ed).showMenu(e.clientX || e.pageX, e.clientY || e.pageX);

+				Event.add(ed.getDoc(), 'click', function(e) {

+					hide(ed, e);

+				});

+

+				ed.nodeChanged();

+			});

+

+			ed.onRemove.add(function() {

+				if (t._menu)

+					t._menu.removeAll();

 			});

 

 			function hide(ed, e) {

-				lastRng = null;

+				realCtrlKey = 0;

 

 				// Since the contextmenu event moves

 				// the selection we need to store it away

 				if (e && e.button == 2) {

-					lastRng = ed.selection.getRng();

+					realCtrlKey = e.ctrlKey;

 					return;

 				}

 

@@ -71,6 +85,12 @@
 

 			ed.onMouseDown.add(hide);

 			ed.onKeyDown.add(hide);

+			ed.onKeyDown.add(function(ed, e) {

+				if (e.shiftKey && !e.ctrlKey && !e.altKey && e.keyCode === 121) {

+					Event.cancel(e);

+					showMenu(ed, e);

+				}

+			});

 		},

 

 		/**

@@ -104,7 +124,8 @@
 			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

+				constrain : 1,

+				keyboard_focus: true

 			});

 

 			t._menu = m;

@@ -137,4 +158,4 @@
 

 	// Register plugin

 	tinymce.PluginManager.add('contextmenu', tinymce.plugins.ContextMenu);

-})();
\ No newline at end of file
+})();

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
index 55a1d72fa..2c91002e4 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
@@ -5,36 +5,37 @@
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

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

 </head>

-<body style="display: none">

-	<div align="center">

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

+<body style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#emotions_dlg.title}</span>

+<div align="center">

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

 

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

-		  <tr>

+	<table role="presentation" 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>

+		</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>

+		</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>

+		</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>

+		</tr>

+	</table>

+</div>

 </body>

 </html>

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
index 7a3334f08..2675cec15 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
@@ -35,53 +35,14 @@
 	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;

-}

+/* Head list classes */

 

-.movedownbutton {

-	background-image: url('../images/move_down.gif');

-	float: left;

+.headlistwrapper {

+	width: 100%;

 }

 

 .selected {

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
index 8e11bfc47..28ec92e20 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceFullPageProperties",function(){a.windowManager.open({file:b+"/fullpage.htm",width:430+parseInt(a.getLang("fullpage.delta_width",0)),height:495+parseInt(a.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:b,head_html:c.head})});a.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});a.onBeforeSetContent.add(c._setContent,c);a.onSetContent.add(c._setBodyAttribs,c);a.onGetContent.add(c._getContent,c)},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(d,a){var l,c,e,g,b,h,j,f=this.head.match(/body(.*?)>/i);if(f&&f[1]){l=f[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);if(l){for(c=0,e=l.length;c<e;c++){g=l[c].split("=");b=g[0].replace(/\s/,"");h=g[1];if(h){h=h.replace(/^\s+/,"").replace(/\s+$/,"");j=h.match(/^["'](.*)["']$/);if(j){h=j[1]}}else{h=b}d.dom.setAttrib(d.getBody(),"style",h)}}}},_createSerializer:function(){return new tinymce.dom.Serializer({dom:this.editor.dom,apply_source_formatting:true})},_setContent:function(d,b){var h=this,a,j,f=b.content,g,i="";if(b.source_view&&d.getParam("fullpage_hide_in_source_view")){return}f=f.replace(/<(\/?)BODY/gi,"<$1body");a=f.indexOf("<body");if(a!=-1){a=f.indexOf(">",a);h.head=f.substring(0,a+1);j=f.indexOf("</body",a);if(j==-1){j=f.indexOf("</body",j)}b.content=f.substring(a+1,j);h.foot=f.substring(j);function e(c){return c.replace(/<\/?[A-Z]+/g,function(k){return k.toLowerCase()})}h.head=e(h.head);h.foot=e(h.foot)}else{h.head="";if(d.getParam("fullpage_default_xml_pi")){h.head+='<?xml version="1.0" encoding="'+d.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'}h.head+=d.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');h.head+="\n<html>\n<head>\n<title>"+d.getParam("fullpage_default_title","Untitled document")+"</title>\n";if(g=d.getParam("fullpage_default_encoding")){h.head+='<meta http-equiv="Content-Type" content="'+g+'" />\n'}if(g=d.getParam("fullpage_default_font_family")){i+="font-family: "+g+";"}if(g=d.getParam("fullpage_default_font_size")){i+="font-size: "+g+";"}if(g=d.getParam("fullpage_default_text_color")){i+="color: "+g+";"}h.head+="</head>\n<body"+(i?' style="'+i+'"':"")+">\n";h.foot="\n</body>\n</html>"}},_getContent:function(a,c){var b=this;if(!c.source_view||!a.getParam("fullpage_hide_in_source_view")){c.content=tinymce.trim(b.head)+"\n"+tinymce.trim(c.content)+"\n"+tinymce.trim(b.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
\ No newline at end of file
+(function(){var b=tinymce.each,a=tinymce.html.Node;tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(c,d){var e=this;e.editor=c;c.addCommand("mceFullPageProperties",function(){c.windowManager.open({file:d+"/fullpage.htm",width:430+parseInt(c.getLang("fullpage.delta_width",0)),height:495+parseInt(c.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:d,data:e._htmlToData()})});c.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});c.onBeforeSetContent.add(e._setContent,e);c.onGetContent.add(e._getContent,e)},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}},_htmlToData:function(){var f=this._parseHeader(),h={},c,i,g,e=this.editor;function d(l,j){var k=l.attr(j);return k||""}h.fontface=e.getParam("fullpage_default_fontface","");h.fontsize=e.getParam("fullpage_default_fontsize","");i=f.firstChild;if(i.type==7){h.xml_pi=true;g=/encoding="([^"]+)"/.exec(i.value);if(g){h.docencoding=g[1]}}i=f.getAll("#doctype")[0];if(i){h.doctype="<!DOCTYPE"+i.value+">"}i=f.getAll("title")[0];if(i&&i.firstChild){h.metatitle=i.firstChild.value}b(f.getAll("meta"),function(m){var k=m.attr("name"),j=m.attr("http-equiv"),l;if(k){h["meta"+k.toLowerCase()]=m.attr("content")}else{if(j=="Content-Type"){l=/charset\s*=\s*(.*)\s*/gi.exec(m.attr("content"));if(l){h.docencoding=l[1]}}}});i=f.getAll("html")[0];if(i){h.langcode=d(i,"lang")||d(i,"xml:lang")}i=f.getAll("link")[0];if(i&&i.attr("rel")=="stylesheet"){h.stylesheet=i.attr("href")}i=f.getAll("body")[0];if(i){h.langdir=d(i,"dir");h.style=d(i,"style");h.visited_color=d(i,"vlink");h.link_color=d(i,"link");h.active_color=d(i,"alink")}return h},_dataToHtml:function(g){var f,d,h,j,k,e=this.editor.dom;function c(n,l,m){n.attr(l,m?m:undefined)}function i(l){if(d.firstChild){d.insert(l,d.firstChild)}else{d.append(l)}}f=this._parseHeader();d=f.getAll("head")[0];if(!d){j=f.getAll("html")[0];d=new a("head",1);if(j.firstChild){j.insert(d,j.firstChild,true)}else{j.append(d)}}j=f.firstChild;if(g.xml_pi){k='version="1.0"';if(g.docencoding){k+=' encoding="'+g.docencoding+'"'}if(j.type!=7){j=new a("xml",7);f.insert(j,f.firstChild,true)}j.value=k}else{if(j&&j.type==7){j.remove()}}j=f.getAll("#doctype")[0];if(g.doctype){if(!j){j=new a("#doctype",10);if(g.xml_pi){f.insert(j,f.firstChild)}else{i(j)}}j.value=g.doctype.substring(9,g.doctype.length-1)}else{if(j){j.remove()}}j=f.getAll("title")[0];if(g.metatitle){if(!j){j=new a("title",1);j.append(new a("#text",3)).value=g.metatitle;i(j)}}if(g.docencoding){j=null;b(f.getAll("meta"),function(l){if(l.attr("http-equiv")=="Content-Type"){j=l}});if(!j){j=new a("meta",1);j.attr("http-equiv","Content-Type");j.shortEnded=true;i(j)}j.attr("content","text/html; charset="+g.docencoding)}b("keywords,description,author,copyright,robots".split(","),function(m){var l=f.getAll("meta"),n,p,o=g["meta"+m];for(n=0;n<l.length;n++){p=l[n];if(p.attr("name")==m){if(o){p.attr("content",o)}else{p.remove()}return}}if(o){j=new a("meta",1);j.attr("name",m);j.attr("content",o);j.shortEnded=true;i(j)}});j=f.getAll("link")[0];if(j&&j.attr("rel")=="stylesheet"){if(g.stylesheet){j.attr("href",g.stylesheet)}else{j.remove()}}else{if(g.stylesheet){j=new a("link",1);j.attr({rel:"stylesheet",text:"text/css",href:g.stylesheet});j.shortEnded=true;i(j)}}j=f.getAll("body")[0];if(j){c(j,"dir",g.langdir);c(j,"style",g.style);c(j,"vlink",g.visited_color);c(j,"link",g.link_color);c(j,"alink",g.active_color);e.setAttribs(this.editor.getBody(),{style:g.style,dir:g.dir,vLink:g.visited_color,link:g.link_color,aLink:g.active_color})}j=f.getAll("html")[0];if(j){c(j,"lang",g.langcode);c(j,"xml:lang",g.langcode)}h=new tinymce.html.Serializer({validate:false,indent:true,apply_source_formatting:true,indent_before:"head,html,body,meta,title,script,link,style",indent_after:"head,html,body,meta,title,script,link,style"}).serialize(f);this.head=h.substring(0,h.indexOf("</body>"))},_parseHeader:function(){return new tinymce.html.DomParser({validate:false,root_name:"#document"}).parse(this.head)},_setContent:function(g,d){var m=this,i,c,h=d.content,f,l="",e=m.editor.dom,j;function k(n){return n.replace(/<\/?[A-Z]+/g,function(o){return o.toLowerCase()})}if(d.format=="raw"&&m.head){return}if(d.source_view&&g.getParam("fullpage_hide_in_source_view")){return}h=h.replace(/<(\/?)BODY/gi,"<$1body");i=h.indexOf("<body");if(i!=-1){i=h.indexOf(">",i);m.head=k(h.substring(0,i+1));c=h.indexOf("</body",i);if(c==-1){c=h.length}d.content=h.substring(i+1,c);m.foot=k(h.substring(c))}else{m.head=this._getDefaultHeader();m.foot="\n</body>\n</html>"}f=m._parseHeader();b(f.getAll("style"),function(n){if(n.firstChild){l+=n.firstChild.value}});j=f.getAll("body")[0];if(j){e.setAttribs(m.editor.getBody(),{style:j.attr("style")||"",dir:j.attr("dir")||"",vLink:j.attr("vlink")||"",link:j.attr("link")||"",aLink:j.attr("alink")||""})}if(l){e.add(m.editor.getDoc().getElementsByTagName("head")[0],"style",{id:"fullpage_styles"},l)}else{e.remove("fullpage_styles")}},_getDefaultHeader:function(){var f="",c=this.editor,e,d="";if(c.getParam("fullpage_default_xml_pi")){f+='<?xml version="1.0" encoding="'+c.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'}f+=c.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');f+="\n<html>\n<head>\n";if(e=c.getParam("fullpage_default_title")){f+="<title>"+v+"</title>\n"}if(e=c.getParam("fullpage_default_encoding")){f+='<meta http-equiv="Content-Type" content="text/html; charset='+e+'" />\n'}if(e=c.getParam("fullpage_default_font_family")){d+="font-family: "+e+";"}if(e=c.getParam("fullpage_default_font_size")){d+="font-size: "+e+";"}if(e=c.getParam("fullpage_default_text_color")){d+="color: "+e+";"}f+="</head>\n<body"+(d?' style="'+d+'"':"")+">\n";return f},_getContent:function(d,e){var c=this;if(!e.source_view||!d.getParam("fullpage_hide_in_source_view")){e.content=tinymce.trim(c.head)+"\n"+tinymce.trim(e.content)+"\n"+tinymce.trim(c.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
index b7d51d58e..ad4d3c212 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
@@ -9,6 +9,8 @@
  */

 

 (function() {

+	var each = tinymce.each, Node = tinymce.html.Node;

+

 	tinymce.create('tinymce.plugins.FullPagePlugin', {

 		init : function(ed, url) {

 			var t = this;

@@ -24,7 +26,7 @@
 					inline : 1

 				}, {

 					plugin_url : url,

-					head_html : t.head

+					data : t._htmlToData()

 				});

 			});

 

@@ -32,7 +34,6 @@
 			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);

 		},

 

@@ -48,102 +49,351 @@
 

 		// Private plugin internal methods

 

-		_setBodyAttribs : function(ed, o) {

-			var bdattr, i, len, kv, k, v, t, attr = this.head.match(/body(.*?)>/i);

+		_htmlToData : function() {

+			var headerFragment = this._parseHeader(), data = {}, nodes, elm, matches, editor = this.editor;

 

-			if (attr && attr[1]) {

-				bdattr = attr[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);

+			function getAttr(elm, name) {

+				var value = elm.attr(name);

 

-				if (bdattr) {

-					for(i = 0, len = bdattr.length; i < len; i++) {

-						kv = bdattr[i].split('=');

-						k = kv[0].replace(/\s/,'');

-						v = kv[1];

+				return value || '';

+			};

 

-						if (v) {

-							v = v.replace(/^\s+/,'').replace(/\s+$/,'');

-							t = v.match(/^["'](.*)["']$/);

+			// Default some values

+			data.fontface = editor.getParam("fullpage_default_fontface", "");

+			data.fontsize = editor.getParam("fullpage_default_fontsize", "");

 

-							if (t)

-								v = t[1];

-						} else

-							v = k;

+			// Parse XML PI

+			elm = headerFragment.firstChild;

+			if (elm.type == 7) {

+				data.xml_pi = true;

+				matches = /encoding="([^"]+)"/.exec(elm.value);

+				if (matches)

+					data.docencoding = matches[1];

+			}

 

-						ed.dom.setAttrib(ed.getBody(), 'style', v);

-					}

+			// Parse doctype

+			elm = headerFragment.getAll('#doctype')[0];

+			if (elm)

+				data.doctype = '<!DOCTYPE' + elm.value + ">"; 

+

+			// Parse title element

+			elm = headerFragment.getAll('title')[0];

+			if (elm && elm.firstChild) {

+				data.metatitle = elm.firstChild.value;

+			}

+

+			// Parse meta elements

+			each(headerFragment.getAll('meta'), function(meta) {

+				var name = meta.attr('name'), httpEquiv = meta.attr('http-equiv'), matches;

+

+				if (name)

+					data['meta' + name.toLowerCase()] = meta.attr('content');

+				else if (httpEquiv == "Content-Type") {

+					matches = /charset\s*=\s*(.*)\s*/gi.exec(meta.attr('content'));

+

+					if (matches)

+						data.docencoding = matches[1];

 				}

+			});

+

+			// Parse html attribs

+			elm = headerFragment.getAll('html')[0];

+			if (elm)

+				data.langcode = getAttr(elm, 'lang') || getAttr(elm, 'xml:lang');

+	

+			// Parse stylesheet

+			elm = headerFragment.getAll('link')[0];

+			if (elm && elm.attr('rel') == 'stylesheet')

+				data.stylesheet = elm.attr('href');

+

+			// Parse body parts

+			elm = headerFragment.getAll('body')[0];

+			if (elm) {

+				data.langdir = getAttr(elm, 'dir');

+				data.style = getAttr(elm, 'style');

+				data.visited_color = getAttr(elm, 'vlink');

+				data.link_color = getAttr(elm, 'link');

+				data.active_color = getAttr(elm, 'alink');

 			}

+

+			return data;

 		},

 

-		_createSerializer : function() {

-			return new tinymce.dom.Serializer({

-				dom : this.editor.dom,

-				apply_source_formatting : true

+		_dataToHtml : function(data) {

+			var headerFragment, headElement, html, elm, value, dom = this.editor.dom;

+

+			function setAttr(elm, name, value) {

+				elm.attr(name, value ? value : undefined);

+			};

+

+			function addHeadNode(node) {

+				if (headElement.firstChild)

+					headElement.insert(node, headElement.firstChild);

+				else

+					headElement.append(node);

+			};

+

+			headerFragment = this._parseHeader();

+			headElement = headerFragment.getAll('head')[0];

+			if (!headElement) {

+				elm = headerFragment.getAll('html')[0];

+				headElement = new Node('head', 1);

+

+				if (elm.firstChild)

+					elm.insert(headElement, elm.firstChild, true);

+				else

+					elm.append(headElement);

+			}

+

+			// Add/update/remove XML-PI

+			elm = headerFragment.firstChild;

+			if (data.xml_pi) {

+				value = 'version="1.0"';

+

+				if (data.docencoding)

+					value += ' encoding="' + data.docencoding + '"';

+

+				if (elm.type != 7) {

+					elm = new Node('xml', 7);

+					headerFragment.insert(elm, headerFragment.firstChild, true);

+				}

+

+				elm.value = value;

+			} else if (elm && elm.type == 7)

+				elm.remove();

+

+			// Add/update/remove doctype

+			elm = headerFragment.getAll('#doctype')[0];

+			if (data.doctype) {

+				if (!elm) {

+					elm = new Node('#doctype', 10);

+

+					if (data.xml_pi)

+						headerFragment.insert(elm, headerFragment.firstChild);

+					else

+						addHeadNode(elm);

+				}

+

+				elm.value = data.doctype.substring(9, data.doctype.length - 1);

+			} else if (elm)

+				elm.remove();

+

+			// Add/update/remove title

+			elm = headerFragment.getAll('title')[0];

+			if (data.metatitle) {

+				if (!elm) {

+					elm = new Node('title', 1);

+					elm.append(new Node('#text', 3)).value = data.metatitle;

+					addHeadNode(elm);

+				}

+			}

+

+			// Add meta encoding

+			if (data.docencoding) {

+				elm = null;

+				each(headerFragment.getAll('meta'), function(meta) {

+					if (meta.attr('http-equiv') == 'Content-Type')

+						elm = meta;

+				});

+

+				if (!elm) {

+					elm = new Node('meta', 1);

+					elm.attr('http-equiv', 'Content-Type');

+					elm.shortEnded = true;

+					addHeadNode(elm);

+				}

+

+				elm.attr('content', 'text/html; charset=' + data.docencoding);

+			}

+

+			// Add/update/remove meta

+			each('keywords,description,author,copyright,robots'.split(','), function(name) {

+				var nodes = headerFragment.getAll('meta'), i, meta, value = data['meta' + name];

+

+				for (i = 0; i < nodes.length; i++) {

+					meta = nodes[i];

+

+					if (meta.attr('name') == name) {

+						if (value)

+							meta.attr('content', value);

+						else

+							meta.remove();

+

+						return;

+					}

+				}

+

+				if (value) {

+					elm = new Node('meta', 1);

+					elm.attr('name', name);

+					elm.attr('content', value);

+					elm.shortEnded = true;

+

+					addHeadNode(elm);

+				}

 			});

+

+			// Add/update/delete link

+			elm = headerFragment.getAll('link')[0];

+			if (elm && elm.attr('rel') == 'stylesheet') {

+				if (data.stylesheet)

+					elm.attr('href', data.stylesheet);

+				else

+					elm.remove();

+			} else if (data.stylesheet) {

+				elm = new Node('link', 1);

+				elm.attr({

+					rel : 'stylesheet',

+					text : 'text/css',

+					href : data.stylesheet

+				});

+				elm.shortEnded = true;

+

+				addHeadNode(elm);

+			}

+

+			// Update body attributes

+			elm = headerFragment.getAll('body')[0];

+			if (elm) {

+				setAttr(elm, 'dir', data.langdir);

+				setAttr(elm, 'style', data.style);

+				setAttr(elm, 'vlink', data.visited_color);

+				setAttr(elm, 'link', data.link_color);

+				setAttr(elm, 'alink', data.active_color);

+

+				// Update iframe body as well

+				dom.setAttribs(this.editor.getBody(), {

+					style : data.style,

+					dir : data.dir,

+					vLink : data.visited_color,

+					link : data.link_color,

+					aLink : data.active_color

+				});

+			}

+

+			// Set html attributes

+			elm = headerFragment.getAll('html')[0];

+			if (elm) {

+				setAttr(elm, 'lang', data.langcode);

+				setAttr(elm, 'xml:lang', data.langcode);

+			}

+

+			// Serialize header fragment and crop away body part

+			html = new tinymce.html.Serializer({

+				validate: false,

+				indent: true,

+				apply_source_formatting : true,

+				indent_before: 'head,html,body,meta,title,script,link,style',

+				indent_after: 'head,html,body,meta,title,script,link,style'

+			}).serialize(headerFragment);

+

+			this.head = html.substring(0, html.indexOf('</body>'));

+		},

+

+		_parseHeader : function() {

+			// Parse the contents with a DOM parser

+			return new tinymce.html.DomParser({

+				validate: false,

+				root_name: '#document'

+			}).parse(this.head);

 		},

 

 		_setContent : function(ed, o) {

-			var t = this, sp, ep, c = o.content, v, st = '';

+			var self = this, startPos, endPos, content = o.content, headerFragment, styles = '', dom = self.editor.dom, elm;

+

+			function low(s) {

+				return s.replace(/<\/?[A-Z]+/g, function(a) {

+					return a.toLowerCase();

+				})

+			};

+

+			// Ignore raw updated if we already have a head, this will fix issues with undo/redo keeping the head/foot separate

+			if (o.format == 'raw' && self.head)

+				return;

 

 			if (o.source_view && ed.getParam('fullpage_hide_in_source_view'))

 				return;

 

 			// Parse out head, body and footer

-			c = c.replace(/<(\/?)BODY/gi, '<$1body');

-			sp = c.indexOf('<body');

+			content = content.replace(/<(\/?)BODY/gi, '<$1body');

+			startPos = content.indexOf('<body');

 

-			if (sp != -1) {

-				sp = c.indexOf('>', sp);

-				t.head = c.substring(0, sp + 1);

+			if (startPos != -1) {

+				startPos = content.indexOf('>', startPos);

+				self.head = low(content.substring(0, startPos + 1));

 

-				ep = c.indexOf('</body', sp);

-				if (ep == -1)

-					ep = c.indexOf('</body', ep);

+				endPos = content.indexOf('</body', startPos);

+				if (endPos == -1)

+					endPos = content.length;

 

-				o.content = c.substring(sp + 1, ep);

-				t.foot = c.substring(ep);

+				o.content = content.substring(startPos + 1, endPos);

+				self.foot = low(content.substring(endPos));

+			} else {

+				self.head = this._getDefaultHeader();

+				self.foot = '\n</body>\n</html>';

+			}

 

-				function low(s) {

-					return s.replace(/<\/?[A-Z]+/g, function(a) {

-						return a.toLowerCase();

-					})

-				};

+			// Parse header and update iframe

+			headerFragment = self._parseHeader();

+			each(headerFragment.getAll('style'), function(node) {

+				if (node.firstChild)

+					styles += node.firstChild.value;

+			});

 

-				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';

+			elm = headerFragment.getAll('body')[0];

+			if (elm) {

+				dom.setAttribs(self.editor.getBody(), {

+					style : elm.attr('style') || '',

+					dir : elm.attr('dir') || '',

+					vLink : elm.attr('vlink') || '',

+					link : elm.attr('link') || '',

+					aLink : elm.attr('alink') || ''

+				});

+			}

 

-				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 (styles)

+				dom.add(self.editor.getDoc().getElementsByTagName('head')[0], 'style', {id : 'fullpage_styles'}, styles);

+			else

+				dom.remove('fullpage_styles');

+		},

 

-				if (v = ed.getParam('fullpage_default_encoding'))

-					t.head += '<meta http-equiv="Content-Type" content="' + v + '" />\n';

+		_getDefaultHeader : function() {

+			var header = '', editor = this.editor, value, styles = '';

 

-				if (v = ed.getParam('fullpage_default_font_family'))

-					st += 'font-family: ' + v + ';';

+			if (editor.getParam('fullpage_default_xml_pi'))

+				header += '<?xml version="1.0" encoding="' + editor.getParam('fullpage_default_encoding', 'ISO-8859-1') + '" ?>\n';

 

-				if (v = ed.getParam('fullpage_default_font_size'))

-					st += 'font-size: ' + v + ';';

+			header += editor.getParam('fullpage_default_doctype', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');

+			header += '\n<html>\n<head>\n';

 

-				if (v = ed.getParam('fullpage_default_text_color'))

-					st += 'color: ' + v + ';';

+			if (value = editor.getParam('fullpage_default_title'))

+				header += '<title>' + v + '</title>\n';

 

-				t.head += '</head>\n<body' + (st ? ' style="' + st + '"' : '') + '>\n';

-				t.foot = '\n</body>\n</html>';

-			}

+			if (value = editor.getParam('fullpage_default_encoding'))

+				header += '<meta http-equiv="Content-Type" content="text/html; charset=' + value + '" />\n';

+

+			if (value = editor.getParam('fullpage_default_font_family'))

+				styles += 'font-family: ' + value + ';';

+

+			if (value = editor.getParam('fullpage_default_font_size'))

+				styles += 'font-size: ' + value + ';';

+

+			if (value = editor.getParam('fullpage_default_text_color'))

+				styles += 'color: ' + value + ';';

+

+			header += '</head>\n<body' + (styles ? ' style="' + styles + '"' : '') + '>\n';

+

+			return header;

 		},

 

 		_getContent : function(ed, o) {

-			var t = this;

+			var self = this;

 

 			if (!o.source_view || !ed.getParam('fullpage_hide_in_source_view'))

-				o.content = tinymce.trim(t.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(t.foot);

+				o.content = tinymce.trim(self.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(self.foot);

 		}

 	});

 

 	// Register plugin

 	tinymce.PluginManager.add('fullpage', tinymce.plugins.FullPagePlugin);

-})();
\ No newline at end of file
+})();

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
index c32afaf2d..14ab8652e 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
@@ -8,13 +8,12 @@
 	<script type="text/javascript" src="js/fullpage.js"></script>

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

 </head>

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

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

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

+<form onsubmit="FullPageDialog.update();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>

 

@@ -72,9 +71,9 @@
 							</td> 

 						</tr>

 						<tr>

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

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

 							<td>

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

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

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

 								</select>

 							</td>

@@ -109,7 +108,7 @@
 						<tr>

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

 							<td>

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

+								<select id="fontface" name="fontface" onchange="FullPageDialog.changedStyleProp();">

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

 								</select>

 							</td> 

@@ -118,7 +117,7 @@
 						<tr>

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

 							<td>

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

+								<select id="fontsize" name="fontsize" onchange="FullPageDialog.changedStyleProp();">

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

 								</select>

 							</td>

@@ -129,7 +128,7 @@
 							<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><input id="textcolor" name="textcolor" type="text" value="" size="9" onchange="updateColor('textcolor_pick','textcolor');FullPageDialog.changedStyleProp();" /></td>

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

 									</tr>

 								</table>

@@ -147,7 +146,7 @@
 							<td>

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

 									<tr>

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

+										<td><input id="bgimage" name="bgimage" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>

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

 									</tr>

 								</table>

@@ -158,7 +157,7 @@
 							<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><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');FullPageDialog.changedStyleProp();" /></td>

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

 									</tr>

 								</table>

@@ -173,15 +172,15 @@
 					<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><input id="leftmargin" name="leftmargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></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>

+							<td><input id="rightmargin" name="rightmargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></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><input id="topmargin" name="topmargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></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>

+							<td><input id="bottommargin" name="bottommargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>

 						</tr>

 					</table>

 				</fieldset>

@@ -195,7 +194,7 @@
 							<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><input id="link_color" name="link_color" type="text" value="" size="9" onchange="updateColor('link_color_pick','link_color');FullPageDialog.changedStyleProp();" /></td>

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

 									</tr>

 								</table>

@@ -205,7 +204,7 @@
 							<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><input id="visited_color" name="visited_color" type="text" value="" size="9" onchange="updateColor('visited_color_pick','visited_color');FullPageDialog.changedStyleProp();" /></td>

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

 									</tr>

 								</table>

@@ -217,7 +216,7 @@
 							<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><input id="active_color" name="active_color" type="text" value="" size="9" onchange="updateColor('active_color_pick','active_color');FullPageDialog.changedStyleProp();" /></td>

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

 									</tr>

 								</table>

@@ -225,16 +224,6 @@
 

 							<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>

@@ -254,310 +243,9 @@
 						</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>

+							<td><input id="style" name="style" type="text" value="" onchange="FullPageDialog.changedStyle();" /></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>

@@ -566,6 +254,6 @@
 			<input type="submit" id="insert" name="update" value="{#update}" />

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

 		</div>

-    </form>

+</form>

 </body>

 </html>

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
index a1bb719a3..3f672ad3b 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
@@ -8,464 +8,225 @@
  * Contributing: http://tinymce.moxiecode.com/contributing

  */

 

-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.replace(/\n/g, ''), 0).replace(/ +/g, ' ');

-	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, va, 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);

+(function() {

+	tinyMCEPopup.requireLangPack();

+

+	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 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 setVal(id, value) {

+		var elm = document.getElementById(id);

+

+		if (elm) {

+			value = value || '';

+

+			if (elm.nodeName == "SELECT")

+				selectByValue(document.forms[0], id, value);

+			else if (elm.type == "checkbox")

+				elm.checked = !!value;

 			else

-				l.setAttribute('_mce_href', f.stylesheet.value);

-

-			break;

+				elm.value = value;

 		}

-	}

-

-	// 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;

+	function getVal(id) {

+		var elm = document.getElementById(id);

 

-	if (f.leftmargin.value != '')

-		doc.body.style.marginLeft = f.leftmargin.value + 'px';

+		if (elm.nodeName == "SELECT")

+			return elm.options[elm.selectedIndex].value;

 

-	if (f.rightmargin.value != '')

-		doc.body.style.marginRight = f.rightmargin.value + 'px';

+		if (elm.type == "checkbox")

+			return elm.checked;

 

-	if (f.bottommargin.value != '')

-		doc.body.style.marginBottom = f.bottommargin.value + 'px';

+		return elm.value;

+	};

 

-	if (f.topmargin.value != '')

-		doc.body.style.marginTop = f.topmargin.value + 'px';

+	window.FullPageDialog = {

+		changedStyle : function() {

+			var val, styles = tinyMCEPopup.editor.dom.parseStyle(getVal('style'));

 

-	html = doc.getElementsByTagName('html')[0];

-	html.setAttribute('lang', f.langcode.value);

-	html.setAttribute('xml:lang', f.langcode.value);

+			setVal('fontface', styles['font-face']);

+			setVal('fontsize', styles['font-size']);

+			setVal('textcolor', styles['color']);

 

-	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();

-}

+			if (val = styles['background-image'])

+				setVal('bgimage', val.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1"));

+			else

+				setVal('bgimage', '');

+

+			setVal('bgcolor', styles['background-color']);

+

+			// Reset margin form elements

+			setVal('topmargin', '');

+			setVal('rightmargin', '');

+			setVal('bottommargin', '');

+			setVal('leftmargin', '');

+

+			// Expand margin

+			if (val = styles['margin']) {

+				val = val.split(' ');

+				styles['margin-top'] = val[0] || '';

+				styles['margin-right'] = val[1] || val[0] || '';

+				styles['margin-bottom'] = val[2] || val[0] || '';

+				styles['margin-left'] = val[3] || val[0] || '';

+			}

+

+			if (val = styles['margin-top'])

+				setVal('topmargin', val.replace(/px/, ''));

+

+			if (val = styles['margin-right'])

+				setVal('rightmargin', val.replace(/px/, ''));

+

+			if (val = styles['margin-bottom'])

+				setVal('bottommargin', val.replace(/px/, ''));

+

+			if (val = styles['margin-left'])

+				setVal('leftmargin', val.replace(/px/, ''));

+

+			updateColor('bgcolor_pick', 'bgcolor');

+			updateColor('textcolor_pick', 'textcolor');

+		},

+

+		changedStyleProp : function() {

+			var val, dom = tinyMCEPopup.editor.dom, styles = dom.parseStyle(getVal('style'));

+	

+			styles['font-face'] = getVal('fontface');

+			styles['font-size'] = getVal('fontsize');

+			styles['color'] = getVal('textcolor');

+			styles['background-color'] = getVal('bgcolor');

+

+			if (val = getVal('bgimage'))

+				styles['background-image'] = "url('" + val + "')";

+			else

+				styles['background-image'] = '';

 

-function changedStyleField(field) {

-}

+			delete styles['margin'];

 

-function setMeta(he, k, v) {

-	var nl, i, m;

+			if (val = getVal('topmargin'))

+				styles['margin-top'] = val + "px";

+			else

+				styles['margin-top'] = '';

 

-	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]);

+			if (val = getVal('rightmargin'))

+				styles['margin-right'] = val + "px";

 			else

-				nl[i].setAttribute('content', "text/html; charset=" + v);

+				styles['margin-right'] = '';

 

-			return;

-		}

+			if (val = getVal('bottommargin'))

+				styles['margin-bottom'] = val + "px";

+			else

+				styles['margin-bottom'] = '';

 

-		if (tinyMCEPopup.dom.getAttrib(nl[i], 'name') == k) {

-			if (v == '')

-				nl[i].parentNode.removeChild(nl[i]);

+			if (val = getVal('leftmargin'))

+				styles['margin-left'] = val + "px";

 			else

-				nl[i].setAttribute('content', v);

-			return;

+				styles['margin-left'] = '';

+

+			// Serialize, parse and reserialize this will compress redundant styles

+			setVal('style', dom.serializeStyle(dom.parseStyle(dom.serializeStyle(styles))));

+			this.changedStyle();

+		},

+		

+		update : function() {

+			var data = {};

+

+			tinymce.each(tinyMCEPopup.dom.select('select,input,textarea'), function(node) {

+				data[node.id] = getVal(node.id);

+			});

+

+			tinyMCEPopup.editor.plugins.fullpage._dataToHtml(data);

+			tinyMCEPopup.close();

+		}

+	};

+	

+	function init() {

+		var form = document.forms[0], i, item, list, editor = tinyMCEPopup.editor;

+

+		// Setup doctype select box

+		list = editor.getParam("fullpage_doctypes", defaultDocTypes).split(',');

+		for (i = 0; i < list.length; i++) {

+			item = list[i].split('=');

+

+			if (item.length > 1)

+				addSelectValue(form, 'doctype', item[0], item[1]);

 		}

-	}

-

-	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 += ';';

+		// Setup fonts select box

+		list = editor.getParam("fullpage_fonts", defaultFontNames).split(';');

+		for (i = 0; i < list.length; i++) {

+			item = list[i].split('=');

 

-		s += st.replace(/;/g, ';\n');

-		s += '}\n';

+			if (item.length > 1)

+				addSelectValue(form, 'fontface', item[0], item[1]);

+		}

 

-		if (i != d.length - 1)

-			s += '\n';

-	}

+		// Setup fontsize select box

+		list = editor.getParam("fullpage_fontsizes", defaultFontSizes).split(',');

+		for (i = 0; i < list.length; i++)

+			addSelectValue(form, 'fontsize', list[i], list[i]);

 

-	s += '\n-->';

+		// Setup encodings select box

+		list = editor.getParam("fullpage_encodings", defaultEncodings).split(',');

+		for (i = 0; i < list.length; i++) {

+			item = list[i].split('=');

 

-	return s;

-}

+			if (item.length > 1)

+				addSelectValue(form, 'docencoding', item[0], item[1]);

+		}

 

-tinyMCEPopup.onInit.add(init);

+		// Setup color pickers

+		document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

+		document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_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('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';

+

+		// Update form

+		tinymce.each(tinyMCEPopup.getWindowArg('data'), function(value, key) {

+			setVal(key, value);

+		});

+

+		FullPageDialog.changedStyle();

+

+		// 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');

+	};

+

+	tinyMCEPopup.onInit.add(init);

+})();

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
index 32550bd0c..6eae3ec84 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(c,d){var e=this,f={},b;e.editor=c;c.addCommand("mceFullScreen",function(){var h,i=a.doc.documentElement;if(c.getParam("fullscreen_is_enabled")){if(c.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",e.resizeFunc);tinyMCE.get(c.getParam("fullscreen_editor_id")).setContent(c.getContent({format:"raw"}),{format:"raw"});tinyMCE.remove(c);a.remove("mce_fullscreen_container");i.style.overflow=c.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",c.getParam("fullscreen_overflow"));a.win.scrollTo(c.getParam("fullscreen_scrollx"),c.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(c.getParam("fullscreen_new_window")){h=a.win.open(d+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{h.resizeTo(screen.availWidth,screen.availHeight)}catch(g){}}else{tinyMCE.oldSettings=tinyMCE.settings;f.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";f.fullscreen_html_overflow=a.getStyle(i,"overflow",1);b=a.getViewPort();f.fullscreen_scrollx=b.x;f.fullscreen_scrolly=b.y;if(tinymce.isOpera&&f.fullscreen_overflow=="visible"){f.fullscreen_overflow="auto"}if(tinymce.isIE&&f.fullscreen_overflow=="scroll"){f.fullscreen_overflow="auto"}if(tinymce.isIE&&(f.fullscreen_html_overflow=="visible"||f.fullscreen_html_overflow=="scroll")){f.fullscreen_html_overflow="auto"}if(f.fullscreen_overflow=="0px"){f.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");i.style.overflow="hidden";b=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){b.h-=1}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+(tinymce.isIE6||(tinymce.isIE&&!a.boxModel)?"absolute":"fixed")+";top:0;left:0;width:"+b.w+"px;height:"+b.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(c.settings,function(j,k){f[k]=j});f.id="mce_fullscreen";f.width=n.clientWidth;f.height=n.clientHeight-15;f.fullscreen_is_enabled=true;f.fullscreen_editor_id=c.id;f.theme_advanced_resizing=false;f.save_onsavecallback=function(){c.setContent(tinyMCE.get(f.id).getContent({format:"raw"}),{format:"raw"});c.execCommand("mceSave")};tinymce.each(c.getParam("fullscreen_settings"),function(l,j){f[j]=l});if(f.theme_advanced_toolbar_location==="external"){f.theme_advanced_toolbar_location="top"}e.fullscreenEditor=new tinymce.Editor("mce_fullscreen",f);e.fullscreenEditor.onInit.add(function(){e.fullscreenEditor.setContent(c.getContent());e.fullscreenEditor.focus()});e.fullscreenEditor.render();e.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");e.fullscreenElement.update();e.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var m=tinymce.DOM.getViewPort(),k=e.fullscreenEditor,j,l;j=k.dom.getSize(k.getContainer());l=k.dom.getSize(k.getContainer().getElementsByTagName("iframe")[0]);k.theme.resizeTo(m.w-j.w+l.w,m.h-j.h+l.h)})}});c.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});c.onNodeChange.add(function(h,g){g.setActive("fullscreen",h.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
+(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent({format:"raw"}),{format:"raw"});tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent({format:"raw"}),{format:"raw"});d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.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/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
index 2b9c884d1..3477c86c9 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
@@ -13,7 +13,7 @@
 

 	tinymce.create('tinymce.plugins.FullScreenPlugin', {

 		init : function(ed, url) {

-			var t = this, s = {}, vp;

+			var t = this, s = {}, vp, posCss;

 

 			t.editor = ed;

 

@@ -78,7 +78,15 @@
 					if (tinymce.isIE)

 						vp.h -= 1;

 

-					n = DOM.add(DOM.doc.body, 'div', {id : 'mce_fullscreen_container', style : 'position:' + (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel) ? 'absolute' : 'fixed') + ';top:0;left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});

+					// Use fixed position if it exists

+					if (tinymce.isIE6)

+						posCss = 'absolute;top:' + vp.y;

+					else

+						posCss = 'fixed;top:0';

+

+					n = DOM.add(DOM.doc.body, 'div', {

+						id : 'mce_fullscreen_container', 

+						style : 'position:' + posCss + ';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) {

@@ -119,7 +127,7 @@
 						var vp = tinymce.DOM.getViewPort(), fed = t.fullscreenEditor, outerSize, innerSize;

 

 						// Get outer/inner size to get a delta size that can be used to calc the new iframe size

-						outerSize = fed.dom.getSize(fed.getContainer());

+						outerSize = fed.dom.getSize(fed.getContainer().firstChild);

 						innerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('iframe')[0]);

 

 						fed.theme.resizeTo(vp.w - outerSize.w + innerSize.w, vp.h - outerSize.h + innerSize.h);

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
index 07ea477b7..ef648174f 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
@@ -1 +1 @@
-(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.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(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(r,j){var y=this,i,k="",q=y.editor,g=0,s=0,h,m,n,o,l,v,x;r=r||{};j=j||{};if(!r.inline){return y.parent(r,j)}if(!r.type){y.bookmark=q.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();r.width=parseInt(r.width||320);r.height=parseInt(r.height||240)+(tinymce.isIE?8:0);r.min_width=parseInt(r.min_width||150);r.min_height=parseInt(r.min_height||100);r.max_width=parseInt(r.max_width||2000);r.max_height=parseInt(r.max_height||2000);r.left=r.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(r.width/2)));r.top=r.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(r.height/2)));r.movable=r.resizable=true;j.mce_width=r.width;j.mce_height=r.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=r.auto_focus;y.features=r;y.params=j;y.onOpen.dispatch(y,r,j);if(r.type){k+=" mceModal";if(r.type){k+=" mce"+r.type.substring(0,1).toUpperCase()+r.type.substring(1)}r.resizable=false}if(r.statusbar){k+=" mceStatusbar"}if(r.resizable){k+=" mceResizable"}if(r.minimizable){k+=" mceMinimizable"}if(r.maximizable){k+=" mceMaximizable"}if(r.movable){k+=" mceMovable"}y._addAll(d.doc.body,["div",{id:i,"class":q.settings.inlinepopups_skin||"clearlooks2",style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},r.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_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:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!r.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;s+=d.get(i+"_top").clientHeight;s+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:r.top,left:r.left,width:r.width+g,height:r.height+s});x=r.url||r.file;if(x){if(tinymce.relaxedDomain){x+=(x.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}x=tinymce._addVer(x)}if(!r.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:r.width,height:r.height});d.setAttrib(i+"_ifr","src",x)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(r.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",r.content.replace("\n","<br />"))}n=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=y.windows[i];y.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return y._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return y._startDrag(i,t,u.className.substring(13))}}}}}});o=a.add(i,"click",function(f){var p=f.target;y.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":y.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":r.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});v=y.windows[i]={id:i,mousedown_func:n,click_func:o,element:new b(i,{blocker:1,container:q.getContainer()}),iframeElement:new b(i+"_ifr"),features:r,deltaWidth:g,deltaHeight:s};v.iframeElement.on("focus",function(){y.focus(i)});if(y.count==0&&y.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(y.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:y.zIndex-1}});d.show("mceModalBlocker")}else{d.setStyle("mceModalBlocker","z-index",y.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}y.focus(i);y._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}y.count++;return v},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;g<h.length;g++){f._addAll(k,h[g])}}}},_startDrag:function(v,G,E){var o=this,u,z,C=d.doc,f,l=o.windows[v],h=l.element,y=h.getXY(),x,q,F,g,A,s,r,j,i,m,k,n,B;g={x:0,y:0};A=d.getViewPort();A.w-=2;A.h-=2;j=G.screenX;i=G.screenY;m=k=n=B=0;u=a.add(C,"mouseup",function(p){a.remove(C,"mouseup",u);a.remove(C,"mousemove",z);if(f){f.remove()}h.moveBy(m,k);h.resizeBy(n,B);q=h.getSize();d.setStyles(v+"_ifr",{width:q.w-l.deltaWidth,height:q.h-l.deltaHeight});o._fixIELayout(v,1);return a.cancel(p)});if(E!="Move"){D()}function D(){if(f){return}o._fixIELayout(v,0);d.add(C.body,"div",{id:"mceEventBlocker","class":"mceEventBlocker "+(o.editor.settings.inlinepopups_skin||"clearlooks2"),style:{zIndex:o.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceEventBlocker",{position:"absolute",left:A.x,top:A.y,width:A.w-2,height:A.h-2})}f=new b("mceEventBlocker");f.update();x=h.getXY();q=h.getSize();s=g.x+x.x-A.x;r=g.y+x.y-A.y;d.add(f.get(),"div",{id:"mcePlaceHolder","class":"mcePlaceHolder",style:{left:s,top:r,width:q.w,height:q.h}});F=new b("mcePlaceHolder")}z=a.add(C,"mousemove",function(w){var p,H,t;D();p=w.screenX-j;H=w.screenY-i;switch(E){case"ResizeW":m=p;n=0-p;break;case"ResizeE":n=p;break;case"ResizeN":case"ResizeNW":case"ResizeNE":if(E=="ResizeNW"){m=p;n=0-p}else{if(E=="ResizeNE"){n=p}}k=H;B=0-H;break;case"ResizeS":case"ResizeSW":case"ResizeSE":if(E=="ResizeSW"){m=p;n=0-p}else{if(E=="ResizeSE"){n=p}}B=H;break;case"mceMove":m=p;k=H;break}if(n<(t=l.features.min_width-q.w)){if(m!==0){m+=n-t}n=t}if(B<(t=l.features.min_height-q.h)){if(k!==0){k+=B-t}B=t}n=Math.min(n,l.features.max_width-q.w);B=Math.min(B,l.features.max_height-q.h);m=Math.max(m,A.x-(s+A.x));k=Math.max(k,A.y-(r+A.y));m=Math.min(m,(A.w+A.x)-(s+q.w+A.x));k=Math.min(k,(A.h+A.y)-(r+q.h+A.y));if(m+k!==0){if(s+m<0){m=0}if(r+k<0){k=0}F.moveTo(s+m,r+k)}if(n+B!==0){F.resizeTo(q.w+n,q.h+B)}return a.cancel(w)});return a.cancel(G)},resizeBy:function(g,h,i){var f=this.windows[i];if(f){f.element.resizeBy(g,h);f.iframeElement.resizeBy(g,h)}},close:function(j,l){var h=this,g,k=d.doc,f=0,i,l;l=h._findId(l||j);if(!h.windows[l]){h.parent(j);return}h.count--;if(h.count==0){d.remove("mceModalBlocker")}if(g=h.windows[l]){h.onClose.dispatch(h);a.remove(k,"mousedown",g.mousedownFunc);a.remove(k,"click",g.clickFunc);a.clear(l);a.clear(l+"_ifr");d.setAttrib(l+"_ifr","src",'javascript:""');g.element.remove();delete h.windows[l];e(h.windows,function(m){if(m.zIndex>f){i=m;f=m.zIndex}});if(i){h.focus(i.id)}}},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})();
\ No newline at end of file
+(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.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(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(s,j){var z=this,i,k="",r=z.editor,g=0,v=0,h,m,o,q,l,x,y,n;s=s||{};j=j||{};if(!s.inline){return z.parent(s,j)}n=z._frontWindow();if(n&&d.get(n.id+"_ifr")){n.focussedElement=d.get(n.id+"_ifr").contentWindow.document.activeElement}if(!s.type){z.bookmark=r.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();s.width=parseInt(s.width||320);s.height=parseInt(s.height||240)+(tinymce.isIE?8:0);s.min_width=parseInt(s.min_width||150);s.min_height=parseInt(s.min_height||100);s.max_width=parseInt(s.max_width||2000);s.max_height=parseInt(s.max_height||2000);s.left=s.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(s.width/2)));s.top=s.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(s.height/2)));s.movable=s.resizable=true;j.mce_width=s.width;j.mce_height=s.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=s.auto_focus;z.features=s;z.params=j;z.onOpen.dispatch(z,s,j);if(s.type){k+=" mceModal";if(s.type){k+=" mce"+s.type.substring(0,1).toUpperCase()+s.type.substring(1)}s.resizable=false}if(s.statusbar){k+=" mceStatusbar"}if(s.resizable){k+=" mceResizable"}if(s.minimizable){k+=" mceMinimizable"}if(s.maximizable){k+=" mceMaximizable"}if(s.movable){k+=" mceMovable"}z._addAll(d.doc.body,["div",{id:i,role:"dialog","aria-labelledby":s.type?i+"_content":i+"_title","class":(r.settings.inlinepopups_skin||"clearlooks2")+(tinymce.isIE&&window.getSelection?" ie9":""),style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},s.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft",tabindex:"0"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight",tabindex:"0"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_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:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!s.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;v+=d.get(i+"_top").clientHeight;v+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:s.top,left:s.left,width:s.width+g,height:s.height+v});y=s.url||s.file;if(y){if(tinymce.relaxedDomain){y+=(y.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}y=tinymce._addVer(y)}if(!s.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:s.width,height:s.height});d.setAttrib(i+"_ifr","src",y)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(s.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",s.content.replace("\n","<br />"));a.add(i,"keyup",function(f){var p=27;if(f.keyCode===p){s.button_func(false);return a.cancel(f)}});a.add(i,"keydown",function(f){var t,p=9;if(f.keyCode===p){t=d.select("a.mceCancel",i+"_wrapper")[0];if(t&&t!==f.target){t.focus()}else{d.get(i+"_ok").focus()}return a.cancel(f)}})}o=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=z.windows[i];z.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return z._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return z._startDrag(i,t,u.className.substring(13))}}}}}});q=a.add(i,"click",function(f){var p=f.target;z.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":z.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":s.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});a.add([i+"_left",i+"_right"],"focus",function(p){var t=d.get(i+"_ifr");if(t){var f=t.contentWindow.document.body;var u=d.select(":input:enabled,*[tabindex=0]",f);if(p.target.id===(i+"_left")){u[u.length-1].focus()}else{u[0].focus()}}else{d.get(i+"_ok").focus()}});x=z.windows[i]={id:i,mousedown_func:o,click_func:q,element:new b(i,{blocker:1,container:r.getContainer()}),iframeElement:new b(i+"_ifr"),features:s,deltaWidth:g,deltaHeight:v};x.iframeElement.on("focus",function(){z.focus(i)});if(z.count==0&&z.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(z.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:z.zIndex-1}});d.show("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","true")}else{d.setStyle("mceModalBlocker","z-index",z.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}d.setAttrib(i,"aria-hidden","false");z.focus(i);z._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}z.count++;return x},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h;if(f.focussedElement){f.focussedElement.focus()}else{if(d.get(h+"_ok")){d.get(f.id+"_ok").focus()}else{if(d.get(f.id+"_ifr")){d.get(f.id+"_ifr").focus()}}}}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;g<h.length;g++){f._addAll(k,h[g])}}}},_startDrag:function(v,G,E){var o=this,u,z,C=d.doc,f,l=o.windows[v],h=l.element,y=h.getXY(),x,q,F,g,A,s,r,j,i,m,k,n,B;g={x:0,y:0};A=d.getViewPort();A.w-=2;A.h-=2;j=G.screenX;i=G.screenY;m=k=n=B=0;u=a.add(C,"mouseup",function(p){a.remove(C,"mouseup",u);a.remove(C,"mousemove",z);if(f){f.remove()}h.moveBy(m,k);h.resizeBy(n,B);q=h.getSize();d.setStyles(v+"_ifr",{width:q.w-l.deltaWidth,height:q.h-l.deltaHeight});o._fixIELayout(v,1);return a.cancel(p)});if(E!="Move"){D()}function D(){if(f){return}o._fixIELayout(v,0);d.add(C.body,"div",{id:"mceEventBlocker","class":"mceEventBlocker "+(o.editor.settings.inlinepopups_skin||"clearlooks2"),style:{zIndex:o.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceEventBlocker",{position:"absolute",left:A.x,top:A.y,width:A.w-2,height:A.h-2})}f=new b("mceEventBlocker");f.update();x=h.getXY();q=h.getSize();s=g.x+x.x-A.x;r=g.y+x.y-A.y;d.add(f.get(),"div",{id:"mcePlaceHolder","class":"mcePlaceHolder",style:{left:s,top:r,width:q.w,height:q.h}});F=new b("mcePlaceHolder")}z=a.add(C,"mousemove",function(w){var p,H,t;D();p=w.screenX-j;H=w.screenY-i;switch(E){case"ResizeW":m=p;n=0-p;break;case"ResizeE":n=p;break;case"ResizeN":case"ResizeNW":case"ResizeNE":if(E=="ResizeNW"){m=p;n=0-p}else{if(E=="ResizeNE"){n=p}}k=H;B=0-H;break;case"ResizeS":case"ResizeSW":case"ResizeSE":if(E=="ResizeSW"){m=p;n=0-p}else{if(E=="ResizeSE"){n=p}}B=H;break;case"mceMove":m=p;k=H;break}if(n<(t=l.features.min_width-q.w)){if(m!==0){m+=n-t}n=t}if(B<(t=l.features.min_height-q.h)){if(k!==0){k+=B-t}B=t}n=Math.min(n,l.features.max_width-q.w);B=Math.min(B,l.features.max_height-q.h);m=Math.max(m,A.x-(s+A.x));k=Math.max(k,A.y-(r+A.y));m=Math.min(m,(A.w+A.x)-(s+q.w+A.x));k=Math.min(k,(A.h+A.y)-(r+q.h+A.y));if(m+k!==0){if(s+m<0){m=0}if(r+k<0){k=0}F.moveTo(s+m,r+k)}if(n+B!==0){F.resizeTo(q.w+n,q.h+B)}return a.cancel(w)});return a.cancel(G)},resizeBy:function(g,h,i){var f=this.windows[i];if(f){f.element.resizeBy(g,h);f.iframeElement.resizeBy(g,h)}},close:function(i,k){var g=this,f,j=d.doc,h,k;k=g._findId(k||i);if(!g.windows[k]){g.parent(i);return}g.count--;if(g.count==0){d.remove("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","false");g.editor.focus()}if(f=g.windows[k]){g.onClose.dispatch(g);a.remove(j,"mousedown",f.mousedownFunc);a.remove(j,"click",f.clickFunc);a.clear(k);a.clear(k+"_ifr");d.setAttrib(k+"_ifr","src",'javascript:""');f.element.remove();delete g.windows[k];h=g._frontWindow();if(h){g.focus(h.id)}}},_frontWindow:function(){var g,f=0;e(this.windows,function(h){if(h.zIndex>f){g=h;f=h.zIndex}});return g},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
index e991683de..ac6fb1cb9 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
@@ -42,7 +42,7 @@
 		},

 

 		open : function(f, p) {

-			var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u;

+			var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u, parentWindow;

 

 			f = f || {};

 			p = p || {};

@@ -51,6 +51,11 @@
 			if (!f.inline)

 				return t.parent(f, p);

 

+			parentWindow = t._frontWindow();

+			if (parentWindow && DOM.get(parentWindow.id + '_ifr')) {

+				parentWindow.focussedElement = DOM.get(parentWindow.id + '_ifr').contentWindow.document.activeElement;

+			}

+			

 			// Only store selection if the type is a normal window

 			if (!f.type)

 				t.bookmark = ed.selection.getBookmark(1);

@@ -107,7 +112,7 @@
 

 			// 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, role : 'dialog', 'aria-labelledby': f.type ? id + '_content' : id + '_title', 'class' : (ed.settings.inlinepopups_skin || 'clearlooks2') + (tinymce.isIE && window.getSelection ? ' ie9' : ''), style : 'width:100px;height:100px'}, 

 					['div', {id : id + '_wrapper', 'class' : 'mceWrapper' + opt},

 						['div', {id : id + '_top', 'class' : 'mceTop'}, 

 							['div', {'class' : 'mceLeft'}],

@@ -117,9 +122,9 @@
 						],

 

 						['div', {id : id + '_middle', 'class' : 'mceMiddle'}, 

-							['div', {id : id + '_left', 'class' : 'mceLeft'}],

+							['div', {id : id + '_left', 'class' : 'mceLeft', tabindex : '0'}],

 							['span', {id : id + '_content'}],

-							['div', {id : id + '_right', 'class' : 'mceRight'}]

+							['div', {id : id + '_right', 'class' : 'mceRight', tabindex : '0'}]

 						],

 

 						['div', {id : id + '_bottom', 'class' : 'mceBottom'},

@@ -183,6 +188,27 @@
 

 				DOM.add(id + '_middle', 'div', {'class' : 'mceIcon'});

 				DOM.setHTML(id + '_content', f.content.replace('\n', '<br />'));

+				

+				Event.add(id, 'keyup', function(evt) {

+					var VK_ESCAPE = 27;

+					if (evt.keyCode === VK_ESCAPE) {

+						f.button_func(false);

+						return Event.cancel(evt);

+					}

+				});

+

+				Event.add(id, 'keydown', function(evt) {

+					var cancelButton, VK_TAB = 9;

+					if (evt.keyCode === VK_TAB) {

+						cancelButton = DOM.select('a.mceCancel', id + '_wrapper')[0];

+						if (cancelButton && cancelButton !== evt.target) {

+							cancelButton.focus();

+						} else {

+							DOM.get(id + '_ok').focus();

+						}

+						return Event.cancel(evt);

+					}

+				});

 			}

 

 			// Register events

@@ -239,7 +265,23 @@
 					}

 				}

 			});

-

+			

+			// Make sure the tab order loops within the dialog.

+			Event.add([id + '_left', id + '_right'], 'focus', function(evt) {

+				var iframe = DOM.get(id + '_ifr');

+				if (iframe) {

+					var body = iframe.contentWindow.document.body;

+					var focusable = DOM.select(':input:enabled,*[tabindex=0]', body);

+					if (evt.target.id === (id + '_left')) {

+						focusable[focusable.length - 1].focus();

+					} else {

+						focusable[0].focus();

+					}

+				} else {

+					DOM.get(id + '_ok').focus();

+				}

+			});

+			

 			// Add window

 			w = t.windows[id] = {

 				id : id,

@@ -265,19 +307,20 @@
 				});

 

 				DOM.show('mceModalBlocker'); // Reduces flicker in IE

+				DOM.setAttrib(DOM.doc.body, 'aria-hidden', 'true');

 			} else

 				DOM.setStyle('mceModalBlocker', 'z-index', t.zIndex - 1);

 

 			if (tinymce.isIE6 || /Firefox\/2\./.test(navigator.userAgent) || (tinymce.isIE && !DOM.boxModel))

 				DOM.setStyles('mceModalBlocker', {position : 'absolute', left : vp.x, top : vp.y, width : vp.w - 2, height : vp.h - 2});

 

+			DOM.setAttrib(id, 'aria-hidden', 'false');

 			t.focus(id);

 			t._fixIELayout(id, 1);

 

 			// Focus ok button

 			if (DOM.get(id + '_ok'))

 				DOM.get(id + '_ok').focus();

-

 			t.count++;

 

 			return w;

@@ -295,6 +338,14 @@
 				DOM.removeClass(t.lastId, 'mceFocus');

 				DOM.addClass(id, 'mceFocus');

 				t.lastId = id;

+				

+				if (w.focussedElement) {

+					w.focussedElement.focus();

+				} else if (DOM.get(id + '_ok')) {

+					DOM.get(w.id + '_ok').focus();

+				} else if (DOM.get(w.id + '_ifr')) {

+					DOM.get(w.id + '_ifr').focus();

+				}

 			}

 		},

 

@@ -478,7 +529,7 @@
 		},

 

 		close : function(win, id) {

-			var t = this, w, d = DOM.doc, ix = 0, fw, id;

+			var t = this, w, d = DOM.doc, fw, id;

 

 			id = t._findId(id || win);

 

@@ -490,8 +541,11 @@
 

 			t.count--;

 

-			if (t.count == 0)

+			if (t.count == 0) {

 				DOM.remove('mceModalBlocker');

+				DOM.setAttrib(DOM.doc.body, 'aria-hidden', 'false');

+				t.editor.focus();

+			}

 

 			if (w = t.windows[id]) {

 				t.onClose.dispatch(t);

@@ -504,18 +558,25 @@
 				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;

-					}

-				});

+				fw = t._frontWindow();

 

 				if (fw)

 					t.focus(fw.id);

 			}

 		},

+		

+		// Find front most window

+		_frontWindow : function() {

+			var fw, ix = 0;

+			// Find front most window and focus that

+			each (this.windows, function(w) {

+				if (w.zIndex > ix) {

+					fw = w;

+					ix = w.zIndex;

+				}

+			});

+			return fw;

+		},

 

 		setTitle : function(w, ti) {

 			var e;

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
index 5e6fd7d3c..a50d4fc57 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
@@ -87,4 +87,4 @@
 .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
+.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)}
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
index f88a6dd28..d610f7e9d 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Layer",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertLayer",c._insertLayer,c);a.addCommand("mceMoveForward",function(){c._move(1)});a.addCommand("mceMoveBackward",function(){c._move(-1)});a.addCommand("mceMakeAbsolute",function(){c._toggleAbsolute()});a.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});a.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});a.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});a.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});a.onInit.add(function(){if(tinymce.isIE){a.getDoc().execCommand("2D-Position",false,true)}});a.onNodeChange.add(c._nodeChange,c);a.onVisualAid.add(c._visualAid,c)},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(b,a,e){var c,d;c=this._getParentLayer(e);d=b.dom.getParent(e,"DIV,P,IMG");if(!d){a.setDisabled("absolute",1);a.setDisabled("moveforward",1);a.setDisabled("movebackward",1)}else{a.setDisabled("absolute",0);a.setDisabled("moveforward",!c);a.setDisabled("movebackward",!c);a.setActive("absolute",c&&c.style.position.toLowerCase()=="absolute")}},_visualAid:function(a,c,b){var d=a.dom;tinymce.each(d.select("div,p",c),function(f){if(/^(absolute|relative|static)$/i.test(f.style.position)){if(b){d.addClass(f,"mceItemVisualAid")}else{d.removeClass(f,"mceItemVisualAid")}}})},_move:function(h){var b=this.editor,f,g=[],e=this._getParentLayer(b.selection.getNode()),c=-1,j=-1,a;a=[];tinymce.walk(b.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){a.push(d)}},"childNodes");for(f=0;f<a.length;f++){g[f]=a[f].style.zIndex?parseInt(a[f].style.zIndex):0;if(c<0&&a[f]==e){c=f}}if(h<0){for(f=0;f<g.length;f++){if(g[f]<g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{if(g[c]>0){a[c].style.zIndex=g[c]-1}}}else{for(f=0;f<g.length;f++){if(g[f]>g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{a[c].style.zIndex=g[c]+1}}b.execCommand("mceRepaint")},_getParentLayer:function(a){return this.editor.dom.getParent(a,function(b){return b.nodeType==1&&/^(absolute|relative|static)$/i.test(b.style.position)})},_insertLayer:function(){var a=this.editor,b=a.dom.getPos(a.dom.getParent(a.selection.getNode(),"*"));a.dom.add(a.getBody(),"div",{style:{position:"absolute",left:b.x,top:(b.y>20?b.y:20),width:100,height:100},"class":"mceItemVisualAid"},a.selection.getContent()||a.getLang("layer.content"))},_toggleAbsolute:function(){var a=this.editor,b=this._getParentLayer(a.selection.getNode());if(!b){b=a.dom.getParent(a.selection.getNode(),"DIV,P,IMG")}if(b){if(b.style.position.toLowerCase()=="absolute"){a.dom.setStyles(b,{position:"",left:"",top:"",width:"",height:""});a.dom.removeClass(b,"mceItemVisualAid")}else{if(b.style.left==""){b.style.left=20+"px"}if(b.style.top==""){b.style.top=20+"px"}if(b.style.width==""){b.style.width=b.width?(b.width+"px"):"100px"}if(b.style.height==""){b.style.height=b.height?(b.height+"px"):"100px"}b.style.position="absolute";a.addVisual(a.getBody())}a.execCommand("mceRepaint");a.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Layer",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertLayer",c._insertLayer,c);a.addCommand("mceMoveForward",function(){c._move(1)});a.addCommand("mceMoveBackward",function(){c._move(-1)});a.addCommand("mceMakeAbsolute",function(){c._toggleAbsolute()});a.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});a.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});a.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});a.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});a.onInit.add(function(){if(tinymce.isIE){a.getDoc().execCommand("2D-Position",false,true)}});a.onNodeChange.add(c._nodeChange,c);a.onVisualAid.add(c._visualAid,c)},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(b,a,e){var c,d;c=this._getParentLayer(e);d=b.dom.getParent(e,"DIV,P,IMG");if(!d){a.setDisabled("absolute",1);a.setDisabled("moveforward",1);a.setDisabled("movebackward",1)}else{a.setDisabled("absolute",0);a.setDisabled("moveforward",!c);a.setDisabled("movebackward",!c);a.setActive("absolute",c&&c.style.position.toLowerCase()=="absolute")}},_visualAid:function(a,c,b){var d=a.dom;tinymce.each(d.select("div,p",c),function(f){if(/^(absolute|relative|static)$/i.test(f.style.position)){if(b){d.addClass(f,"mceItemVisualAid")}else{d.removeClass(f,"mceItemVisualAid")}}})},_move:function(h){var b=this.editor,f,g=[],e=this._getParentLayer(b.selection.getNode()),c=-1,j=-1,a;a=[];tinymce.walk(b.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){a.push(d)}},"childNodes");for(f=0;f<a.length;f++){g[f]=a[f].style.zIndex?parseInt(a[f].style.zIndex):0;if(c<0&&a[f]==e){c=f}}if(h<0){for(f=0;f<g.length;f++){if(g[f]<g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{if(g[c]>0){a[c].style.zIndex=g[c]-1}}}else{for(f=0;f<g.length;f++){if(g[f]>g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{a[c].style.zIndex=g[c]+1}}b.execCommand("mceRepaint")},_getParentLayer:function(a){return this.editor.dom.getParent(a,function(b){return b.nodeType==1&&/^(absolute|relative|static)$/i.test(b.style.position)})},_insertLayer:function(){var a=this.editor,b=a.dom.getPos(a.dom.getParent(a.selection.getNode(),"*"));a.dom.add(a.getBody(),"div",{style:{position:"absolute",left:b.x,top:(b.y>20?b.y:20),width:100,height:100},"class":"mceItemVisualAid"},a.selection.getContent()||a.getLang("layer.content"))},_toggleAbsolute:function(){var a=this.editor,b=this._getParentLayer(a.selection.getNode());if(!b){b=a.dom.getParent(a.selection.getNode(),"DIV,P,IMG")}if(b){if(b.style.position.toLowerCase()=="absolute"){a.dom.setStyles(b,{position:"",left:"",top:"",width:"",height:""});a.dom.removeClass(b,"mceItemVisualAid")}else{if(b.style.left==""){b.style.left=20+"px"}if(b.style.top==""){b.style.top=20+"px"}if(b.style.width==""){b.style.width=b.width?(b.width+"px"):"100px"}if(b.style.height==""){b.style.height=b.height?(b.height+"px"):"100px"}b.style.position="absolute";a.dom.setAttrib(b,"data-mce-style","");a.addVisual(a.getBody())}a.execCommand("mceRepaint");a.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
index d5aa86548..a8ac5a72f 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
@@ -198,6 +198,8 @@
 						le.style.height = le.height ? (le.height + 'px') : '100px';

 

 					le.style.position = "absolute";

+

+					ed.dom.setAttrib(le, 'data-mce-style', '');

 					ed.addVisual(ed.getBody());

 				}

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
index 29d43c524..b3a4ce31c 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
@@ -1 +1 @@
-(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.serializer;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,attributes:{align:"full"}},bold:{inline:"b"},italic:{inline:"i"},underline:{inline:"u"},strikethrough:{inline:"strike"},fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",styles:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}});d._setup();a.each("b,i,u,strike".split(","),function(f){var g=d.rules[f];if(!g){d.addRules(f)}});if(!d.rules.font){d.addRules("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.rules[f],g;if(h){a.each(h.attribs,function(j,i){if(i.name=="align"){g=true;return false}});if(!g){h.attribs.push({name:"align"})}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce);
\ No newline at end of file
+(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.schema;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,attributes:{align:"justify"}},bold:[{inline:"b",remove:"all"},{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}}],italic:[{inline:"i",remove:"all"},{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}}],underline:[{inline:"u",remove:"all"},{inline:"span",styles:{textDecoration:"underline"},exact:true}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:true}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",styles:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}});a.each("b,i,u,strike".split(","),function(f){d.addValidElements(f+"[*]")});if(!d.getElementRule("font")){d.addValidElements("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.getElementRule(f),g;if(h){if(!h.attributes.align){h.attributes.align={};h.attributesOrder.push("align")}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce);
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
index e852da15e..e627ec76e 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
@@ -26,7 +26,7 @@
 			editor.onInit.add(function() {

 				var alignElements = 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img',

 					fontSizes = tinymce.explode(editor.settings.font_size_style_values),

-					serializer = editor.serializer;

+					schema = editor.schema;

 

 				// Override some internal formats to produce legacy elements and attributes

 				editor.formatter.register({

@@ -34,13 +34,27 @@
 					alignleft : {selector : alignElements, attributes : {align : 'left'}},

 					aligncenter : {selector : alignElements, attributes : {align : 'center'}},

 					alignright : {selector : alignElements, attributes : {align : 'right'}},

-					alignfull : {selector : alignElements, attributes : {align : 'full'}},

-

-					// Change the basic formatting elements to use deprecated element types

-					bold : {inline : 'b'},

-					italic : {inline : 'i'},

-					underline : {inline : 'u'},

-					strikethrough : {inline : 'strike'},

+					alignfull : {selector : alignElements, attributes : {align : 'justify'}},

+

+					// Change the basic formatting elements to use deprecated element types
+					bold : [

+						{inline : 'b', remove : 'all'},

+						{inline : 'strong', remove : 'all'},

+						{inline : 'span', styles : {fontWeight : 'bold'}}

+					],

+					italic : [

+						{inline : 'i', remove : 'all'},

+						{inline : 'em', remove : 'all'},

+						{inline : 'span', styles : {fontStyle : 'italic'}}

+					],

+					underline : [

+						{inline : 'u', remove : 'all'},

+						{inline : 'span', styles : {textDecoration : 'underline'}, exact : true}

+					],

+					strikethrough : [

+						{inline : 'strike', remove : 'all'},

+						{inline : 'span', styles : {textDecoration: 'line-through'}, exact : true}

+					],
 

 					// Change font size and font family to use the deprecated font element

 					fontname : {inline : 'font', attributes : {face : '%value'}},

@@ -58,35 +72,24 @@
 					hilitecolor : {inline : 'font', styles : {backgroundColor : '%value'}}

 				});

 

-				// Force parsing of the serializer rules

-				serializer._setup();

-

 				// Check that deprecated elements are allowed if not add them

 				tinymce.each('b,i,u,strike'.split(','), function(name) {

-					var rule = serializer.rules[name];

-

-					if (!rule)

-						serializer.addRules(name);

+					schema.addValidElements(name + '[*]');

 				});

 

 				// Add font element if it's missing

-				if (!serializer.rules["font"])

-					serializer.addRules("font[face|size|color|style]");

+				if (!schema.getElementRule("font"))

+					schema.addValidElements("font[face|size|color|style]");

 

 				// Add the missing and depreacted align attribute for the serialization engine

 				tinymce.each(alignElements.split(','), function(name) {

-					var rule = serializer.rules[name], found;

+					var rule = schema.getElementRule(name), found;

 

 					if (rule) {

-						tinymce.each(rule.attribs, function(name, attr) {

-							if (attr.name == 'align') {

-								found = true;

-								return false;

-							}

-						});

-

-						if (!found)

-							rule.attribs.push({name : 'align'});

+						if (!rule.attributes.align) {

+							rule.attributes.align = {};

+							rule.attributesOrder.push('align');

+						}

 					}

 				});

 

@@ -133,4 +136,4 @@
 

 	// Register plugin

 	tinymce.PluginManager.add('legacyoutput', tinymce.plugins.LegacyOutput);

-})(tinymce);
\ No newline at end of file
+})(tinymce);

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js
new file mode 100644
index 000000000..446459913
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var e=tinymce.each,r=tinymce.dom.Event,g;function p(t,s){while(t&&(t.nodeType===8||(t.nodeType===3&&/^[ \t\n\r]*$/.test(t.nodeValue)))){t=s(t)}return t}function b(s){return p(s,function(t){return t.previousSibling})}function i(s){return p(s,function(t){return t.nextSibling})}function d(s,u,t){return s.dom.getParent(u,function(v){return tinymce.inArray(t,v)!==-1})}function n(s){return s&&(s.tagName==="OL"||s.tagName==="UL")}function c(u,v){var t,w,s;t=b(u.lastChild);while(n(t)){w=t;t=b(w.previousSibling)}if(w){s=v.create("li",{style:"list-style-type: none;"});v.split(u,w);v.insertAfter(s,w);s.appendChild(w);s.appendChild(w);u=s.previousSibling}return u}function m(t,s,u){t=a(t,s,u);return o(t,s,u)}function a(u,s,v){var t=b(u.previousSibling);if(t){return h(t,u,s?t:false,v)}else{return u}}function o(u,t,v){var s=i(u.nextSibling);if(s){return h(u,s,t?s:false,v)}else{return u}}function h(u,s,t,v){if(l(u,s,!!t,v)){return f(u,s,t)}else{if(u&&u.tagName==="LI"&&n(s)){u.appendChild(s)}}return s}function l(u,t,s,v){if(!u||!t){return false}else{if(u.tagName==="LI"&&t.tagName==="LI"){return t.style.listStyleType==="none"||j(t)}else{if(n(u)){return(u.tagName===t.tagName&&(s||u.style.listStyleType===t.style.listStyleType))||q(t)}else{if(v&&u.tagName==="P"&&t.tagName==="P"){return true}else{return false}}}}}function q(t){var s=i(t.firstChild),u=b(t.lastChild);return s&&u&&n(t)&&s===u&&(n(s)||s.style.listStyleType==="none"||j(s))}function j(u){var t=i(u.firstChild),s=b(u.lastChild);return t&&s&&t===s&&n(t)}function f(w,v,s){var u=b(w.lastChild),t=i(v.firstChild);if(w.tagName==="P"){w.appendChild(w.ownerDocument.createElement("br"))}while(v.firstChild){w.appendChild(v.firstChild)}if(s){w.style.listStyleType=s.style.listStyleType}v.parentNode.removeChild(v);h(u,t,false);return w}function k(t,u){var s;if(!u.is(t,"li,ol,ul")){s=u.getParent(t,"li");if(s){t=s}}return t}tinymce.create("tinymce.plugins.Lists",{init:function(u,v){var s=false;function x(y){return y.keyCode===9&&(u.queryCommandState("InsertUnorderedList")||u.queryCommandState("InsertOrderedList"))}function w(y,A){var z=y.selection,B;if(A.keyCode===13){B=z.getStart();s=z.isCollapsed()&&B&&B.tagName==="LI"&&B.childNodes.length===0;return s}}function t(y,z){if(x(z)||w(y,z)){return r.cancel(z)}}this.ed=u;u.addCommand("Indent",this.indent,this);u.addCommand("Outdent",this.outdent,this);u.addCommand("InsertUnorderedList",function(){this.applyList("UL","OL")},this);u.addCommand("InsertOrderedList",function(){this.applyList("OL","UL")},this);u.onInit.add(function(){u.editorCommands.addCommands({outdent:function(){var z=u.selection,A=u.dom;function y(B){B=A.getParent(B,A.isBlock);return B&&(parseInt(u.dom.getStyle(B,"margin-left")||0,10)+parseInt(u.dom.getStyle(B,"padding-left")||0,10))>0}return y(z.getStart())||y(z.getEnd())||u.queryCommandState("InsertOrderedList")||u.queryCommandState("InsertUnorderedList")}},"state")});u.onKeyUp.add(function(z,A){var B,y;if(x(A)){z.execCommand(A.shiftKey?"Outdent":"Indent",true,null);return r.cancel(A)}else{if(s&&w(z,A)){if(z.queryCommandState("InsertOrderedList")){z.execCommand("InsertOrderedList")}else{z.execCommand("InsertUnorderedList")}B=z.selection.getStart();if(B&&B.tagName==="LI"){B=z.dom.getParent(B,"ol,ul").nextSibling;if(B&&B.tagName==="P"){if(!B.firstChild){B.appendChild(z.getDoc().createTextNode(""))}y=z.dom.createRng();y.setStart(B.firstChild,1);y.setEnd(B.firstChild,1);z.selection.setRng(y)}}return r.cancel(A)}}});u.onKeyPress.add(t);u.onKeyDown.add(t)},applyList:function(y,v){var C=this,z=C.ed,I=z.dom,s=[],H=false,u=false,w=false,B,G=z.selection.getSelectedBlocks();function E(t){if(t&&t.tagName==="BR"){I.remove(t)}}function F(M){var N=I.create(y),t;function L(O){if(O.style.marginLeft||O.style.paddingLeft){C.adjustPaddingFunction(false)(O)}}if(M.tagName==="LI"){}else{if(M.tagName==="P"||M.tagName==="DIV"||M.tagName==="BODY"){K(M,function(P,O,Q){J(P,O,M.tagName==="BODY"?null:P.parentNode);t=P.parentNode;L(t);E(O)});if(M.tagName==="P"||G.length>1){I.split(t.parentNode.parentNode,t.parentNode)}m(t.parentNode,true);return}else{t=I.create("li");I.insertAfter(t,M);t.appendChild(M);L(M);M=t}}I.insertAfter(N,M);N.appendChild(M);m(N,true);s.push(M)}function J(Q,L,O){var t,P=Q,N,M;while(!I.isBlock(Q.parentNode)&&Q.parentNode!==I.getRoot()){Q=I.split(Q.parentNode,Q.previousSibling);Q=Q.nextSibling;P=Q}if(O){t=O.cloneNode(true);Q.parentNode.insertBefore(t,Q);while(t.firstChild){I.remove(t.firstChild)}t=I.rename(t,"li")}else{t=I.create("li");Q.parentNode.insertBefore(t,Q)}while(P&&P!=L){N=P.nextSibling;t.appendChild(P);P=N}if(t.childNodes.length===0){t.innerHTML='<br _mce_bogus="1" />'}F(t)}function K(Q,T){var N,R,O=3,L=1,t="br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl";function P(X,U){var V=I.createRng(),W;g.keep=true;z.selection.moveToBookmark(g);g.keep=false;W=z.selection.getRng(true);if(!U){U=X.parentNode.lastChild}V.setStartBefore(X);V.setEndAfter(U);return !(V.compareBoundaryPoints(O,W)>0||V.compareBoundaryPoints(L,W)<=0)}function S(U){if(U.nextSibling){return U.nextSibling}if(!I.isBlock(U.parentNode)&&U.parentNode!==I.getRoot()){return S(U.parentNode)}}N=Q.firstChild;var M=false;e(I.select(t,Q),function(V){var U;if(V.hasAttribute&&V.hasAttribute("_mce_bogus")){return true}if(P(N,V)){I.addClass(V,"_mce_tagged_br");N=S(V)}});M=(N&&P(N,undefined));N=Q.firstChild;e(I.select(t,Q),function(V){var U=S(V);if(V.hasAttribute&&V.hasAttribute("_mce_bogus")){return true}if(I.hasClass(V,"_mce_tagged_br")){T(N,V,R);R=null}else{R=V}N=U});if(M){T(N,undefined,R)}}function D(t){K(t,function(M,L,N){J(M,L);E(L);E(N)})}function A(t){if(tinymce.inArray(s,t)!==-1){return}if(t.parentNode.tagName===v){I.split(t.parentNode,t);F(t);o(t.parentNode,false)}s.push(t)}function x(M){var O,N,L,t;if(tinymce.inArray(s,M)!==-1){return}M=c(M,I);while(I.is(M.parentNode,"ol,ul,li")){I.split(M.parentNode,M)}s.push(M);M=I.rename(M,"p");L=m(M,false,z.settings.force_br_newlines);if(L===M){O=M.firstChild;while(O){if(I.isBlock(O)){O=I.split(O.parentNode,O);t=true;N=O.nextSibling&&O.nextSibling.firstChild}else{N=O.nextSibling;if(t&&O.tagName==="BR"){I.remove(O)}t=false}O=N}}}e(G,function(t){t=k(t,I);if(t.tagName===v||(t.tagName==="LI"&&t.parentNode.tagName===v)){u=true}else{if(t.tagName===y||(t.tagName==="LI"&&t.parentNode.tagName===y)){H=true}else{w=true}}});if(w||u||G.length===0){B={LI:A,H1:F,H2:F,H3:F,H4:F,H5:F,H6:F,P:F,BODY:F,DIV:G.length>1?F:D,defaultAction:D}}else{B={defaultAction:x}}this.process(B)},indent:function(){var u=this.ed,w=u.dom,x=[];function s(z){var y=w.create("li",{style:"list-style-type: none;"});w.insertAfter(y,z);return y}function t(B){var y=s(B),D=w.getParent(B,"ol,ul"),C=D.tagName,E=w.getStyle(D,"list-style-type"),A={},z;if(E!==""){A.style="list-style-type: "+E+";"}z=w.create(C,A);y.appendChild(z);return z}function v(z){if(!d(u,z,x)){z=c(z,w);var y=t(z);y.appendChild(z);m(y.parentNode,false);m(y,false);x.push(z)}}this.process({LI:v,defaultAction:this.adjustPaddingFunction(true)})},outdent:function(){var v=this,u=v.ed,w=u.dom,s=[];function x(t){var z,y,A;if(!d(u,t,s)){if(w.getStyle(t,"margin-left")!==""||w.getStyle(t,"padding-left")!==""){return v.adjustPaddingFunction(false)(t)}A=w.getStyle(t,"text-align",true);if(A==="center"||A==="right"){w.setStyle(t,"text-align","left");return}t=c(t,w);z=t.parentNode;y=t.parentNode.parentNode;if(y.tagName==="P"){w.split(y,t.parentNode)}else{w.split(z,t);if(y.tagName==="LI"){w.split(y,t)}else{if(!w.is(y,"ol,ul")){w.rename(t,"p")}}}s.push(t)}}this.process({LI:x,defaultAction:this.adjustPaddingFunction(false)});e(s,m)},process:function(x){var B=this,v=B.ed.selection,y=B.ed.dom,A,s;function w(t){y.removeClass(t,"_mce_act_on");if(!t||t.nodeType!==1){return}t=k(t,y);var C=x[t.tagName];if(!C){C=x.defaultAction}C(t)}function u(t){B.splitSafeEach(t.childNodes,w)}function z(t,C){return C>=0&&t.hasChildNodes()&&C<t.childNodes.length&&t.childNodes[C].tagName==="BR"}A=v.getSelectedBlocks();if(A.length===0){A=[y.getRoot()]}s=v.getRng(true);if(!s.collapsed){if(z(s.endContainer,s.endOffset-1)){s.setEnd(s.endContainer,s.endOffset-1);v.setRng(s)}if(z(s.startContainer,s.startOffset)){s.setStart(s.startContainer,s.startOffset+1);v.setRng(s)}}g=v.getBookmark();x.OL=x.UL=u;B.splitSafeEach(A,w);v.moveToBookmark(g);g=null;B.ed.execCommand("mceRepaint")},splitSafeEach:function(t,s){if(tinymce.isGecko&&(/Firefox\/[12]\.[0-9]/.test(navigator.userAgent)||/Firefox\/3\.[0-4]/.test(navigator.userAgent))){this.classBasedEach(t,s)}else{e(t,s)}},classBasedEach:function(v,u){var w=this.ed.dom,s,t;e(v,function(x){w.addClass(x,"_mce_act_on")});s=w.select("._mce_act_on");while(s.length>0){t=s.shift();w.removeClass(t,"_mce_act_on");u(t);s=w.select("._mce_act_on")}},adjustPaddingFunction:function(u){var s,v,t=this.ed;s=t.settings.indentation;v=/[a-z%]+/i.exec(s);s=parseInt(s,10);return function(w){var y,x;y=parseInt(t.dom.getStyle(w,"margin-left")||0,10)+parseInt(t.dom.getStyle(w,"padding-left")||0,10);if(u){x=y+s}else{x=y-s}t.dom.setStyle(w,"padding-left","");t.dom.setStyle(w,"margin-left",x>0?x+v:"")}},getInfo:function(){return{longname:"Lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("lists",tinymce.plugins.Lists)}());
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
new file mode 100644
index 000000000..b7ca762cd
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
@@ -0,0 +1,617 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2011, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var each = tinymce.each, Event = tinymce.dom.Event, bookmark;
+
+	// Skips text nodes that only contain whitespace since they aren't semantically important.
+	function skipWhitespaceNodes(e, next) {
+		while (e && (e.nodeType === 8 || (e.nodeType === 3 && /^[ \t\n\r]*$/.test(e.nodeValue)))) {
+			e = next(e);
+		}
+		return e;
+	}
+	
+	function skipWhitespaceNodesBackwards(e) {
+		return skipWhitespaceNodes(e, function(e) { return e.previousSibling; });
+	}
+	
+	function skipWhitespaceNodesForwards(e) {
+		return skipWhitespaceNodes(e, function(e) { return e.nextSibling; });
+	}
+	
+	function hasParentInList(ed, e, list) {
+		return ed.dom.getParent(e, function(p) {
+			return tinymce.inArray(list, p) !== -1;
+		});
+	}
+	
+	function isList(e) {
+		return e && (e.tagName === 'OL' || e.tagName === 'UL');
+	}
+	
+	function splitNestedLists(element, dom) {
+		var tmp, nested, wrapItem;
+		tmp = skipWhitespaceNodesBackwards(element.lastChild);
+		while (isList(tmp)) {
+			nested = tmp;
+			tmp = skipWhitespaceNodesBackwards(nested.previousSibling);
+		}
+		if (nested) {
+			wrapItem = dom.create('li', { style: 'list-style-type: none;'});
+			dom.split(element, nested);
+			dom.insertAfter(wrapItem, nested);
+			wrapItem.appendChild(nested);
+			wrapItem.appendChild(nested);
+			element = wrapItem.previousSibling;
+		}
+		return element;
+	}
+	
+	function attemptMergeWithAdjacent(e, allowDifferentListStyles, mergeParagraphs) {
+		e = attemptMergeWithPrevious(e, allowDifferentListStyles, mergeParagraphs);
+		return attemptMergeWithNext(e, allowDifferentListStyles, mergeParagraphs);
+	}
+	
+	function attemptMergeWithPrevious(e, allowDifferentListStyles, mergeParagraphs) {
+		var prev = skipWhitespaceNodesBackwards(e.previousSibling);
+		if (prev) {
+			return attemptMerge(prev, e, allowDifferentListStyles ? prev : false, mergeParagraphs);
+		} else {
+			return e;
+		}
+	}
+	
+	function attemptMergeWithNext(e, allowDifferentListStyles, mergeParagraphs) {
+		var next = skipWhitespaceNodesForwards(e.nextSibling);
+		if (next) {
+			return attemptMerge(e, next, allowDifferentListStyles ? next : false, mergeParagraphs);
+		} else {
+			return e;
+		}
+	}
+	
+	function attemptMerge(e1, e2, differentStylesMasterElement, mergeParagraphs) {
+		if (canMerge(e1, e2, !!differentStylesMasterElement, mergeParagraphs)) {
+			return merge(e1, e2, differentStylesMasterElement);
+		} else if (e1 && e1.tagName === 'LI' && isList(e2)) {
+			// Fix invalidly nested lists.
+			e1.appendChild(e2);
+		}
+		return e2;
+	}
+	
+	function canMerge(e1, e2, allowDifferentListStyles, mergeParagraphs) {
+		if (!e1 || !e2) {
+			return false;
+		} else if (e1.tagName === 'LI' && e2.tagName === 'LI') {
+			return e2.style.listStyleType === 'none' || containsOnlyAList(e2);
+		} else if (isList(e1)) {
+			return (e1.tagName === e2.tagName && (allowDifferentListStyles || e1.style.listStyleType === e2.style.listStyleType)) || isListForIndent(e2);
+		} else if (mergeParagraphs && e1.tagName === 'P' && e2.tagName === 'P') {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+	function isListForIndent(e) {
+		var firstLI = skipWhitespaceNodesForwards(e.firstChild), lastLI = skipWhitespaceNodesBackwards(e.lastChild);
+		return firstLI && lastLI && isList(e) && firstLI === lastLI && (isList(firstLI) || firstLI.style.listStyleType === 'none'  || containsOnlyAList(firstLI));
+	}
+	
+	function containsOnlyAList(e) {
+		var firstChild = skipWhitespaceNodesForwards(e.firstChild), lastChild = skipWhitespaceNodesBackwards(e.lastChild);
+		return firstChild && lastChild && firstChild === lastChild && isList(firstChild);
+	}
+	
+	function merge(e1, e2, masterElement) {
+		var lastOriginal = skipWhitespaceNodesBackwards(e1.lastChild), firstNew = skipWhitespaceNodesForwards(e2.firstChild);
+		if (e1.tagName === 'P') {
+			e1.appendChild(e1.ownerDocument.createElement('br'));
+		}
+		while (e2.firstChild) {
+			e1.appendChild(e2.firstChild);
+		}
+		if (masterElement) {
+			e1.style.listStyleType = masterElement.style.listStyleType;
+		}
+		e2.parentNode.removeChild(e2);
+		attemptMerge(lastOriginal, firstNew, false);
+		return e1;
+	}
+	
+	function findItemToOperateOn(e, dom) {
+		var item;
+		if (!dom.is(e, 'li,ol,ul')) {
+			item = dom.getParent(e, 'li');
+			if (item) {
+				e = item;
+			}
+		}
+		return e;
+	}
+	
+	tinymce.create('tinymce.plugins.Lists', {
+		init: function(ed, url) {
+			var enterDownInEmptyList = false;
+			function isTriggerKey(e) {
+				return e.keyCode === 9 && (ed.queryCommandState('InsertUnorderedList') || ed.queryCommandState('InsertOrderedList'));
+			}
+			function isEnterInEmptyListItem(ed, e) {
+				var sel = ed.selection, n;
+				if (e.keyCode === 13) {
+					n = sel.getStart();
+					enterDownInEmptyList = sel.isCollapsed() && n && n.tagName === 'LI' && n.childNodes.length === 0;
+					return enterDownInEmptyList;
+				}
+			}
+			function cancelKeys(ed, e) {
+				if (isTriggerKey(e) || isEnterInEmptyListItem(ed, e)) {
+					return Event.cancel(e);
+				}
+			}
+			
+			this.ed = ed;
+			ed.addCommand('Indent', this.indent, this);
+			ed.addCommand('Outdent', this.outdent, this);
+			ed.addCommand('InsertUnorderedList', function() {
+				this.applyList('UL', 'OL');
+			}, this);
+			ed.addCommand('InsertOrderedList', function() {
+				this.applyList('OL', 'UL');
+			}, this);
+			
+			ed.onInit.add(function() {
+				ed.editorCommands.addCommands({
+					'outdent': function() {
+						var sel = ed.selection, dom = ed.dom;
+						function hasStyleIndent(n) {
+							n = dom.getParent(n, dom.isBlock);
+							return n && (parseInt(ed.dom.getStyle(n, 'margin-left') || 0, 10) + parseInt(ed.dom.getStyle(n, 'padding-left') || 0, 10)) > 0;
+						}
+						return hasStyleIndent(sel.getStart()) || hasStyleIndent(sel.getEnd()) || ed.queryCommandState('InsertOrderedList') || ed.queryCommandState('InsertUnorderedList');
+					}
+				}, 'state');
+			});
+			
+			ed.onKeyUp.add(function(ed, e) {
+				var n, rng;
+				if (isTriggerKey(e)) {
+					ed.execCommand(e.shiftKey ? 'Outdent' : 'Indent', true, null);
+					return Event.cancel(e);
+				} else if (enterDownInEmptyList && isEnterInEmptyListItem(ed, e)) {
+					if (ed.queryCommandState('InsertOrderedList')) {
+						ed.execCommand('InsertOrderedList');
+					} else {
+						ed.execCommand('InsertUnorderedList');
+					}
+					n = ed.selection.getStart();
+					if (n && n.tagName === 'LI') {
+						// Fix the caret position on IE since it jumps back up to the previous list item.
+						n = ed.dom.getParent(n, 'ol,ul').nextSibling;
+						if (n && n.tagName === 'P') {
+							if (!n.firstChild) {
+								n.appendChild(ed.getDoc().createTextNode(''));
+							}
+							rng = ed.dom.createRng();
+							rng.setStart(n.firstChild, 1);
+							rng.setEnd(n.firstChild, 1);
+							ed.selection.setRng(rng);
+						}
+					}
+					return Event.cancel(e);
+				}
+			});
+			ed.onKeyPress.add(cancelKeys);
+			ed.onKeyDown.add(cancelKeys);
+		},
+		
+		applyList: function(targetListType, oppositeListType) {
+			var t = this, ed = t.ed, dom = ed.dom, applied = [], hasSameType = false, hasOppositeType = false, hasNonList = false, actions,
+				selectedBlocks = ed.selection.getSelectedBlocks();
+			
+			function cleanupBr(e) {
+				if (e && e.tagName === 'BR') {
+					dom.remove(e);
+				}
+			}
+			
+			function makeList(element) {
+				var list = dom.create(targetListType), li;
+				function adjustIndentForNewList(element) {
+					// If there's a margin-left, outdent one level to account for the extra list margin.
+					if (element.style.marginLeft || element.style.paddingLeft) {
+						t.adjustPaddingFunction(false)(element);
+					}
+				}
+				
+				if (element.tagName === 'LI') {
+					// No change required.
+				} else if (element.tagName === 'P' || element.tagName === 'DIV' || element.tagName === 'BODY') {
+					processBrs(element, function(startSection, br, previousBR) {
+						doWrapList(startSection, br, element.tagName === 'BODY' ? null : startSection.parentNode);
+						li = startSection.parentNode;
+						adjustIndentForNewList(li);
+						cleanupBr(br);
+					});
+					if (element.tagName === 'P' || selectedBlocks.length > 1) {
+						dom.split(li.parentNode.parentNode, li.parentNode);
+					}
+					attemptMergeWithAdjacent(li.parentNode, true);
+					return;
+				} else {
+					// Put the list around the element.
+					li = dom.create('li');
+					dom.insertAfter(li, element);
+					li.appendChild(element);
+					adjustIndentForNewList(element);
+					element = li;
+				}
+				dom.insertAfter(list, element);
+				list.appendChild(element);
+				attemptMergeWithAdjacent(list, true);
+				applied.push(element);
+			}
+			
+			function doWrapList(start, end, template) {
+				var li, n = start, tmp, i;
+				while (!dom.isBlock(start.parentNode) && start.parentNode !== dom.getRoot()) {
+					start = dom.split(start.parentNode, start.previousSibling);
+					start = start.nextSibling;
+					n = start;
+				}
+				if (template) {
+					li = template.cloneNode(true);
+					start.parentNode.insertBefore(li, start);
+					while (li.firstChild) dom.remove(li.firstChild);
+					li = dom.rename(li, 'li');
+				} else {
+					li = dom.create('li');
+					start.parentNode.insertBefore(li, start);
+				}
+				while (n && n != end) {
+					tmp = n.nextSibling;
+					li.appendChild(n);
+					n = tmp;
+				}
+				if (li.childNodes.length === 0) {
+					li.innerHTML = '<br _mce_bogus="1" />';
+				}
+				makeList(li);
+			}
+			
+			function processBrs(element, callback) {
+				var startSection, previousBR, END_TO_START = 3, START_TO_END = 1,
+					breakElements = 'br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl';
+				function isAnyPartSelected(start, end) {
+					var r = dom.createRng(), sel;
+					bookmark.keep = true;
+					ed.selection.moveToBookmark(bookmark);
+					bookmark.keep = false;
+					sel = ed.selection.getRng(true);
+					if (!end) {
+						end = start.parentNode.lastChild;
+					}
+					r.setStartBefore(start);
+					r.setEndAfter(end);
+					return !(r.compareBoundaryPoints(END_TO_START, sel) > 0 || r.compareBoundaryPoints(START_TO_END, sel) <= 0);
+				}
+				function nextLeaf(br) {
+					if (br.nextSibling)
+						return br.nextSibling;
+					if (!dom.isBlock(br.parentNode) && br.parentNode !== dom.getRoot())
+						return nextLeaf(br.parentNode);
+				}
+				// Split on BRs within the range and process those.
+				startSection = element.firstChild;
+				// First mark the BRs that have any part of the previous section selected.
+				var trailingContentSelected = false;
+				each(dom.select(breakElements, element), function(br) {
+					var b;
+					if (br.hasAttribute && br.hasAttribute('_mce_bogus')) {
+						return true; // Skip the bogus Brs that are put in to appease Firefox and Safari.
+					}
+					if (isAnyPartSelected(startSection, br)) {
+						dom.addClass(br, '_mce_tagged_br');
+						startSection = nextLeaf(br);
+					}
+				});
+				trailingContentSelected = (startSection && isAnyPartSelected(startSection, undefined));
+				startSection = element.firstChild;
+				each(dom.select(breakElements, element), function(br) {
+					// Got a section from start to br.
+					var tmp = nextLeaf(br);
+					if (br.hasAttribute && br.hasAttribute('_mce_bogus')) {
+						return true; // Skip the bogus Brs that are put in to appease Firefox and Safari.
+					}
+					if (dom.hasClass(br, '_mce_tagged_br')) {
+						callback(startSection, br, previousBR);
+						previousBR = null;
+					} else {
+						previousBR = br;
+					}
+					startSection = tmp;
+				});
+				if (trailingContentSelected) {
+					callback(startSection, undefined, previousBR);
+				}
+			}
+			
+			function wrapList(element) {
+				processBrs(element, function(startSection, br, previousBR) {
+					// Need to indent this part
+					doWrapList(startSection, br);
+					cleanupBr(br);
+					cleanupBr(previousBR);
+				});
+			}
+			
+			function changeList(element) {
+				if (tinymce.inArray(applied, element) !== -1) {
+					return;
+				}
+				if (element.parentNode.tagName === oppositeListType) {
+					dom.split(element.parentNode, element);
+					makeList(element);
+					attemptMergeWithNext(element.parentNode, false);
+				}
+				applied.push(element);
+			}
+			
+			function convertListItemToParagraph(element) {
+				var child, nextChild, mergedElement, splitLast;
+				if (tinymce.inArray(applied, element) !== -1) {
+					return;
+				}
+				element = splitNestedLists(element, dom);
+				while (dom.is(element.parentNode, 'ol,ul,li')) {
+					dom.split(element.parentNode, element);
+				}
+				// Push the original element we have from the selection, not the renamed one.
+				applied.push(element);
+				element = dom.rename(element, 'p');
+				mergedElement = attemptMergeWithAdjacent(element, false, ed.settings.force_br_newlines);
+				if (mergedElement === element) {
+					// Now split out any block elements that can't be contained within a P.
+					// Manually iterate to ensure we handle modifications correctly (doesn't work with tinymce.each)
+					child = element.firstChild;
+					while (child) {
+						if (dom.isBlock(child)) {
+							child = dom.split(child.parentNode, child);
+							splitLast = true;
+							nextChild = child.nextSibling && child.nextSibling.firstChild; 
+						} else {
+							nextChild = child.nextSibling;
+							if (splitLast && child.tagName === 'BR') {
+								dom.remove(child);
+							}
+							splitLast = false;
+						}
+						child = nextChild;
+					}
+				}
+			}
+			
+			each(selectedBlocks, function(e) {
+				e = findItemToOperateOn(e, dom);
+				if (e.tagName === oppositeListType || (e.tagName === 'LI' && e.parentNode.tagName === oppositeListType)) {
+					hasOppositeType = true;
+				} else if (e.tagName === targetListType || (e.tagName === 'LI' && e.parentNode.tagName === targetListType)) {
+					hasSameType = true;
+				} else {
+					hasNonList = true;
+				}
+			});
+
+			if (hasNonList || hasOppositeType || selectedBlocks.length === 0) {
+				actions = {
+					'LI': changeList,
+					'H1': makeList,
+					'H2': makeList,
+					'H3': makeList,
+					'H4': makeList,
+					'H5': makeList,
+					'H6': makeList,
+					'P': makeList,
+					'BODY': makeList,
+					'DIV': selectedBlocks.length > 1 ? makeList : wrapList,
+					defaultAction: wrapList
+				};
+			} else {
+				actions = {
+					defaultAction: convertListItemToParagraph
+				};
+			}
+			this.process(actions);
+		},
+		
+		indent: function() {
+			var ed = this.ed, dom = ed.dom, indented = [];
+			
+			function createWrapItem(element) {
+				var wrapItem = dom.create('li', { style: 'list-style-type: none;'});
+				dom.insertAfter(wrapItem, element);
+				return wrapItem;
+			}
+			
+			function createWrapList(element) {
+				var wrapItem = createWrapItem(element),
+					list = dom.getParent(element, 'ol,ul'),
+					listType = list.tagName,
+					listStyle = dom.getStyle(list, 'list-style-type'),
+					attrs = {},
+					wrapList;
+				if (listStyle !== '') {
+					attrs.style = 'list-style-type: ' + listStyle + ';';
+				}
+				wrapList = dom.create(listType, attrs);
+				wrapItem.appendChild(wrapList);
+				return wrapList;
+			}
+			
+			function indentLI(element) {
+				if (!hasParentInList(ed, element, indented)) {
+					element = splitNestedLists(element, dom);
+					var wrapList = createWrapList(element);
+					wrapList.appendChild(element);
+					attemptMergeWithAdjacent(wrapList.parentNode, false);
+					attemptMergeWithAdjacent(wrapList, false);
+					indented.push(element);
+				}
+			}
+			
+			this.process({
+				'LI': indentLI,
+				defaultAction: this.adjustPaddingFunction(true)
+			});
+			
+		},
+		
+		outdent: function() {
+			var t = this, ed = t.ed, dom = ed.dom, outdented = [];
+			
+			function outdentLI(element) {
+				var listElement, targetParent, align;
+				if (!hasParentInList(ed, element, outdented)) {
+					if (dom.getStyle(element, 'margin-left') !== '' || dom.getStyle(element, 'padding-left') !== '') {
+						return t.adjustPaddingFunction(false)(element);
+					}
+					align = dom.getStyle(element, 'text-align', true);
+					if (align === 'center' || align === 'right') {
+						dom.setStyle(element, 'text-align', 'left');
+						return;
+					}
+					element = splitNestedLists(element, dom);
+					listElement = element.parentNode;
+					targetParent = element.parentNode.parentNode;
+					if (targetParent.tagName === 'P') {
+						dom.split(targetParent, element.parentNode);
+					} else {
+						dom.split(listElement, element);
+						if (targetParent.tagName === 'LI') {
+							// Nested list, need to split the LI and go back out to the OL/UL element.
+							dom.split(targetParent, element);
+						} else if (!dom.is(targetParent, 'ol,ul')) {
+							dom.rename(element, 'p');
+						}
+					}
+					outdented.push(element);
+				}
+			}
+			
+			this.process({
+				'LI': outdentLI,
+				defaultAction: this.adjustPaddingFunction(false)
+			});
+			
+			each(outdented, attemptMergeWithAdjacent);
+		},
+		
+		process: function(actions) {
+			var t = this, sel = t.ed.selection, dom = t.ed.dom, selectedBlocks, r;
+			function processElement(element) {
+				dom.removeClass(element, '_mce_act_on');
+				if (!element || element.nodeType !== 1) {
+					return;
+				}
+				element = findItemToOperateOn(element, dom);
+				var action = actions[element.tagName];
+				if (!action) {
+					action = actions.defaultAction;
+				}
+				action(element);
+			}
+			function recurse(element) {
+				t.splitSafeEach(element.childNodes, processElement);
+			}
+			function brAtEdgeOfSelection(container, offset) {
+				return offset >= 0 && container.hasChildNodes() && offset < container.childNodes.length &&
+						container.childNodes[offset].tagName === 'BR';
+			}
+			selectedBlocks = sel.getSelectedBlocks();
+			if (selectedBlocks.length === 0) {
+				selectedBlocks = [ dom.getRoot() ];
+			}
+
+			r = sel.getRng(true);
+			if (!r.collapsed) {
+				if (brAtEdgeOfSelection(r.endContainer, r.endOffset - 1)) {
+					r.setEnd(r.endContainer, r.endOffset - 1);
+					sel.setRng(r);
+				}
+				if (brAtEdgeOfSelection(r.startContainer, r.startOffset)) {
+					r.setStart(r.startContainer, r.startOffset + 1);
+					sel.setRng(r);
+				}
+			}
+			bookmark = sel.getBookmark();
+			actions.OL = actions.UL = recurse;
+			t.splitSafeEach(selectedBlocks, processElement);
+			sel.moveToBookmark(bookmark);
+			bookmark = null;
+			// Avoids table or image handles being left behind in Firefox.
+			t.ed.execCommand('mceRepaint');
+		},
+		
+		splitSafeEach: function(elements, f) {
+			if (tinymce.isGecko && (/Firefox\/[12]\.[0-9]/.test(navigator.userAgent) ||
+					/Firefox\/3\.[0-4]/.test(navigator.userAgent))) {
+				this.classBasedEach(elements, f);
+			} else {
+				each(elements, f);
+			}
+		},
+		
+		classBasedEach: function(elements, f) {
+			var dom = this.ed.dom, nodes, element;
+			// Mark nodes
+			each(elements, function(element) {
+				dom.addClass(element, '_mce_act_on');
+			});
+			nodes = dom.select('._mce_act_on');
+			while (nodes.length > 0) {
+				element = nodes.shift();
+				dom.removeClass(element, '_mce_act_on');
+				f(element);
+				nodes = dom.select('._mce_act_on');
+			}
+		},
+		
+		adjustPaddingFunction: function(isIndent) {
+			var indentAmount, indentUnits, ed = this.ed;
+			indentAmount = ed.settings.indentation;
+			indentUnits = /[a-z%]+/i.exec(indentAmount);
+			indentAmount = parseInt(indentAmount, 10);
+			return function(element) {
+				var currentIndent, newIndentAmount;
+				currentIndent = parseInt(ed.dom.getStyle(element, 'margin-left') || 0, 10) + parseInt(ed.dom.getStyle(element, 'padding-left') || 0, 10);
+				if (isIndent) {
+					newIndentAmount = currentIndent + indentAmount;
+				} else {
+					newIndentAmount = currentIndent - indentAmount;
+				}
+				ed.dom.setStyle(element, 'padding-left', '');
+				ed.dom.setStyle(element, 'margin-left', newIndentAmount > 0 ? newIndentAmount + indentUnits : '');
+			};
+		},
+		
+		getInfo: function() {
+			return {
+				longname : 'Lists',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+	tinymce.PluginManager.add("lists", tinymce.plugins.Lists);
+}());
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/content.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/content.css
deleted file mode 100644
index 1bf6a7586..000000000
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/content.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.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/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/media.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
index 2d087944d..0c45c7ff6 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
@@ -1,12 +1,12 @@
-#id, #name, #hspace, #vspace, #class_name, #align {	width: 100px }

+#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 }

+#flash_base, #flash_flashvars, #html5_altsource1, #html5_altsource2, #html5_poster { 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 }

+#prev { margin: 0; border: 1px solid black; width: 380px; height: 260px; overflow: auto }

+.panel_wrapper div.current { height: 420px; 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 }

@@ -14,3 +14,4 @@
 #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 }

+iframe {border: 1px solid gray}

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
index 4bbe367e3..66219078c 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.MediaPlugin",{init:function(b,c){var e=this;e.editor=b;e.url=c;function f(g){return/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(g.className)}b.onPreInit.add(function(){b.serializer.addRules("param[name|value|_mce_value]")});b.addCommand("mceMedia",function(){b.windowManager.open({file:c+"/media.htm",width:430+parseInt(b.getLang("media.delta_width",0)),height:470+parseInt(b.getLang("media.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("media",{title:"media.desc",cmd:"mceMedia"});b.onNodeChange.add(function(h,g,i){g.setActive("media",i.nodeName=="IMG"&&f(i))});b.onInit.add(function(){var g={mceItemFlash:"flash",mceItemShockWave:"shockwave",mceItemWindowsMedia:"windowsmedia",mceItemQuickTime:"quicktime",mceItemRealMedia:"realmedia"};b.selection.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.selection.onBeforeSetContent.add(e._objectsToSpans,e);if(b.settings.content_css!==false){b.dom.loadCSS(c+"/css/content.css")}if(b.theme&&b.theme.onResolveName){b.theme.onResolveName.add(function(h,i){if(i.name=="img"){a(g,function(l,j){if(b.dom.hasClass(i.node,j)){i.name=l;i.title=b.dom.getAttrib(i.node,"title");return false}})}})}if(b&&b.plugins.contextmenu){b.plugins.contextmenu.onContextMenu.add(function(i,h,j){if(j.nodeName=="IMG"&&/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(j.className)){h.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});b.onBeforeSetContent.add(e._objectsToSpans,e);b.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.onPreProcess.add(function(g,i){var h=g.dom;if(i.set){e._spansToImgs(i.node);a(h.select("IMG",i.node),function(k){var j;if(f(k)){j=e._parse(k.title);h.setAttrib(k,"width",h.getAttrib(k,"width",j.width||100));h.setAttrib(k,"height",h.getAttrib(k,"height",j.height||100))}})}if(i.get){a(h.select("IMG",i.node),function(m){var l,j,k;if(g.getParam("media_use_script")){if(f(m)){m.className=m.className.replace(/mceItem/g,"mceTemp")}return}switch(m.className){case"mceItemFlash":l="d27cdb6e-ae6d-11cf-96b8-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="application/x-shockwave-flash";break;case"mceItemShockWave":l="166b1bca-3f9c-11cf-8075-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0";k="application/x-director";break;case"mceItemWindowsMedia":l=g.getParam("media_wmp6_compatible")?"05589fa1-c356-11ce-bf01-00aa0055595a":"6bf52a52-394a-11d3-b153-00c04f79faa6";j="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701";k="application/x-mplayer2";break;case"mceItemQuickTime":l="02bf25d5-8c17-4b23-bc80-d3488abddc6b";j="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0";k="video/quicktime";break;case"mceItemRealMedia":l="cfcdaa03-8be4-11cf-b84b-0020afbbccfa";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="audio/x-pn-realaudio-plugin";break}if(l){h.replace(e._buildObj({classid:l,codebase:j,type:k},m),m)}})}});b.onPostProcess.add(function(g,h){h.content=h.content.replace(/_mce_value=/g,"value=")});function d(g,h){h=new RegExp(h+'="([^"]+)"',"g").exec(g);return h?b.dom.decode(h[1]):""}b.onPostProcess.add(function(g,h){if(g.getParam("media_use_script")){h.content=h.content.replace(/<img[^>]+>/g,function(j){var i=d(j,"class");if(/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(i)){at=e._parse(d(j,"title"));at.width=d(j,"width");at.height=d(j,"height");j='<script type="text/javascript">write'+i.substring(7)+"({"+e._serialize(at)+"});<\/script>"}return j})}})},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}},_objectsToSpans:function(b,e){var c=this,d=e.content;d=d.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi,function(g,f,i){var h=c._parse(i);return'<img class="mceItem'+f+'" title="'+b.dom.encode(i)+'" src="'+c.url+'/img/trans.gif" width="'+h.width+'" height="'+h.height+'" />'});d=d.replace(/<object([^>]*)>/gi,'<span class="mceItemObject" $1>');d=d.replace(/<embed([^>]*)\/?>/gi,'<span class="mceItemEmbed" $1></span>');d=d.replace(/<embed([^>]*)>/gi,'<span class="mceItemEmbed" $1>');d=d.replace(/<\/(object)([^>]*)>/gi,"</span>");d=d.replace(/<\/embed>/gi,"");d=d.replace(/<param([^>]*)>/gi,function(g,f){return"<span "+f.replace(/value=/gi,"_mce_value=")+' class="mceItemParam"></span>'});d=d.replace(/\/ class=\"mceItemParam\"><\/span>/gi,'class="mceItemParam"></span>');e.content=d},_buildObj:function(g,h){var d,c=this.editor,f=c.dom,e=this._parse(h.title),b;b=c.getParam("media_strict",true)&&g.type=="application/x-shockwave-flash";e.width=g.width=f.getAttrib(h,"width")||100;e.height=g.height=f.getAttrib(h,"height")||100;if(e.src){e.src=c.convertURL(e.src,"src",h)}if(b){d=f.create("span",{id:e.id,_mce_name:"object",type:"application/x-shockwave-flash",data:e.src,style:f.getAttrib(h,"style"),width:g.width,height:g.height})}else{d=f.create("span",{id:e.id,_mce_name:"object",classid:"clsid:"+g.classid,style:f.getAttrib(h,"style"),codebase:g.codebase,width:g.width,height:g.height})}a(e,function(j,i){if(!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(i)){if(g.type=="application/x-mplayer2"&&i=="src"&&!e.url){i="url"}if(j){f.add(d,"span",{_mce_name:"param",name:i,_mce_value:j})}}});if(!b){f.add(d,"span",tinymce.extend({_mce_name:"embed",type:g.type,style:f.getAttrib(h,"style")},e))}return d},_spansToImgs:function(e){var d=this,f=d.editor.dom,b,c;a(f.select("span",e),function(g){if(f.getAttrib(g,"class")=="mceItemObject"){c=f.getAttrib(g,"classid").toLowerCase().replace(/\s+/g,"");switch(c){case"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000":f.replace(d._createImg("mceItemFlash",g),g);break;case"clsid:166b1bca-3f9c-11cf-8075-444553540000":f.replace(d._createImg("mceItemShockWave",g),g);break;case"clsid:6bf52a52-394a-11d3-b153-00c04f79faa6":case"clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95":case"clsid:05589fa1-c356-11ce-bf01-00aa0055595a":f.replace(d._createImg("mceItemWindowsMedia",g),g);break;case"clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b":f.replace(d._createImg("mceItemQuickTime",g),g);break;case"clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa":f.replace(d._createImg("mceItemRealMedia",g),g);break;default:f.replace(d._createImg("mceItemFlash",g),g)}return}if(f.getAttrib(g,"class")=="mceItemEmbed"){switch(f.getAttrib(g,"type")){case"application/x-shockwave-flash":f.replace(d._createImg("mceItemFlash",g),g);break;case"application/x-director":f.replace(d._createImg("mceItemShockWave",g),g);break;case"application/x-mplayer2":f.replace(d._createImg("mceItemWindowsMedia",g),g);break;case"video/quicktime":f.replace(d._createImg("mceItemQuickTime",g),g);break;case"audio/x-pn-realaudio-plugin":f.replace(d._createImg("mceItemRealMedia",g),g);break;default:f.replace(d._createImg("mceItemFlash",g),g)}}})},_createImg:function(c,h){var b,g=this.editor.dom,f={},e="",d;d=["id","name","width","height","bgcolor","align","flashvars","src","wmode","allowfullscreen","quality","data"];b=g.create("img",{src:this.url+"/img/trans.gif",width:g.getAttrib(h,"width")||100,height:g.getAttrib(h,"height")||100,style:g.getAttrib(h,"style"),"class":c});a(d,function(i){var j=g.getAttrib(h,i);if(j){f[i]=j}});a(g.select("span",h),function(i){if(g.hasClass(i,"mceItemParam")){f[g.getAttrib(i,"name")]=g.getAttrib(i,"_mce_value")}});if(f.movie){f.src=f.movie;delete f.movie}if(!f.src){f.src=f.data;delete f.data}h=g.select(".mceItemEmbed",h)[0];if(h){a(d,function(i){var j=g.getAttrib(h,i);if(j&&!f[i]){f[i]=j}})}delete f.width;delete f.height;b.title=this._serialize(f);return b},_parse:function(b){return tinymce.util.JSON.parse("{"+b+"}")},_serialize:function(b){return tinymce.util.JSON.serialize(b).replace(/[{}]/g,"")}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
+(function(){var d=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),h=tinymce.makeMap(d.join(",")),b=tinymce.html.Node,f,a,g=tinymce.util.JSON,e;f=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"]];function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(i){return i&&i.nodeName==="IMG"&&n.dom.hasClass(i,"mceItemMedia")}r.editor=n;r.url=j;a="";for(m=0;m<f.length;m++){k=f[m][0];q={name:k,clsids:tinymce.explode(f[m][1]||""),mimes:tinymce.explode(f[m][2]||""),codebase:f[m][3]};for(p=0;p<q.clsids.length;p++){l["clsid:"+q.clsids[p]]=q}for(p=0;p<q.mimes.length;p++){l[q.mimes[p]]=q}l["mceItem"+k]=q;l[k.toLowerCase()]=q;a+=(a?"|":"")+k}tinymce.each(n.getParam("media_types","video=mp4,m4v,ogv,webm;silverlight=xap;flash=swf,flv;shockwave=dcr;quicktime=mov,qt,mpg,mp3,mpeg;shockwave=dcr;windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;realmedia=rm,ra,ram;java=jar").split(";"),function(v){var s,u,t;v=v.split(/=/);u=tinymce.explode(v[1].toLowerCase());for(s=0;s<u.length;s++){t=l[v[0].toLowerCase()];if(t){l[u[s]]=t}}});a=new RegExp("write("+a+")\\(([^)]+)\\)");r.lookup=l;n.onPreInit.add(function(){n.schema.addValidElements("object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]");n.parser.addNodeFilter("object,embed,video,audio,script,iframe",function(s){var t=s.length;while(t--){r.objectToImg(s[t])}});n.serializer.addNodeFilter("img",function(s,u,t){var v=s.length,w;while(v--){w=s[v];if((w.attr("class")||"").indexOf("mceItemMedia")!==-1){r.imgToObject(w,t)}}})});n.onInit.add(function(){if(n.theme&&n.theme.onResolveName){n.theme.onResolveName.add(function(i,s){if(s.name==="img"&&n.dom.hasClass(s.node,"mceItemMedia")){s.name="media"}})}if(n&&n.plugins.contextmenu){n.plugins.contextmenu.onContextMenu.add(function(s,t,i){if(i.nodeName==="IMG"&&i.className.indexOf("mceItemMedia")!==-1){t.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});n.addCommand("mceMedia",function(){var s,i;i=n.selection.getNode();if(o(i)){s=g.parse(n.dom.getAttrib(i,"data-mce-json"));tinymce.each(d,function(t){var u=n.dom.getAttrib(i,t);if(u){s[t]=u}});s.type=r.getType(i.className).name.toLowerCase()}if(!s){s={type:"flash",video:{sources:[]},params:{}}}n.windowManager.open({file:j+"/media.htm",width:430+parseInt(n.getLang("media.delta_width",0)),height:500+parseInt(n.getLang("media.delta_height",0)),inline:1},{plugin_url:j,data:s})});n.addButton("media",{title:"media.desc",cmd:"mceMedia"});n.onNodeChange.add(function(s,i,t){i.setActive("media",o(t))})},convertUrl:function(k,n){var j=this,m=j.editor,l=m.settings,o=l.url_converter,i=l.url_converter_scope||j;if(!k){return k}if(n){return m.documentBaseURI.toAbsolute(k)}return o.call(i,k,"src","object")},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}},dataToImg:function(m,k){var r=this,o=r.editor,p=o.documentBaseURI,j,q,n,l;m.params.src=r.convertUrl(m.params.src,k);q=m.video.attrs;if(q){q.src=r.convertUrl(q.src,k)}if(q){q.poster=r.convertUrl(q.poster,k)}j=c(m.video.sources);if(j){for(l=0;l<j.length;l++){j[l].src=r.convertUrl(j[l].src,k)}}n=r.editor.dom.create("img",{id:m.id,style:m.style,align:m.align,src:r.editor.theme.url+"/img/trans.gif","class":"mceItemMedia mceItem"+r.getType(m.type).name,"data-mce-json":g.serialize(m,"'")});n.width=m.width||"320";n.height=m.height||"240";return n},dataToHtml:function(i,j){return this.editor.serializer.serialize(this.dataToImg(i,j),{force_absolute:j})},htmlToData:function(k){var j,i,l;l={type:"flash",video:{sources:[]},params:{}};j=this.editor.parser.parse(k);i=j.getAll("img")[0];if(i){l=g.parse(i.attr("data-mce-json"));l.type=this.getType(i.attr("class")).name.toLowerCase();tinymce.each(d,function(m){var n=i.attr(m);if(n){l[m]=n}})}return l},getType:function(m){var k,j,l;j=tinymce.explode(m," ");for(k=0;k<j.length;k++){l=this.lookup[j[k]];if(l){return l}}},imgToObject:function(x,n){var t=this,o=t.editor,A,E,j,s,F,w,D,u,k,C,r,p,y,B,m,v,l,z;function q(i,G){var K,J,L,I,H;H=o.getParam("flash_video_player_url",t.convertUrl(t.url+"/moxieplayer.swf"));if(H){K=o.documentBaseURI;D.params.src=H;if(o.getParam("flash_video_player_absvideourl",true)){i=K.toAbsolute(i||"",true);G=K.toAbsolute(G||"",true)}L="";J=o.getParam("flash_video_player_flashvars",{url:"$url",poster:"$poster"});tinymce.each(J,function(N,M){N=N.replace(/\$url/,i||"");N=N.replace(/\$poster/,G||"");if(N.length>0){L+=(L?"&":"")+M+"="+escape(N)}});if(L.length){D.params.flashvars=L}I=o.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(I,function(N,M){D.params[M]=""+N})}}D=g.parse(x.attr("data-mce-json"));p=this.getType(x.attr("class"));z=x.attr("data-mce-style");if(!z){z=x.attr("style");if(z){z=o.dom.serializeStyle(o.dom.parseStyle(z,"img"))}}if(p.name==="Iframe"){v=new b("iframe",1);tinymce.each(d,function(i){var G=x.attr(i);if(i=="class"&&G){G=G.replace(/mceItem.+ ?/g,"")}if(G&&G.length>0){v.attr(i,G)}});for(F in D.params){v.attr(F,D.params[F])}v.attr({style:z,src:D.params.src});x.replace(v);return}if(this.editor.settings.media_use_script){v=new b("script",1).attr("type","text/javascript");w=new b("#text",3);w.value="write"+p.name+"("+g.serialize(tinymce.extend(D.params,{width:x.attr("width"),height:x.attr("height")}))+");";v.append(w);x.replace(v);return}if(p.name==="Video"&&D.video.sources[0]){A=new b("video",1).attr(tinymce.extend({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z},D.video.attrs));if(D.video.attrs){l=D.video.attrs.poster}k=D.video.sources=c(D.video.sources);for(y=0;y<k.length;y++){if(/\.mp4$/.test(k[y].src)){m=k[y].src}}if(!k[0].type){A.attr("src",k[0].src);k.splice(0,1)}for(y=0;y<k.length;y++){u=new b("source",1).attr(k[y]);u.shortEnded=true;A.append(u)}if(m){q(m,l);p=t.getType("flash")}else{D.params.src=""}}if(D.params.src){if(/\.flv$/i.test(D.params.src)){q(D.params.src,"")}if(n&&n.force_absolute){D.params.src=o.documentBaseURI.toAbsolute(D.params.src)}E=new b("object",1).attr({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z});tinymce.each(d,function(i){if(D[i]&&i!="type"){E.attr(i,D[i])}});for(F in D.params){r=new b("param",1);r.shortEnded=true;w=D.params[F];if(F==="src"&&p.name==="WindowsMedia"){F="url"}r.attr({name:F,value:w});E.append(r)}if(this.editor.getParam("media_strict",true)){E.attr({data:D.params.src,type:p.mimes[0]})}else{E.attr({classid:"clsid:"+p.clsids[0],codebase:p.codebase});j=new b("embed",1);j.shortEnded=true;j.attr({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z,type:p.mimes[0]});for(F in D.params){j.attr(F,D.params[F])}tinymce.each(d,function(i){if(D[i]&&i!="type"){j.attr(i,D[i])}});E.append(j)}if(D.object_html){w=new b("#text",3);w.raw=true;w.value=D.object_html;E.append(w)}if(A){A.append(E)}}if(A){if(D.video_html){w=new b("#text",3);w.raw=true;w.value=D.video_html;A.append(w)}}if(A||E){x.replace(A||E)}else{x.remove()}},objectToImg:function(y){var F,j,A,p,G,H,u,w,t,B,z,q,o,D,x,k,E,n,C=this.lookup,l,v,s=this.editor.settings.url_converter,m=this.editor.settings.url_converter_scope;function r(i){return new tinymce.html.Serializer({inner:true,validate:false}).serialize(i)}if(!y.parent){return}if(y.name==="script"){if(y.firstChild){l=a.exec(y.firstChild.value)}if(!l){return}n=l[1];E={video:{},params:g.parse(l[2])};w=E.params.width;t=E.params.height}E=E||{video:{},params:{}};G=new b("img",1);G.attr({src:this.editor.theme.url+"/img/trans.gif"});H=y.name;if(H==="video"){A=y;F=y.getAll("object")[0];j=y.getAll("embed")[0];w=A.attr("width");t=A.attr("height");u=A.attr("id");E.video={attrs:{},sources:[]};v=E.video.attrs;for(H in A.attributes.map){v[H]=A.attributes.map[H]}x=y.attr("src");if(x){E.video.sources.push({src:s.call(m,x,"src","video")})}k=A.getAll("source");for(z=0;z<k.length;z++){x=k[z].remove();E.video.sources.push({src:s.call(m,x.attr("src"),"src","source"),type:x.attr("type"),media:x.attr("media")})}if(v.poster){v.poster=s.call(m,v.poster,"poster","video")}}if(y.name==="object"){F=y;j=y.getAll("embed")[0]}if(y.name==="embed"){j=y}if(y.name==="iframe"){p=y;n="Iframe"}if(F){w=w||F.attr("width");t=t||F.attr("height");B=B||F.attr("style");u=u||F.attr("id");D=F.getAll("param");for(z=0;z<D.length;z++){o=D[z];H=o.remove().attr("name");if(!h[H]){E.params[H]=o.attr("value")}}E.params.src=E.params.src||F.attr("data")}if(j){w=w||j.attr("width");t=t||j.attr("height");B=B||j.attr("style");u=u||j.attr("id");for(H in j.attributes.map){if(!h[H]&&!E.params[H]){E.params[H]=j.attributes.map[H]}}}if(p){w=p.attr("width");t=p.attr("height");B=B||p.attr("style");u=p.attr("id");tinymce.each(d,function(i){G.attr(i,p.attr(i))});for(H in p.attributes.map){if(!h[H]&&!E.params[H]){E.params[H]=p.attributes.map[H]}}}if(E.params.movie){E.params.src=E.params.src||E.params.movie;delete E.params.movie}if(E.params.src){E.params.src=s.call(m,E.params.src,"src","object")}if(A){n=C.video.name}if(F&&!n){n=(C[(F.attr("clsid")||"").toLowerCase()]||C[(F.attr("type")||"").toLowerCase()]||{}).name}if(j&&!n){n=(C[(j.attr("type")||"").toLowerCase()]||{}).name}y.replace(G);if(j){j.remove()}if(F){q=r(F.remove());if(q){E.object_html=q}}if(A){q=r(A.remove());if(q){E.video_html=q}}G.attr({id:u,"class":"mceItemMedia mceItem"+(n||"Flash"),style:B,width:w||"320",height:t||"240","data-mce-json":g.serialize(E,"'")})}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
index fc84e5b6c..e640bd366 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
@@ -9,187 +9,205 @@
  */

 

 (function() {

-	var each = tinymce.each;

+	var rootAttributes = tinymce.explode('id,name,width,height,style,align,class,hspace,vspace,bgcolor,type'), excludedAttrs = tinymce.makeMap(rootAttributes.join(',')), Node = tinymce.html.Node,

+		mediaTypes, scriptRegExp, JSON = tinymce.util.JSON, mimeTypes;

+

+	// Media types supported by this plugin

+	mediaTypes = [

+		// Type, clsid:s, mime types, codebase

+		["Flash", "d27cdb6e-ae6d-11cf-96b8-444553540000", "application/x-shockwave-flash", "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],

+		["ShockWave", "166b1bca-3f9c-11cf-8075-444553540000", "application/x-director", "http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],

+		["WindowsMedia", "6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a", "application/x-mplayer2", "http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],

+		["QuickTime", "02bf25d5-8c17-4b23-bc80-d3488abddc6b", "video/quicktime", "http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],

+		["RealMedia", "cfcdaa03-8be4-11cf-b84b-0020afbbccfa", "audio/x-pn-realaudio-plugin", "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],

+		["Java", "8ad9c840-044e-11d1-b3e9-00805f499d93", "application/x-java-applet", "http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],

+		["Silverlight", "dfeaf541-f3e1-4c24-acac-99c30715084a", "application/x-silverlight-2"],

+		["Iframe"],

+		["Video"]

+	];

+

+	function toArray(obj) {

+		var undef, out, i;

+

+		if (obj && !obj.splice) {

+			out = [];

+

+			for (i = 0; true; i++) {

+				if (obj[i])

+					out[i] = obj[i];

+				else

+					break;

+			}

+

+			return out;

+		}

+

+		return obj;

+	};

 

 	tinymce.create('tinymce.plugins.MediaPlugin', {

 		init : function(ed, url) {

-			var t = this;

-			

-			t.editor = ed;

-			t.url = url;

+			var self = this, lookup = {}, i, y, item, name;

 

-			function isMediaElm(n) {

-				return /^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);

+			function isMediaImg(node) {

+				return node && node.nodeName === 'IMG' && ed.dom.hasClass(node, 'mceItemMedia');

 			};

 

-			ed.onPreInit.add(function() {

-				// Force in _value parameter this extra parameter is required for older Opera versions

-				ed.serializer.addRules('param[name|value|_mce_value]');

-			});

+			self.editor = ed;

+			self.url = url;

 

-			// 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

-				});

-			});

+			// Parse media types into a lookup table

+			scriptRegExp = '';

+			for (i = 0; i < mediaTypes.length; i++) {

+				name = mediaTypes[i][0];

 

-			// Register buttons

-			ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});

+				item = {

+					name : name,

+					clsids : tinymce.explode(mediaTypes[i][1] || ''),

+					mimes : tinymce.explode(mediaTypes[i][2] || ''),

+					codebase : mediaTypes[i][3]

+				};

+

+				for (y = 0; y < item.clsids.length; y++)

+					lookup['clsid:' + item.clsids[y]] = item;

+

+				for (y = 0; y < item.mimes.length; y++)

+					lookup[item.mimes[y]] = item;

+

+				lookup['mceItem' + name] = item;

+				lookup[name.toLowerCase()] = item;

 

-			ed.onNodeChange.add(function(ed, cm, n) {

-				cm.setActive('media', n.nodeName == 'IMG' && isMediaElm(n));

+				scriptRegExp += (scriptRegExp ? '|' : '') + name;

+			}

+

+			// Handle the media_types setting

+			tinymce.each(ed.getParam("media_types",

+				"video=mp4,m4v,ogv,webm;" +

+				"silverlight=xap;" +

+				"flash=swf,flv;" +

+				"shockwave=dcr;" +

+				"quicktime=mov,qt,mpg,mp3,mpeg;" +

+				"shockwave=dcr;" +

+				"windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;" +

+				"realmedia=rm,ra,ram;" +

+				"java=jar"

+			).split(';'), function(item) {

+				var i, extensions, type;

+

+				item = item.split(/=/);

+				extensions = tinymce.explode(item[1].toLowerCase());

+				for (i = 0; i < extensions.length; i++) {

+					type = lookup[item[0].toLowerCase()];

+

+					if (type)

+						lookup[extensions[i]] = type;

+				}

 			});

 

-			ed.onInit.add(function() {

-				var lo = {

-					mceItemFlash : 'flash',

-					mceItemShockWave : 'shockwave',

-					mceItemWindowsMedia : 'windowsmedia',

-					mceItemQuickTime : 'quicktime',

-					mceItemRealMedia : 'realmedia'

-				};

+			scriptRegExp = new RegExp('write(' + scriptRegExp + ')\\(([^)]+)\\)');

+			self.lookup = lookup;

 

-				ed.selection.onSetContent.add(function() {

-					t._spansToImgs(ed.getBody());

+			ed.onPreInit.add(function() {

+				// Allow video elements

+				ed.schema.addValidElements('object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]');

+

+				// Convert video elements to image placeholder

+				ed.parser.addNodeFilter('object,embed,video,audio,script,iframe', function(nodes) {

+					var i = nodes.length;

+

+					while (i--)

+						self.objectToImg(nodes[i]);

 				});

 

-				ed.selection.onBeforeSetContent.add(t._objectsToSpans, t);

+				// Convert image placeholders to video elements

+				ed.serializer.addNodeFilter('img', function(nodes, name, args) {

+					var i = nodes.length, node;

 

-				if (ed.settings.content_css !== false)

-					ed.dom.loadCSS(url + "/css/content.css");

+					while (i--) {

+						node = nodes[i];

+						if ((node.attr('class') || '').indexOf('mceItemMedia') !== -1)

+							self.imgToObject(node, args);

+					}

+				});

+			});

 

+			ed.onInit.add(function() {

+				// Display "media" instead of "img" in element path

 				if (ed.theme && 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;

-								}

-							});

-						}

+					ed.theme.onResolveName.add(function(theme, path_object) {

+						if (path_object.name === 'img' && ed.dom.hasClass(path_object.node, 'mceItemMedia'))

+							path_object.name = 'media';

 					});

 				}

 

+				// Add contect menu if it's loaded

 				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.plugins.contextmenu.onContextMenu.add(function(plugin, menu, element) {

+						if (element.nodeName === 'IMG' && element.className.indexOf('mceItemMedia') !== -1)

+							menu.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});

 					});

 				}

 			});

 

-			ed.onBeforeSetContent.add(t._objectsToSpans, t);

-

-			ed.onSetContent.add(function() {

-				t._spansToImgs(ed.getBody());

-			});

-

-			ed.onPreProcess.add(function(ed, o) {

-				var dom = ed.dom;

+			// Register commands

+			ed.addCommand('mceMedia', function() {

+				var data, img;

 

-				if (o.set) {

-					t._spansToImgs(o.node);

+				img = ed.selection.getNode();

+				if (isMediaImg(img)) {

+					data = JSON.parse(ed.dom.getAttrib(img, 'data-mce-json'));

 

-					each(dom.select('IMG', o.node), function(n) {

-						var p;

+					// Add some extra properties to the data object

+					tinymce.each(rootAttributes, function(name) {

+						var value = ed.dom.getAttrib(img, name);

 

-						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 (value)

+							data[name] = value;

 					});

+

+					data.type = self.getType(img.className).name.toLowerCase();

 				}

 

-				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);

-						}

-					});

+				if (!data) {

+					data = {

+						type : 'flash',

+						video: {sources:[]},

+						params: {}

+					};

 				}

-			});

 

-			ed.onPostProcess.add(function(ed, o) {

-				o.content = o.content.replace(/_mce_value=/g, 'value=');

+				ed.windowManager.open({

+					file : url + '/media.htm',

+					width : 430 + parseInt(ed.getLang('media.delta_width', 0)),

+					height : 500 + parseInt(ed.getLang('media.delta_height', 0)),

+					inline : 1

+				}, {

+					plugin_url : url,

+					data : data

+				});

 			});

 

-			function getAttr(s, n) {

-				n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);

+			// Register buttons

+			ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});

 

-				return n ? ed.dom.decode(n[1]) : '';

-			};

+			// Update media selection status

+			ed.onNodeChange.add(function(ed, cm, node) {

+				cm.setActive('media', isMediaImg(node));

+			});

+		},

 

-			ed.onPostProcess.add(function(ed, o) {

-				if (ed.getParam('media_use_script')) {

-					o.content = o.content.replace(/<img[^>]+>/g, function(im) {

-						var cl = getAttr(im, 'class');

+		convertUrl : function(url, force_absolute) {

+			var self = this, editor = self.editor, settings = editor.settings,

+				urlConverter = settings.url_converter,

+				urlConverterScope = settings.url_converter_scope || self;

 

-						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>';

-						}

+			if (!url)

+				return url;

 

-						return im;

-					});

-				}

-			});

+			if (force_absolute)

+				return editor.documentBaseURI.toAbsolute(url);

+

+			return urlConverter.call(urlConverterScope, url, 'src', 'object');

 		},

 

 		getInfo : function() {

@@ -202,210 +220,548 @@
 			};

 		},

 

-		// Private methods

-		_objectsToSpans : function(ed, o) {

-			var t = this, h = o.content;

+		/**

+		 * Converts the JSON data object to an img node.

+		 */

+		dataToImg : function(data, force_absolute) {

+			var self = this, editor = self.editor, baseUri = editor.documentBaseURI, sources, attrs, img, i;

+

+			data.params.src = self.convertUrl(data.params.src, force_absolute);

 

-			h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {

-				var o = t._parse(c);

+			attrs = data.video.attrs;

+			if (attrs)

+				attrs.src = self.convertUrl(attrs.src, force_absolute);

 

-				return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + t.url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'

+			if (attrs)

+				attrs.poster = self.convertUrl(attrs.poster, force_absolute);

+

+			sources = toArray(data.video.sources);

+			if (sources) {

+				for (i = 0; i < sources.length; i++)

+					sources[i].src = self.convertUrl(sources[i].src, force_absolute);

+			}

+

+			img = self.editor.dom.create('img', {

+				id : data.id,

+				style : data.style,

+				align : data.align,

+				src : self.editor.theme.url + '/img/trans.gif',

+				'class' : 'mceItemMedia mceItem' + self.getType(data.type).name,

+				'data-mce-json' : JSON.serialize(data, "'")

 			});

 

-			h = h.replace(/<object([^>]*)>/gi, '<span class="mceItemObject" $1>');

-			h = h.replace(/<embed([^>]*)\/?>/gi, '<span class="mceItemEmbed" $1></span>');

-			h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');

-			h = h.replace(/<\/(object)([^>]*)>/gi, '</span>');

-			h = h.replace(/<\/embed>/gi, '');

-			h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/gi, '_mce_value=') + ' class="mceItemParam"></span>'});

-			h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');

+			img.width = data.width || "320";

+			img.height = data.height || "240";

 

-			o.content = h;

+			return img;

 		},

 

-		_buildObj : function(o, n) {

-			var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title), stc;

-			

-			stc = ed.getParam('media_strict', true) && o.type == 'application/x-shockwave-flash';

-

-			p.width = o.width = dom.getAttrib(n, 'width') || 100;

-			p.height = o.height = dom.getAttrib(n, 'height') || 100;

-

-			if (p.src)

-				p.src = ed.convertURL(p.src, 'src', n);

-

-			if (stc) {

-				ob = dom.create('span', {

-					id : p.id,

-					_mce_name : 'object',

-					type : 'application/x-shockwave-flash',

-					data : p.src,

-					style : dom.getAttrib(n, 'style'),

-					width : o.width,

-					height : o.height

-				});

-			} else {

-				ob = dom.create('span', {

-					id : p.id,

-					_mce_name : 'object',

-					classid : "clsid:" + o.classid,

-					style : dom.getAttrib(n, 'style'),

-					codebase : o.codebase,

-					width : o.width,

-					height : o.height

+		/**

+		 * Converts the JSON data object to a HTML string.

+		 */

+		dataToHtml : function(data, force_absolute) {

+			return this.editor.serializer.serialize(this.dataToImg(data, force_absolute), {force_absolute : force_absolute});

+		},

+

+		/**

+		 * Converts the JSON data object to a HTML string.

+		 */

+		htmlToData : function(html) {

+			var fragment, img, data;

+

+			data = {

+				type : 'flash',

+				video: {sources:[]},

+				params: {}

+			};

+

+			fragment = this.editor.parser.parse(html);

+			img = fragment.getAll('img')[0];

+

+			if (img) {

+				data = JSON.parse(img.attr('data-mce-json'));

+				data.type = this.getType(img.attr('class')).name.toLowerCase();

+

+				// Add some extra properties to the data object

+				tinymce.each(rootAttributes, function(name) {

+					var value = img.attr(name);

+

+					if (value)

+						data[name] = value;

 				});

 			}

 

-			each (p, function(v, k) {

-				if (!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(k)) {

-					// Use url instead of src in IE for Windows media

-					if (o.type == 'application/x-mplayer2' && k == 'src' && !p.url)

-						k = 'url';

+			return data;

+		},

+

+		/**

+		 * Get type item by extension, class, clsid or mime type.

+		 *

+		 * @method getType

+		 * @param {String} value Value to get type item by.

+		 * @return {Object} Type item object or undefined.

+		 */

+		getType : function(value) {

+			var i, values, typeItem;

+

+			// Find type by checking the classes

+			values = tinymce.explode(value, ' ');

+			for (i = 0; i < values.length; i++) {

+				typeItem = this.lookup[values[i]];

+

+				if (typeItem)

+					return typeItem;

+			}

+		},

+

+		/**

+		 * Converts a tinymce.html.Node image element to video/object/embed.

+		 */

+		imgToObject : function(node, args) {

+			var self = this, editor = self.editor, video, object, embed, iframe, name, value, data,

+				source, sources, params, param, typeItem, i, item, mp4Source, replacement,

+				posterSrc, style;

+

+			// Adds the flash player

+			function addPlayer(video_src, poster_src) {

+				var baseUri, flashVars, flashVarsOutput, params, flashPlayer;

+

+				flashPlayer = editor.getParam('flash_video_player_url', self.convertUrl(self.url + '/moxieplayer.swf'));

+				if (flashPlayer) {

+					baseUri = editor.documentBaseURI;

+					data.params.src = flashPlayer;

+

+					// Convert the movie url to absolute urls

+					if (editor.getParam('flash_video_player_absvideourl', true)) {

+						video_src = baseUri.toAbsolute(video_src || '', true);

+						poster_src = baseUri.toAbsolute(poster_src || '', true);

+					}

+

+					// Generate flash vars

+					flashVarsOutput = '';

+					flashVars = editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'});

+					tinymce.each(flashVars, function(value, name) {

+						// Replace $url and $poster variables in flashvars value

+						value = value.replace(/\$url/, video_src || '');

+						value = value.replace(/\$poster/, poster_src || '');

+

+						if (value.length > 0)

+							flashVarsOutput += (flashVarsOutput ? '&' : '') + name + '=' + escape(value);

+					});

+

+					if (flashVarsOutput.length)

+						data.params.flashvars = flashVarsOutput;

 

-					if (v)

-						dom.add(ob, 'span', {_mce_name : 'param', name : k, '_mce_value' : v});

+					params = editor.getParam('flash_video_player_params', {

+						allowfullscreen: true,

+						allowscriptaccess: true

+					});

+

+					tinymce.each(params, function(value, name) {

+						data.params[name] = "" + value;

+					});

 				}

-			});

+			};

 

-			if (!stc)

-				dom.add(ob, 'span', tinymce.extend({_mce_name : 'embed', type : o.type, style : dom.getAttrib(n, 'style')}, p));

+			data = JSON.parse(node.attr('data-mce-json'));

+			typeItem = this.getType(node.attr('class'));

 

-			return ob;

-		},

+			style = node.attr('data-mce-style')

+			if (!style) {

+				style = node.attr('style');

 

-		_spansToImgs : function(p) {

-			var t = this, dom = t.editor.dom, im, ci;

+				if (style)

+					style = editor.dom.serializeStyle(editor.dom.parseStyle(style, 'img'));

+			}

 

-			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, '');

+			// Handle iframe

+			if (typeItem.name === 'Iframe') {

+				replacement = new Node('iframe', 1);

 

-					switch (ci) {

-						case 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':

-							dom.replace(t._createImg('mceItemFlash', n), n);

-							break;

+				tinymce.each(rootAttributes, function(name) {

+					var value = node.attr(name);

 

-						case 'clsid:166b1bca-3f9c-11cf-8075-444553540000':

-							dom.replace(t._createImg('mceItemShockWave', n), n);

-							break;

+					if (name == 'class' && value)

+						value = value.replace(/mceItem.+ ?/g, '');

 

-						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;

+					if (value && value.length > 0)

+						replacement.attr(name, value);

+				});

 

-						case 'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':

-							dom.replace(t._createImg('mceItemQuickTime', n), n);

-							break;

+				for (name in data.params)

+					replacement.attr(name, data.params[name]);

 

-						case 'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':

-							dom.replace(t._createImg('mceItemRealMedia', n), n);

-							break;

+				replacement.attr({

+					style: style,

+					src: data.params.src

+				});

 

-						default:

-							dom.replace(t._createImg('mceItemFlash', n), n);

-					}

-					

-					return;

+				node.replace(replacement);

+

+				return;

+			}

+

+			// Handle scripts

+			if (this.editor.settings.media_use_script) {

+				replacement = new Node('script', 1).attr('type', 'text/javascript');

+

+				value = new Node('#text', 3);

+				value.value = 'write' + typeItem.name + '(' + JSON.serialize(tinymce.extend(data.params, {

+					width: node.attr('width'),

+					height: node.attr('height')

+				})) + ');';

+

+				replacement.append(value);

+				node.replace(replacement);

+

+				return;

+			}

+

+			// Add HTML5 video element

+			if (typeItem.name === 'Video' && data.video.sources[0]) {

+				// Create new object element

+				video = new Node('video', 1).attr(tinymce.extend({

+					id : node.attr('id'),

+					width: node.attr('width'),

+					height: node.attr('height'),

+					style : style

+				}, data.video.attrs));

+

+				// Get poster source and use that for flash fallback

+				if (data.video.attrs)

+					posterSrc = data.video.attrs.poster;

+

+				sources = data.video.sources = toArray(data.video.sources);

+				for (i = 0; i < sources.length; i++) {

+					if (/\.mp4$/.test(sources[i].src))

+						mp4Source = sources[i].src;

 				}

 

-				// 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;

+				if (!sources[0].type) {

+					video.attr('src', sources[0].src);

+					sources.splice(0, 1);

+				}

 

-						case 'application/x-director':

-							dom.replace(t._createImg('mceItemShockWave', n), n);

-							break;

+				for (i = 0; i < sources.length; i++) {

+					source = new Node('source', 1).attr(sources[i]);

+					source.shortEnded = true;

+					video.append(source);

+				}

 

-						case 'application/x-mplayer2':

-							dom.replace(t._createImg('mceItemWindowsMedia', n), n);

-							break;

+				// Create flash fallback for video if we have a mp4 source

+				if (mp4Source) {

+					addPlayer(mp4Source, posterSrc);

+					typeItem = self.getType('flash');

+				} else

+					data.params.src = '';

+			}

 

-						case 'video/quicktime':

-							dom.replace(t._createImg('mceItemQuickTime', n), n);

-							break;

+			// Do we have a params src then we can generate object

+			if (data.params.src) {

+				// Is flv movie add player for it

+				if (/\.flv$/i.test(data.params.src))

+					addPlayer(data.params.src, '');

+

+				if (args && args.force_absolute)

+					data.params.src = editor.documentBaseURI.toAbsolute(data.params.src);

+

+				// Create new object element

+				object = new Node('object', 1).attr({

+					id : node.attr('id'),

+					width: node.attr('width'),

+					height: node.attr('height'),

+					style : style

+				});

 

-						case 'audio/x-pn-realaudio-plugin':

-							dom.replace(t._createImg('mceItemRealMedia', n), n);

-							break;

+				tinymce.each(rootAttributes, function(name) {

+					if (data[name] && name != 'type')

+						object.attr(name, data[name]);

+				});

 

-						default:

-							dom.replace(t._createImg('mceItemFlash', n), n);

-					}

-				}			

-			});

+				// Add params

+				for (name in data.params) {

+					param = new Node('param', 1);

+					param.shortEnded = true;

+					value = data.params[name];

+

+					// Windows media needs to use url instead of src for the media URL

+					if (name === 'src' && typeItem.name === 'WindowsMedia')

+						name = 'url';

+

+					param.attr({name: name, value: value});

+					object.append(param);

+				}

+

+				// Setup add type and classid if strict is disabled

+				if (this.editor.getParam('media_strict', true)) {

+					object.attr({

+						data: data.params.src,

+						type: typeItem.mimes[0]

+					});

+				} else {

+					object.attr({

+						classid: "clsid:" + typeItem.clsids[0],

+						codebase: typeItem.codebase

+					});

+

+					embed = new Node('embed', 1);

+					embed.shortEnded = true;

+					embed.attr({

+						id: node.attr('id'),

+						width: node.attr('width'),

+						height: node.attr('height'),

+						style : style,

+						type: typeItem.mimes[0]

+					});

+

+					for (name in data.params)

+						embed.attr(name, data.params[name]);

+

+					tinymce.each(rootAttributes, function(name) {

+						if (data[name] && name != 'type')

+							embed.attr(name, data[name]);

+					});

+

+					object.append(embed);

+				}

+

+				// Insert raw HTML

+				if (data.object_html) {

+					value = new Node('#text', 3);

+					value.raw = true;

+					value.value = data.object_html;

+					object.append(value);

+				}

+

+				// Append object to video element if it exists

+				if (video)

+					video.append(object);

+			}

+

+			if (video) {

+				// Insert raw HTML

+				if (data.video_html) {

+					value = new Node('#text', 3);

+					value.raw = true;

+					value.value = data.video_html;

+					video.append(value);

+				}

+			}

+

+			if (video || object)

+				node.replace(video || object);

+			else

+				node.remove();

 		},

 

-		_createImg : function(cl, n) {

-			var im, dom = this.editor.dom, pa = {}, ti = '', args;

+		/**

+		 * Converts a tinymce.html.Node video/object/embed to an img element.

+		 *

+		 * The video/object/embed will be converted into an image placeholder with a JSON data attribute like this:

+		 * <img class="mceItemMedia mceItemFlash" width="100" height="100" data-mce-json="{..}" />

+		 *

+		 * The JSON structure will be like this:

+		 * {'params':{'flashvars':'something','quality':'high','src':'someurl'}, 'video':{'sources':[{src: 'someurl', type: 'video/mp4'}]}}

+		 */

+		objectToImg : function(node) {

+			var object, embed, video, iframe, img, name, id, width, height, style, i, html,

+				param, params, source, sources, data, type, lookup = this.lookup,

+				matches, attrs, urlConverter = this.editor.settings.url_converter,

+				urlConverterScope = this.editor.settings.url_converter_scope;

+

+			function getInnerHTML(node) {

+				return new tinymce.html.Serializer({

+					inner: true,

+					validate: false

+				}).serialize(node);

+			};

 

-			args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality', 'data'];	

+			// If node isn't in document

+			if (!node.parent)

+				return;

 

-			// Create image

-			im = dom.create('img', {

-				src : this.url + '/img/trans.gif',

-				width : dom.getAttrib(n, 'width') || 100,

-				height : dom.getAttrib(n, 'height') || 100,

-				style : dom.getAttrib(n, 'style'),

-				'class' : cl

-			});

+			// Handle media scripts

+			if (node.name === 'script') {

+				if (node.firstChild)

+					matches = scriptRegExp.exec(node.firstChild.value);

 

-			// Setup base parameters

-			each(args, function(na) {

-				var v = dom.getAttrib(n, na);

+				if (!matches)

+					return;

 

-				if (v)

-					pa[na] = v;

-			});

+				type = matches[1];

+				data = {video : {}, params : JSON.parse(matches[2])};

+				width = data.params.width;

+				height = data.params.height;

+			}

+

+			// Setup data objects

+			data = data || {

+				video : {},

+				params : {}

+			};

 

-			// Add optional parameters

-			each(dom.select('span', n), function(n) {

-				if (dom.hasClass(n, 'mceItemParam'))

-					pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_mce_value');

+			// Setup new image object

+			img = new Node('img', 1);

+			img.attr({

+				src : this.editor.theme.url + '/img/trans.gif'

 			});

 

-			// Use src not movie

-			if (pa.movie) {

-				pa.src = pa.movie;

-				delete pa.movie;

+			// Video element

+			name = node.name;

+			if (name === 'video') {

+				video = node;

+				object = node.getAll('object')[0];

+				embed = node.getAll('embed')[0];

+				width = video.attr('width');

+				height = video.attr('height');

+				id = video.attr('id');

+				data.video = {attrs : {}, sources : []};

+

+				// Get all video attributes

+				attrs = data.video.attrs;

+				for (name in video.attributes.map)

+					attrs[name] = video.attributes.map[name];

+

+				source = node.attr('src');

+				if (source)

+					data.video.sources.push({src : urlConverter.call(urlConverterScope, source, 'src', 'video')});

+

+				// Get all sources

+				sources = video.getAll("source");

+				for (i = 0; i < sources.length; i++) {

+					source = sources[i].remove();

+

+					data.video.sources.push({

+						src: urlConverter.call(urlConverterScope, source.attr('src'), 'src', 'source'),

+						type: source.attr('type'),

+						media: source.attr('media')

+					});

+				}

+

+				// Convert the poster URL

+				if (attrs.poster)

+					attrs.poster = urlConverter.call(urlConverterScope, attrs.poster, 'poster', 'video');

+			}

+

+			// Object element

+			if (node.name === 'object') {

+				object = node;

+				embed = node.getAll('embed')[0];

+			}

+

+			// Embed element

+			if (node.name === 'embed')

+				embed = node;

+

+			// Iframe element

+			if (node.name === 'iframe') {

+				iframe = node;

+				type = 'Iframe';

+			}

+

+			if (object) {

+				// Get width/height

+				width = width || object.attr('width');

+				height = height || object.attr('height');

+				style = style || object.attr('style');

+				id = id || object.attr('id');

+

+				// Get all object params

+				params = object.getAll("param");

+				for (i = 0; i < params.length; i++) {

+					param = params[i];

+					name = param.remove().attr('name');

+

+					if (!excludedAttrs[name])

+						data.params[name] = param.attr('value');

+				}

+

+				data.params.src = data.params.src || object.attr('data');

 			}

 

-			// No src try data

-			if (!pa.src) {

-				pa.src = pa.data;

-				delete pa.data;

+			if (embed) {

+				// Get width/height

+				width = width || embed.attr('width');

+				height = height || embed.attr('height');

+				style = style || embed.attr('style');

+				id = id || embed.attr('id');

+

+				// Get all embed attributes

+				for (name in embed.attributes.map) {

+					if (!excludedAttrs[name] && !data.params[name])

+						data.params[name] = embed.attributes.map[name];

+				}

 			}

 

-			// Merge with embed args

-			n = dom.select('.mceItemEmbed', n)[0];

-			if (n) {

-				each(args, function(na) {

-					var v = dom.getAttrib(n, na);

+			if (iframe) {

+				// Get width/height

+				width = iframe.attr('width');

+				height = iframe.attr('height');

+				style = style || iframe.attr('style');

+				id = iframe.attr('id');

 

-					if (v && !pa[na])

-						pa[na] = v;

+				tinymce.each(rootAttributes, function(name) {

+					img.attr(name, iframe.attr(name));

 				});

+

+				// Get all iframe attributes

+				for (name in iframe.attributes.map) {

+					if (!excludedAttrs[name] && !data.params[name])

+						data.params[name] = iframe.attributes.map[name];

+				}

 			}

 

-			delete pa.width;

-			delete pa.height;

+			// Use src not movie

+			if (data.params.movie) {

+				data.params.src = data.params.src || data.params.movie;

+				delete data.params.movie;

+			}

 

-			im.title = this._serialize(pa);

+			// Convert the URL to relative/absolute depending on configuration

+			if (data.params.src)

+				data.params.src = urlConverter.call(urlConverterScope, data.params.src, 'src', 'object');

 

-			return im;

-		},

+			if (video)

+				type = lookup.video.name;

 

-		_parse : function(s) {

-			return tinymce.util.JSON.parse('{' + s + '}');

-		},

+			if (object && !type)

+				type = (lookup[(object.attr('clsid') || '').toLowerCase()] || lookup[(object.attr('type') || '').toLowerCase()] || {}).name;

 

-		_serialize : function(o) {

-			return tinymce.util.JSON.serialize(o).replace(/[{}]/g, '');

+			if (embed && !type)

+				type = (lookup[(embed.attr('type') || '').toLowerCase()] || {}).name;

+

+			// Replace the video/object/embed element with a placeholder image containing the data

+			node.replace(img);

+

+			// Remove embed

+			if (embed)

+				embed.remove();

+

+			// Serialize the inner HTML of the object element

+			if (object) {

+				html = getInnerHTML(object.remove());

+

+				if (html)

+					data.object_html = html;

+			}

+

+			// Serialize the inner HTML of the video element

+			if (video) {

+				html = getInnerHTML(video.remove());

+

+				if (html)

+					data.video_html = html;

+			}

+

+			// Set width/height of placeholder

+			img.attr({

+				id : id,

+				'class' : 'mceItemMedia mceItem' + (type || 'Flash'),

+				style : style,

+				width : width || "320",

+				height : height || "240",

+				"data-mce-json" : JSON.serialize(data, "'")

+			});

 		}

 	});

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
deleted file mode 100644
index 042c2ab96..000000000
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
+++ /dev/null
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
index 86cfa9856..30ad65617 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
@@ -1,630 +1,354 @@
-tinyMCEPopup.requireLangPack();

+(function() {

+	var url;

 

-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>');

 

-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); 

+	function get(id) {

+		return document.getElementById(id);

 	}

 

-	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');

+	function getVal(id) {

+		var elm = get(id);

 

-	TinyMCE_EditableSelects.init();

-	generatePreview();

-}

+		if (elm.nodeName == "SELECT")

+			return elm.options[elm.selectedIndex].value;

 

-function insertMedia() {

-	var fe, f = document.forms[0], h;

+		if (elm.type == "checkbox")

+			return elm.checked;

 

-	tinyMCEPopup.restoreSelection();

-

-	if (!AutoValidator.validate(f)) {

-		tinyMCEPopup.alert(ed.getLang('invalid_data'));

-		return false;

+		return elm.value;

 	}

 

-	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.value)

-			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;

+	function setVal(id, value) {

+		if (typeof(value) != 'undefined') {

+			var elm = get(id);

+

+			if (elm.nodeName == "SELECT")

+				selectByValue(document.forms[0], id, value);

+			else if (elm.type == "checkbox") {

+				if (typeof(value) == 'string')

+					elm.checked = value.toLowerCase() === 'true' ? true : false;

+				else

+					elm.checked = !!value;

+			} else

+				elm.value = value;

 		}

-

-		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';

-

-	if (t)

-		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] != 'false';

-}

-

-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'), "\\'");

+	window.Media = {

+		init : function() {

+			var html, editor;

+

+			this.editor = editor = tinyMCEPopup.editor;

+

+			// Setup file browsers and color pickers

+			get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');

+			get('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','quicktime_qtsrc','media','media');

+			get('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

+			get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource1','video_altsource1','media','media');

+			get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource2','video_altsource2','media','media');

+			get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','media','image');

+

+			html = this.getMediaListHTML('medialist', 'src', 'media', 'media');

+			if (html == "")

+				get("linklistrow").style.display = 'none';

+			else

+				get("linklistcontainer").innerHTML = html;

+

+			if (isVisible('filebrowser'))

+				get('src').style.width = '230px';

+

+			if (isVisible('filebrowser_altsource1'))

+				get('video_altsource1').style.width = '220px';

+

+			if (isVisible('filebrowser_altsource2'))

+				get('video_altsource2').style.width = '220px';

+

+			if (isVisible('filebrowser_poster'))

+				get('video_poster').style.width = '220px';

+

+			this.data = tinyMCEPopup.getWindowArg('data');

+			this.dataToForm();

+			this.preview();

+		},

+

+		insert : function() {

+			var editor = tinyMCEPopup.editor;

+

+			this.formToData();

+			editor.execCommand('mceRepaint');

+			tinyMCEPopup.restoreSelection();

+			editor.selection.setNode(editor.plugins.media.dataToImg(this.data));

+			tinyMCEPopup.close();

+		},

+

+		preview : function() {

+			get('prev').innerHTML = this.editor.plugins.media.dataToHtml(this.data, true);

+		},

+

+		moveStates : function(to_form, field) {

+			var data = this.data, editor = this.editor, data = this.data,

+				mediaPlugin = editor.plugins.media, ext, src, typeInfo, defaultStates, src;

+

+			defaultStates = {

+				// QuickTime

+				quicktime_autoplay : true,

+				quicktime_controller : true,

+

+				// Flash

+				flash_play : true,

+				flash_loop : true,

+				flash_menu : true,

+

+				// WindowsMedia

+				windowsmedia_autostart : true,

+				windowsmedia_enablecontextmenu : true,

+				windowsmedia_invokeurls : true,

+

+				// RealMedia

+				realmedia_autogotourl : true,

+				realmedia_imagestatus : true

+			};

+

+			function parseQueryParams(str) {

+				var out = {};

+

+				if (str) {

+					tinymce.each(str.split('&'), function(item) {

+						var parts = item.split('=');

+

+						out[unescape(parts[0])] = unescape(parts[1]);

+					});

+				}

+

+				return out;

+			};

+

+			function setOptions(type, names) {

+				var i, name, formItemName, value, list;

+

+				if (type == data.type || type == 'global') {

+					names = tinymce.explode(names);

+					for (i = 0; i < names.length; i++) {

+						name = names[i];

+						formItemName = type == 'global' ? name : type + '_' + name;

+

+						if (type == 'global')

+							list = data;

+						else if (type == 'video') {

+							list = data.video.attrs;

+

+							if (!list && !to_form)

+								data.video.attrs = list = {};

+						} else

+							list = data.params;

+

+						if (list) {

+							if (to_form) {

+								setVal(formItemName, list[name]);

+							} else {

+								delete list[name];

+

+								value = getVal(formItemName);

+								if (type == 'video' && value === true)

+									value = name;

+

+								if (defaultStates[formItemName]) {

+									if (value !== defaultStates[formItemName]) {

+										value = "" + value;

+										list[name] = value;

+									}

+								} else if (value) {

+									value = "" + value;

+									list[name] = value;

+								}

+							}

+						}

+					}

+				}

+			}

 

-	return s;

-}

+			if (!to_form) {

+				data.type = get('media_type').options[get('media_type').selectedIndex].value;

+				data.width = getVal('width');

+				data.height = getVal('height');

 

-function generatePreview(c) {

-	var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh;

+				// Switch type based on extension

+				src = getVal('src');

+				if (field == 'src') {

+					ext = src.replace(/^.*\.([^.]+)$/, '$1');

+					if (typeInfo = mediaPlugin.getType(ext))

+						data.type = typeInfo.name.toLowerCase();

 

-	p.innerHTML = '<!-- x --->';

+					setVal('media_type', data.type);

+				}

 

-	nw = parseInt(f.width.value);

-	nh = parseInt(f.height.value);

+				if (data.type == "video") {

+					if (!data.video.sources)

+						data.video.sources = [];

 

-	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;

+					data.video.sources[0] = {src: getVal('src')};

+				}

 			}

-		}

-	}

 

-	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;

-	}

+			// Hide all fieldsets and show the one active

+			get('video_options').style.display = 'none';

+			get('flash_options').style.display = 'none';

+			get('quicktime_options').style.display = 'none';

+			get('shockwave_options').style.display = 'none';

+			get('windowsmedia_options').style.display = 'none';

+			get('realmedia_options').style.display = 'none';

+

+			if (get(data.type + '_options'))

+				get(data.type + '_options').style.display = 'block';

+

+			setVal('media_type', data.type);

+

+			setOptions('flash', 'play,loop,menu,swliveconnect,quality,scale,salign,wmode,base,flashvars');

+			setOptions('quicktime', 'loop,autoplay,cache,controller,correction,enablejavascript,kioskmode,autohref,playeveryframe,targetcache,scale,starttime,endtime,target,qtsrcchokespeed,volume,qtsrc');

+			setOptions('shockwave', 'sound,progress,autostart,swliveconnect,swvolume,swstretchstyle,swstretchhalign,swstretchvalign');

+			setOptions('windowsmedia', 'autostart,enabled,enablecontextmenu,fullscreen,invokeurls,mute,stretchtofit,windowlessvideo,balance,baseurl,captioningid,currentmarker,currentposition,defaultframe,playcount,rate,uimode,volume');

+			setOptions('realmedia', 'autostart,loop,autogotourl,center,imagestatus,maintainaspect,nojava,prefetch,shuffle,console,controls,numloop,scriptcallbacks');

+			setOptions('video', 'poster,autoplay,loop,preload,controls');

+			setOptions('global', 'id,name,vspace,hspace,bgcolor,align,width,height');

+

+			if (to_form) {

+				if (data.type == 'video') {

+					if (data.video.sources[0])

+						setVal('src', data.video.sources[0].src);

+

+					src = data.video.sources[1];

+					if (src)

+						setVal('video_altsource1', src.src);

+

+					src = data.video.sources[2];

+					if (src)

+						setVal('video_altsource2', src.src);

+				} else {

+					// Check flash vars

+					if (data.type == 'flash') {

+						tinymce.each(editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'}), function(value, name) {

+							if (value == '$url')

+								data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src;

+						});

+					}

+

+					setVal('src', data.params.src);

+				}

+			} else {

+				src = getVal("src");

+	

+				// YouTube

+				if (src.match(/youtube.com(.+)v=([^&]+)/)) {

+					data.width = 425;

+					data.height = 350;

+					data.params.frameborder = '0';

+					data.type = 'iframe';

+					src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];

+					setVal('src', src);

+					setVal('media_type', data.type);

+				}

+

+				// Google video

+				if (src.match(/video.google.com(.+)docid=([^&]+)/)) {

+					data.width = 425;

+					data.height = 326;

+					data.type = 'flash';

+					src = 'http://video.google.com/googleplayer.swf?docId=' + src.match(/docid=([^&]+)/)[1] + '&hl=en';

+					setVal('src', src);

+					setVal('media_type', data.type);

+				}

+

+				if (data.type == 'video') {

+					if (!data.video.sources)

+						data.video.sources = [];

+

+					data.video.sources[0] = {src : src};

+

+					src = getVal("video_altsource1");

+					if (src)

+						data.video.sources[1] = {src : src};

+

+					src = getVal("video_altsource2");

+					if (src)

+						data.video.sources[2] = {src : src};

+				} else

+					data.params.src = src;

+

+				// Set default size

+				setVal('width', data.width || 320);

+				setVal('height', data.height || 240);

+			}

+		},

+

+		dataToForm : function() {

+			this.moveStates(true);

+		},

+

+		formToData : function(field) {

+			if (field == "width" || field == "height")

+				this.changeSize(field);

+

+			if (field == 'source') {

+				this.moveStates(false, field);

+				setVal('source', this.editor.plugins.media.dataToHtml(this.data));

+				this.panel = 'source';

+			} else {

+				if (this.panel == 'source') {

+					this.data = this.editor.plugins.media.htmlToData(getVal('source'));

+					this.dataToForm();

+					this.panel = '';

+				}

+

+				this.moveStates(false, field);

+				this.preview();

+			}

+		},

+

+		beforeResize : function() {

+			this.width = parseInt(getVal('width') || "320", 10);

+			this.height = parseInt(getVal('height') || "240", 10);

+		},

+

+		changeSize : function(type) {

+			var width, height, scale, size;

+

+			if (get('constrain').checked) {

+				width = parseInt(getVal('width') || "320", 10);

+				height = parseInt(getVal('height') || "240", 10);

+

+				if (type == 'width') {

+					this.height = Math.round((width / this.width) * height);

+					setVal('height', this.height);

+				} else {

+					this.width = Math.round((height / this.height) * width);

+					setVal('width', this.width);

+				}

+			}

+		},

 

-	pl = tinyMCEPopup.editor.plugins.media._parse(pl);

+		getMediaListHTML : function() {

+			if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {

+				var html = "";

 

-	if (!pl.src) {

-		p.innerHTML = '';

-		return;

-	}

+				html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;Media.formToData(\'src\');">';

+				html += '<option value="">---</option>';

 

-	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;

+				for (var i=0; i<tinyMCEMediaList.length; i++)

+					html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';

 

-	// Avoid annoying warning about insecure items

-	if (!tinymce.isIE || document.location.protocol != 'https:') {

-		h += '<object classid="' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';

+				html += '</select>';

 

-		for (n in pl) {

-			h += '<param name="' + n + '" value="' + pl[n] + '">';

+				return html;

+			}

 

-			// Add extra url parameter if it's an absolute URL

-			if (n == 'src' && pl[n].indexOf('://') != -1)

-				h += '<param name="url" value="' + pl[n] + '" />';

+			return "";

 		}

-	}

-

-	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);

+	tinyMCEPopup.requireLangPack();

+	tinyMCEPopup.onInit.add(function() {

+		Media.init();

+	});

+})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
index 6d0a996f7..29d26a0d4 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
@@ -91,7 +91,6 @@ 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",

@@ -99,5 +98,12 @@ flv_autostart:"Auto start",
 flv_loop:"Loop",

 flv_showscalemodes:"Show scale modes",

 flv_smoothvideo:"Smooth video",

-flv_jscallback:"JS Callback"

+flv_jscallback:"JS Callback",

+html5_video_options:"HTML5 Video Options",

+altsource1:"Alternative source 1",

+altsource2:"Alternative source 2",

+preload:"Preload",

+poster:"Poster",

+

+source:"Source"

 });
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm
index 73a903f7c..807a537dc 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm
@@ -10,12 +10,13 @@
 	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

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

 </head>

-<body style="display: none">

-    <form onsubmit="insertMedia();return false;" action="#">

-		<div class="tabs">

+<body style="display: none" role="application">

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

+		<div class="tabs" role="presentation">

 			<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>

+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');Media.formToData();" onmousedown="return false;">{#media_dlg.general}</a></span></li>

+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');Media.formToData();" onmousedown="return false;">{#media_dlg.advanced}</a></span></li>

+				<li id="source_tab" aria-controls="source_panel"><span><a href="javascript:mcTabs.displayTab('source_tab','source_panel');Media.formToData('source');" onmousedown="return false;">{#media_dlg.source}</a></span></li>

 			</ul>

 		</div>

 

@@ -24,28 +25,29 @@
 				<fieldset>

 					<legend>{#media_dlg.general}</legend>

 

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

+					<table role="presentation" 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();">

+									<select id="media_type" name="media_type" onchange="Media.formToData('type');">

+										<option value="video">HTML5 Video</option>

 										<option value="flash">Flash</option>

-										<!-- <option value="flv">Flash video (FLV)</option> -->

-										<option value="qt">Quicktime</option>

+										<option value="quicktime">QuickTime</option>

 										<option value="shockwave">Shockwave</option>

-										<option value="wmp">Windows Media</option>

-										<option value="rmp">Real Media</option>

+										<option value="windowsmedia">Windows Media</option>

+										<option value="realmedia">Real Media</option>

+										<option value="iframe">Iframe</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>

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

+									<tr>

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

 										<td id="filebrowsercontainer">&nbsp;</td>

-									  </tr>

+									</tr>

 									</table>

 								</td>

 							</tr>

@@ -56,10 +58,10 @@
 							<tr>

 								<td><label for="width">{#media_dlg.size}</label></td>

 								<td>

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

+									<table role="presentation" 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><input type="text" id="width" name="width" value="" class="size" onchange="Media.formToData('width');" onfocus="Media.beforeResize();" /> x <input type="text" id="height" name="height" value="" class="size" onfocus="Media.beforeResize();" onchange="Media.formToData('height');" /></td>

+											<td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" checked="checked" /></td>

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

 										</tr>

 									</table>

@@ -78,18 +80,18 @@
 				<fieldset>

 					<legend>{#media_dlg.advanced}</legend>

 

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

+					<table role="presentation" 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><input type="text" id="id" name="id" onchange="Media.formToData();" /></td>

 							<td><label for="name">{#media_dlg.name}</label></td>

-							<td><input type="text" id="name" name="name" onchange="generatePreview();" /></td>

+							<td><input type="text" id="name" name="name" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

 							<td><label for="align">{#media_dlg.align}</label></td>

 							<td>

-								<select id="align" name="align" onchange="generatePreview();">

+								<select id="align" name="align" onchange="Media.formToData();">

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

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

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

@@ -100,9 +102,9 @@
 

 							<td><label for="bgcolor">{#media_dlg.bgcolor}</label></td>

 							<td>

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

+								<table role="presentation" 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><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');Media.formToData();" /></td>

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

 									</tr>

 								</table>

@@ -111,9 +113,91 @@
 

 						<tr>

 							<td><label for="vspace">{#media_dlg.vspace}</label></td>

-							<td><input type="text" id="vspace" name="vspace" class="number" onchange="generatePreview();" /></td>

+							<td><input type="text" id="vspace" name="vspace" class="number" onchange="Media.formToData();" /></td>

 							<td><label for="hspace">{#media_dlg.hspace}</label></td>

-							<td><input type="text" id="hspace" name="hspace" class="number" onchange="generatePreview();" /></td>

+							<td><input type="text" id="hspace" name="hspace" class="number" onchange="Media.formToData();" /></td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="video_options">

+					<legend>{#media_dlg.html5_video_options}</legend>

+

+					<table role="presentation">

+						<tr>

+							<td><label for="video_altsource1">{#media_dlg.altsource1}</label></td>

+							<td>

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

+									<tr>

+										<td><input type="text" id="video_altsource1" name="video_altsource1" onchange="Media.formToData();" style="width: 240px" /></td>

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

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="video_altsource2">{#media_dlg.altsource2}</label></td>

+							<td>

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

+									<tr>

+										<td><input type="text" id="video_altsource2" name="video_altsource2" onchange="Media.formToData();" style="width: 240px" /></td>

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

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="video_poster">{#media_dlg.poster}</label></td>

+							<td>

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

+									<tr>

+										<td><input type="text" id="video_poster" name="video_poster" onchange="Media.formToData();" style="width: 240px" /></td>

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

+									</tr>

+								</table>

+							</td>

+						</tr>

+					</table>

+

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

+						<tr>

+							<td>

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

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="video_autoplay" name="video_autoplay" onchange="Media.formToData();" /></td>

+										<td><label for="video_autoplay">{#media_dlg.play}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td>

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

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="video_loop" name="video_loop" onchange="Media.formToData();" /></td>

+										<td><label for="video_loop">{#media_dlg.loop}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td>

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

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="video_preload" name="video_preload" onchange="Media.formToData();" /></td>

+										<td><label for="video_preload">{#media_dlg.preload}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td>

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

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="video_controls" name="video_controls" onchange="Media.formToData();" /></td>

+										<td><label for="video_controls">{#media_dlg.controls}</label></td>

+									</tr>

+								</table>

+							</td>

 						</tr>

 					</table>

 				</fieldset>

@@ -121,11 +205,11 @@
 				<fieldset id="flash_options">

 					<legend>{#media_dlg.flash_options}</legend>

 

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

+					<table role="presentation" 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();">

+								<select id="flash_quality" name="flash_quality" onchange="Media.formToData();">

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

 									<option value="high">high</option>

 									<option value="low">low</option>

@@ -137,7 +221,7 @@
 

 							<td><label for="flash_scale">{#media_dlg.scale}</label></td>

 							<td>

-								<select id="flash_scale" name="flash_scale" onchange="generatePreview();">

+								<select id="flash_scale" name="flash_scale" onchange="Media.formToData();">

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

 									<option value="showall">showall</option>

 									<option value="noborder">noborder</option>

@@ -150,7 +234,7 @@
 						<tr>

 							<td><label for="flash_wmode">{#media_dlg.wmode}</label></td>

 							<td>

-								<select id="flash_wmode" name="flash_wmode" onchange="generatePreview();">

+								<select id="flash_wmode" name="flash_wmode" onchange="Media.formToData();">

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

 									<option value="window">window</option>

 									<option value="opaque">opaque</option>

@@ -160,7 +244,7 @@
 

 							<td><label for="flash_salign">{#media_dlg.salign}</label></td>

 							<td>

-								<select id="flash_salign" name="flash_salign" onchange="generatePreview();">

+								<select id="flash_salign" name="flash_salign" onchange="Media.formToData();">

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

 									<option value="l">{#media_dlg.align_left}</option>

 									<option value="t">{#media_dlg.align_top}</option>

@@ -176,18 +260,18 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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><input type="checkbox" class="checkbox" id="flash_play" name="flash_play" checked="checked" onchange="Media.formToData();" /></td>

 										<td><label for="flash_play">{#media_dlg.play}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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><input type="checkbox" class="checkbox" id="flash_loop" name="flash_loop" checked="checked" onchange="Media.formToData();" /></td>

 										<td><label for="flash_loop">{#media_dlg.loop}</label></td>

 									</tr>

 								</table>

@@ -196,18 +280,18 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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><input type="checkbox" class="checkbox" id="flash_menu" name="flash_menu" checked="checked" onchange="Media.formToData();" /></td>

 										<td><label for="flash_menu">{#media_dlg.menu}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

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

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="generatePreview();" /></td>

+										<td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="Media.formToData();" /></td>

 										<td><label for="flash_swliveconnect">{#media_dlg.liveconnect}</label></td>

 									</tr>

 								</table>

@@ -215,134 +299,38 @@
 						</tr>

 					</table>

 

-					<table>

+					<table role="presentation">

 						<tr>

 							<td><label for="flash_base">{#media_dlg.base}</label></td>

-							<td><input type="text" id="flash_base" name="flash_base" onchange="generatePreview();" /></td>

+							<td><input type="text" id="flash_base" name="flash_base" onchange="Media.formToData();" /></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>

-

-

-						</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>

+							<td><input type="text" id="flash_flashvars" name="flash_flashvars" onchange="Media.formToData();" /></td>

 						</tr>

 					</table>

 				</fieldset>

 

-				<fieldset id="qt_options">

+				<fieldset id="quicktime_options">

 					<legend>{#media_dlg.qt_options}</legend>

 

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

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

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="quicktime_loop" name="quicktime_loop" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_loop">{#media_dlg.loop}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="quicktime_autoplay" name="quicktime_autoplay" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_autoplay">{#media_dlg.play}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -350,19 +338,19 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="quicktime_cache" name="quicktime_cache" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_cache">{#media_dlg.cache}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="quicktime_controller" name="quicktime_controller" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_controller">{#media_dlg.controller}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -370,19 +358,19 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="quicktime_correction" name="quicktime_correction" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_correction">{#media_dlg.correction}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="quicktime_enablejavascript" name="quicktime_enablejavascript" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_enablejavascript">{#media_dlg.enablejavascript}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -390,19 +378,19 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="quicktime_kioskmode" name="quicktime_kioskmode" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_kioskmode">{#media_dlg.kioskmode}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="quicktime_autohref" name="quicktime_autohref" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_autohref">{#media_dlg.autohref}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -410,27 +398,27 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="quicktime_playeveryframe" name="quicktime_playeveryframe" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_playeveryframe">{#media_dlg.playeveryframe}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="quicktime_targetcache" name="quicktime_targetcache" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_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();">

+							<td><label for="quicktime_scale">{#media_dlg.scale}</label></td>

+							<td><select id="quicktime_scale" name="quicktime_scale" class="mceEditableSelect" onchange="Media.formToData();">

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

 									<option value="tofit">tofit</option>

 									<option value="aspect">aspect</option>

@@ -441,62 +429,62 @@
 						</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="quicktime_starttime">{#media_dlg.starttime}</label></td>

+							<td><input type="text" id="quicktime_starttime" name="quicktime_starttime" onchange="Media.formToData();" /></td>

 

-							<td><label for="qt_endtime">{#media_dlg.endtime}</label></td>

-							<td><input type="text" id="qt_endtime" name="qt_endtime" onchange="generatePreview();" /></td>

+							<td><label for="quicktime_endtime">{#media_dlg.endtime}</label></td>

+							<td><input type="text" id="quicktime_endtime" name="quicktime_endtime" onchange="Media.formToData();" /></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="quicktime_target">{#media_dlg.target}</label></td>

+							<td><input type="text" id="quicktime_target" name="quicktime_target" onchange="Media.formToData();" /></td>

 

-							<td><label for="qt_href">{#media_dlg.href}</label></td>

-							<td><input type="text" id="qt_href" name="qt_href" onchange="generatePreview();" /></td>

+							<td><label for="quicktime_href">{#media_dlg.href}</label></td>

+							<td><input type="text" id="quicktime_href" name="quicktime_href" onchange="Media.formToData();" /></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="quicktime_qtsrcchokespeed">{#media_dlg.qtsrcchokespeed}</label></td>

+							<td><input type="text" id="quicktime_qtsrcchokespeed" name="quicktime_qtsrcchokespeed" onchange="Media.formToData();" /></td>

 

-							<td><label for="qt_volume">{#media_dlg.volume}</label></td>

-							<td><input type="text" id="qt_volume" name="qt_volume" onchange="generatePreview();" /></td>

+							<td><label for="quicktime_volume">{#media_dlg.volume}</label></td>

+							<td><input type="text" id="quicktime_volume" name="quicktime_volume" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

-							<td><label for="qt_qtsrc">{#media_dlg.qtsrc}</label></td>

+							<td><label for="quicktime_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>

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

+									<tr>

+										<td><input type="text" id="quicktime_qtsrc" name="quicktime_qtsrc" onchange="Media.formToData();" /></td>

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

+									</tr>

+								</table>

 							</td>

 						</tr>

 					</table>

 				</fieldset>

 

-				<fieldset id="wmp_options">

+				<fieldset id="windowsmedia_options">

 					<legend>{#media_dlg.wmp_options}</legend>

 

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

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

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_autostart" name="windowsmedia_autostart" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_autostart">{#media_dlg.autostart}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_enabled" name="windowsmedia_enabled" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_enabled">{#media_dlg.enabled}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -504,19 +492,19 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_enablecontextmenu" name="windowsmedia_enablecontextmenu" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_enablecontextmenu">{#media_dlg.menu}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_fullscreen" name="windowsmedia_fullscreen" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_fullscreen">{#media_dlg.fullscreen}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -524,19 +512,19 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_invokeurls" name="windowsmedia_invokeurls" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_invokeurls">{#media_dlg.invokeurls}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_mute" name="windowsmedia_mute" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_mute">{#media_dlg.mute}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -544,86 +532,86 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_stretchtofit" name="windowsmedia_stretchtofit" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_stretchtofit">{#media_dlg.stretchtofit}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_windowlessvideo" name="windowsmedia_windowlessvideo" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_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="windowsmedia_balance">{#media_dlg.balance}</label></td>

+							<td><input type="text" id="windowsmedia_balance" name="windowsmedia_balance" onchange="Media.formToData();" /></td>

 

-							<td><label for="wmp_baseurl">{#media_dlg.baseurl}</label></td>

-							<td><input type="text" id="wmp_baseurl" name="wmp_baseurl" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_baseurl">{#media_dlg.baseurl}</label></td>

+							<td><input type="text" id="windowsmedia_baseurl" name="windowsmedia_baseurl" onchange="Media.formToData();" /></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="windowsmedia_captioningid">{#media_dlg.captioningid}</label></td>

+							<td><input type="text" id="windowsmedia_captioningid" name="windowsmedia_captioningid" onchange="Media.formToData();" /></td>

 

-							<td><label for="wmp_currentmarker">{#media_dlg.currentmarker}</label></td>

-							<td><input type="text" id="wmp_currentmarker" name="wmp_currentmarker" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_currentmarker">{#media_dlg.currentmarker}</label></td>

+							<td><input type="text" id="windowsmedia_currentmarker" name="windowsmedia_currentmarker" onchange="Media.formToData();" /></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="windowsmedia_currentposition">{#media_dlg.currentposition}</label></td>

+							<td><input type="text" id="windowsmedia_currentposition" name="windowsmedia_currentposition" onchange="Media.formToData();" /></td>

 

-							<td><label for="wmp_defaultframe">{#media_dlg.defaultframe}</label></td>

-							<td><input type="text" id="wmp_defaultframe" name="wmp_defaultframe" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_defaultframe">{#media_dlg.defaultframe}</label></td>

+							<td><input type="text" id="windowsmedia_defaultframe" name="windowsmedia_defaultframe" onchange="Media.formToData();" /></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="windowsmedia_playcount">{#media_dlg.playcount}</label></td>

+							<td><input type="text" id="windowsmedia_playcount" name="windowsmedia_playcount" onchange="Media.formToData();" /></td>

 

-							<td><label for="wmp_rate">{#media_dlg.rate}</label></td>

-							<td><input type="text" id="wmp_rate" name="wmp_rate" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_rate">{#media_dlg.rate}</label></td>

+							<td><input type="text" id="windowsmedia_rate" name="windowsmedia_rate" onchange="Media.formToData();" /></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="windowsmedia_uimode">{#media_dlg.uimode}</label></td>

+							<td><input type="text" id="windowsmedia_uimode" name="windowsmedia_uimode" onchange="Media.formToData();" /></td>

 

-							<td><label for="wmp_volume">{#media_dlg.volume}</label></td>

-							<td><input type="text" id="wmp_volume" name="wmp_volume" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_volume">{#media_dlg.volume}</label></td>

+							<td><input type="text" id="windowsmedia_volume" name="windowsmedia_volume" onchange="Media.formToData();" /></td>

 						</tr>

 

 					</table>

 				</fieldset>

 

-				<fieldset id="rmp_options">

+				<fieldset id="realmedia_options">

 					<legend>{#media_dlg.rmp_options}</legend>

 

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

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

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="realmedia_autostart" name="realmedia_autostart" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_autostart">{#media_dlg.autostart}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="realmedia_loop" name="realmedia_loop" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_loop">{#media_dlg.loop}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -631,19 +619,19 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="realmedia_autogotourl" name="realmedia_autogotourl" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_autogotourl">{#media_dlg.autogotourl}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="realmedia_center" name="realmedia_center" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_center">{#media_dlg.center}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -651,19 +639,19 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="realmedia_imagestatus" name="realmedia_imagestatus" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_imagestatus">{#media_dlg.imagestatus}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="realmedia_maintainaspect" name="realmedia_maintainaspect" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_maintainaspect">{#media_dlg.maintainaspect}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -671,19 +659,19 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="realmedia_nojava" name="realmedia_nojava" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_nojava">{#media_dlg.nojava}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="realmedia_prefetch" name="realmedia_prefetch" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_prefetch">{#media_dlg.prefetch}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -691,10 +679,10 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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>

+										<td><input type="checkbox" class="checkbox" id="realmedia_shuffle" name="realmedia_shuffle" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_shuffle">{#media_dlg.shuffle}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -705,19 +693,19 @@
 						</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="realmedia_console">{#media_dlg.console}</label></td>

+							<td><input type="text" id="realmedia_console" name="realmedia_console" onchange="Media.formToData();" /></td>

 

-							<td><label for="rmp_controls">{#media_dlg.controls}</label></td>

-							<td><input type="text" id="rmp_controls" name="rmp_controls" onchange="generatePreview();" /></td>

+							<td><label for="realmedia_controls">{#media_dlg.controls}</label></td>

+							<td><input type="text" id="realmedia_controls" name="realmedia_controls" onchange="Media.formToData();" /></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="realmedia_numloop">{#media_dlg.numloop}</label></td>

+							<td><input type="text" id="realmedia_numloop" name="realmedia_numloop" onchange="Media.formToData();" /></td>

 

-							<td><label for="rmp_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>

-							<td><input type="text" id="rmp_scriptcallbacks" name="rmp_scriptcallbacks" onchange="generatePreview();" /></td>

+							<td><label for="realmedia_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>

+							<td><input type="text" id="realmedia_scriptcallbacks" name="realmedia_scriptcallbacks" onchange="Media.formToData();" /></td>

 						</tr>

 					</table>

 				</fieldset>

@@ -725,11 +713,11 @@
 				<fieldset id="shockwave_options">

 					<legend>{#media_dlg.shockwave_options}</legend>

 

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

+					<table role="presentation" 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();">

+								<select id="shockwave_swstretchstyle" name="shockwave_swstretchstyle" onchange="Media.formToData();">

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

 									<option value="meet">Meet</option>

 									<option value="fill">Fill</option>

@@ -738,13 +726,13 @@
 							</td>

 

 							<td><label for="shockwave_swvolume">{#media_dlg.volume}</label></td>

-							<td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="generatePreview();" /></td>

+							<td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

 							<td><label for="shockwave_swstretchhalign">{#media_dlg.swstretchhalign}</label></td>

 							<td>

-								<select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="generatePreview();">

+								<select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="Media.formToData();">

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

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

 									<option value="center">{#media_dlg.align_center}</option>

@@ -754,7 +742,7 @@
 

 							<td><label for="shockwave_swstretchvalign">{#media_dlg.swstretchvalign}</label></td>

 							<td>

-								<select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="generatePreview();">

+								<select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="Media.formToData();">

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

 									<option value="meet">Meet</option>

 									<option value="fill">Fill</option>

@@ -765,18 +753,18 @@
 

 						<tr>

 							<td colspan="2">

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

+								<table role="presentation" 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><input type="checkbox" class="checkbox" id="shockwave_autostart" name="shockwave_autostart" onchange="Media.formToData();" 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">

+								<table role="presentation" 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><input type="checkbox" class="checkbox" id="shockwave_sound" name="shockwave_sound" onchange="Media.formToData();" checked="checked" /></td>

 										<td><label for="shockwave_sound">{#media_dlg.sound}</label></td>

 									</tr>

 								</table>

@@ -786,18 +774,18 @@
 

 						<tr>

 							<td colspan="2">

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

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

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="generatePreview();" /></td>

+										<td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="Media.formToData();" /></td>

 										<td><label for="shockwave_swliveconnect">{#media_dlg.liveconnect}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

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

+								<table role="presentation" 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><input type="checkbox" class="checkbox" id="shockwave_progress" name="shockwave_progress" onchange="Media.formToData();" checked="checked" /></td>

 										<td><label for="shockwave_progress">{#media_dlg.progress}</label></td>

 									</tr>

 								</table>

@@ -806,6 +794,13 @@
 					</table>

 				</fieldset>

 			</div>

+

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

+				<fieldset>

+					<legend>{#media_dlg.source}</legend>

+					<textarea id="source" style="width: 100%; height: 390px"></textarea>

+				</fieldset>

+			</div>

 		</div>

 

 		<div class="mceActionPanel">

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf
new file mode 100644
index 000000000..2a040358d
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
index f2dbbff2b..73947355f 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'<span class="mceItemHidden mceVisualNbsp">&middot;</span>':"&nbsp;")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(tinymce.isIE&&f.keyCode==9){d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");tinymce.dom.Event.cancel(f)}})}},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
+(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>':"&nbsp;")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(tinymce.isIE&&f.keyCode==9){d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");tinymce.dom.Event.cancel(f)}})}},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/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
index e3b078bfa..b3ea82ee0 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
@@ -17,7 +17,7 @@
 

 			// Register commands

 			ed.addCommand('mceNonBreaking', function() {

-				ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span class="mceItemHidden mceVisualNbsp">&middot;</span>' : '&nbsp;');

+				ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>' : '&nbsp;');

 			});

 

 			// Register buttons

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
index 9945cd858..cc7de7846 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.dom.Event;tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(d,e){var f=this,c,b;f.editor=d;c=d.getParam("noneditable_editable_class","mceEditable");b=d.getParam("noneditable_noneditable_class","mceNonEditable");d.onNodeChange.addToTop(function(h,g,k){var j,i;j=h.dom.getParent(h.selection.getStart(),function(l){return h.dom.hasClass(l,b)});i=h.dom.getParent(h.selection.getEnd(),function(l){return h.dom.hasClass(l,b)});if(j||i){f._setDisabled(1);return false}else{f._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(c,d){var b=d.keyCode;if((b>32&&b<41)||(b>111&&b<124)){return}return a.cancel(d)},_setDisabled:function(d){var c=this,b=c.editor;tinymce.each(b.controlManager.controls,function(e){e.setDisabled(d)});if(d!==c.disabled){if(d){b.onKeyDown.addToTop(c._block);b.onKeyPress.addToTop(c._block);b.onKeyUp.addToTop(c._block);b.onPaste.addToTop(c._block)}else{b.onKeyDown.remove(c._block);b.onKeyPress.remove(c._block);b.onKeyUp.remove(c._block);b.onPaste.remove(c._block)}c.disabled=d}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.dom.Event;tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(d,e){var f=this,c,b;f.editor=d;c=d.getParam("noneditable_editable_class","mceEditable");b=d.getParam("noneditable_noneditable_class","mceNonEditable");d.onNodeChange.addToTop(function(h,g,k){var j,i;j=h.dom.getParent(h.selection.getStart(),function(l){return h.dom.hasClass(l,b)});i=h.dom.getParent(h.selection.getEnd(),function(l){return h.dom.hasClass(l,b)});if(j||i){f._setDisabled(1);return false}else{f._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(c,d){var b=d.keyCode;if((b>32&&b<41)||(b>111&&b<124)){return}return a.cancel(d)},_setDisabled:function(d){var c=this,b=c.editor;tinymce.each(b.controlManager.controls,function(e){e.setDisabled(d)});if(d!==c.disabled){if(d){b.onKeyDown.addToTop(c._block);b.onKeyPress.addToTop(c._block);b.onKeyUp.addToTop(c._block);b.onPaste.addToTop(c._block);b.onContextMenu.addToTop(c._block)}else{b.onKeyDown.remove(c._block);b.onKeyPress.remove(c._block);b.onKeyUp.remove(c._block);b.onPaste.remove(c._block);b.onContextMenu.remove(c._block)}c.disabled=d}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
index 656c971b8..b6cf15430 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
@@ -73,11 +73,13 @@
 					ed.onKeyPress.addToTop(t._block);

 					ed.onKeyUp.addToTop(t._block);

 					ed.onPaste.addToTop(t._block);

+					ed.onContextMenu.addToTop(t._block);

 				} else {

 					ed.onKeyDown.remove(t._block);

 					ed.onKeyPress.remove(t._block);

 					ed.onKeyUp.remove(t._block);

 					ed.onPaste.remove(t._block);

+					ed.onContextMenu.remove(t._block);

 				}

 

 				t.disabled = s;

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css
deleted file mode 100644
index c949d58cc..000000000
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css
+++ /dev/null
@@ -1 +0,0 @@
-.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/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js
index a212f6963..35085e8ad 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='<img src="'+d+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',a="mcePageBreak",c=b.getParam("pagebreak_separator","<!-- pagebreak -->"),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.settings.content_css!==false){b.dom.loadCSS(d+"/css/content.css")}if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},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
+(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='<img src="'+b.theme.url+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',a="mcePageBreak",c=b.getParam("pagebreak_separator","<!-- pagebreak -->"),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},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/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js
index 4e1eb0a7a..a094c1916 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js
@@ -11,7 +11,7 @@
 (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;

+			var pb = '<img src="' + ed.theme.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');

 

@@ -24,9 +24,6 @@
 			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))

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif
deleted file mode 100644
index 388486517..000000000
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif
+++ /dev/null
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
index 3e7b2504f..6c65069f3 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.each,d=null,a={paste_auto_cleanup_on_paste:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_text_use_dialog:false,paste_text_sticky:false,paste_text_notifyalways:false,paste_text_linebreaktype:"p",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(e,f){return e.getParam(f,a[f])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(e,f){var g=this;g.editor=e;g.url=f;g.onPreProcess=new tinymce.util.Dispatcher(g);g.onPostProcess=new tinymce.util.Dispatcher(g);g.onPreProcess.add(g._preProcess);g.onPostProcess.add(g._postProcess);g.onPreProcess.add(function(j,k){e.execCallback("paste_preprocess",j,k)});g.onPostProcess.add(function(j,k){e.execCallback("paste_postprocess",j,k)});e.pasteAsPlainText=false;function i(l,j){var k=e.dom;g.onPreProcess.dispatch(g,l);l.node=k.create("div",0,l.content);g.onPostProcess.dispatch(g,l);l.content=e.serializer.serialize(l.node,{getInner:1});if((!j)&&(e.pasteAsPlainText)){g._insertPlainText(e,k,l.content);if(!b(e,"paste_text_sticky")){e.pasteAsPlainText=false;e.controlManager.setActive("pastetext",false)}}else{if(/<(p|h[1-6]|ul|ol)/.test(l.content)){g._insertBlockContent(e,k,l.content)}else{g._insert(l.content)}}}e.addCommand("mceInsertClipboardContent",function(j,k){i(k,true)});if(!b(e,"paste_text_use_dialog")){e.addCommand("mcePasteText",function(k,j){var l=tinymce.util.Cookie;e.pasteAsPlainText=!e.pasteAsPlainText;e.controlManager.setActive("pastetext",e.pasteAsPlainText);if((e.pasteAsPlainText)&&(!l.get("tinymcePasteText"))){if(b(e,"paste_text_sticky")){e.windowManager.alert(e.translate("paste.plaintext_mode_sticky"))}else{e.windowManager.alert(e.translate("paste.plaintext_mode_sticky"))}if(!b(e,"paste_text_notifyalways")){l.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}e.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});e.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function h(s){var m,q,k,l=e.selection,p=e.dom,r=e.getBody(),j;if(e.pasteAsPlainText&&(s.clipboardData||p.doc.dataTransfer)){s.preventDefault();i({content:(s.clipboardData||p.doc.dataTransfer).getData("Text")},true);return}if(p.get("_mcePaste")){return}m=p.add(r,"div",{id:"_mcePaste","class":"mcePaste"},"\uFEFF");if(r!=e.getDoc().body){j=p.getPos(e.selection.getStart(),r).y}else{j=r.scrollTop}p.setStyles(m,{position:"absolute",left:-10000,top:j,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){k=p.doc.body.createTextRange();k.moveToElementText(m);k.execCommand("Paste");p.remove(m);if(m.innerHTML==="\uFEFF"){e.execCommand("mcePasteWord");s.preventDefault();return}i({content:m.innerHTML});return tinymce.dom.Event.cancel(s)}else{function o(n){n.preventDefault()}p.bind(e.getDoc(),"mousedown",o);p.bind(e.getDoc(),"keydown",o);q=e.selection.getRng();m=m.firstChild;k=e.getDoc().createRange();k.setStart(m,0);k.setEnd(m,1);l.setRng(k);window.setTimeout(function(){var t="",n=p.select("div.mcePaste");c(n,function(u){c(p.select("div.mcePaste",u),function(v){p.remove(v,1)});c(p.select("span.Apple-style-span",u),function(v){p.remove(v,1)});t+=u.innerHTML});c(n,function(u){p.remove(u)});if(q){l.setRng(q)}i({content:t});p.unbind(e.getDoc(),"mousedown",o);p.unbind(e.getDoc(),"keydown",o)},0)}}if(b(e,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){e.onKeyDown.add(function(j,k){if(((tinymce.isMac?k.metaKey:k.ctrlKey)&&k.keyCode==86)||(k.shiftKey&&k.keyCode==45)){h(k)}})}else{e.onPaste.addToTop(function(j,k){return h(k)})}}if(b(e,"paste_block_drop")){e.onInit.add(function(){e.dom.bind(e.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(j){j.preventDefault();j.stopPropagation();return false})})}g._legacySupport()},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}},_preProcess:function(i,f){var l=this.editor,k=f.content,q=tinymce.grep,p=tinymce.explode,g=tinymce.trim,m,j;function e(h){c(h,function(o){if(o.constructor==RegExp){k=k.replace(o,"")}else{k=k.replace(o[0],o[1])}})}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(k)||f.wordContent){f.wordContent=true;e([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(l,"paste_convert_headers_to_strong")){k=k.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(l,"paste_convert_middot_lists")){e([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"]])}e([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{m=k.length;k=k.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(m!=k.length);if(b(l,"paste_retain_style_properties").replace(/^none$/i,"").length==0){k=k.replace(/<\/?span[^>]*>/gi,"")}else{e([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(u,h,t){var v=[],o=0,r=p(g(t).replace(/&quot;/gi,"'"),";");c(r,function(s){var w,y,z=p(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":v[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":v[o++]="text-align:"+y;return;case"vert-align":v[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":v[o++]="color:"+y;return;case"mso-background":case"mso-highlight":v[o++]="background:"+y;return;case"mso-default-height":v[o++]="min-height:"+x(y);return;case"mso-default-width":v[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":v[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){v[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){v[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}v[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+v.join(";")+'"'}else{return h}}]])}}if(b(l,"paste_convert_headers_to_strong")){e([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}j=b(l,"paste_strip_class_attributes");if(j!=="none"){function n(r,o){if(j==="all"){return""}var h=q(p(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(s){return(/^(?!mso)/i.test(s))});return h.length?' class="'+h.join(" ")+'"':""}k=k.replace(/ class="([^"]+)"/gi,n);k=k.replace(/ class=(\w+)/gi,n)}if(b(l,"paste_remove_spans")){k=k.replace(/<\/?span[^>]*>/gi,"")}f.content=k},_postProcess:function(h,j){var g=this,f=g.editor,i=f.dom,e;if(j.wordContent){c(i.select("a",j.node),function(k){if(!k.href||k.href.indexOf("#_Toc")!=-1){i.remove(k,1)}});if(b(f,"paste_convert_middot_lists")){g._convertLists(h,j)}e=b(f,"paste_retain_style_properties");if((tinymce.is(e,"string"))&&(e!=="all")&&(e!=="*")){e=tinymce.explode(e.replace(/^none$/i,""));c(i.select("*",j.node),function(n){var o={},l=0,m,p,k;if(e){for(m=0;m<e.length;m++){p=e[m];k=i.getStyle(n,p);if(k){o[p]=k;l++}}}i.setAttrib(n,"style","");if(e&&l>0){i.setStyles(n,o)}else{if(n.nodeName=="SPAN"&&!n.className){i.remove(n,true)}}})}}if(b(f,"paste_remove_styles")||(b(f,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(i.select("*[style]",j.node),function(k){k.removeAttribute("style");k.removeAttribute("_mce_style")})}else{if(tinymce.isWebKit){c(i.select("*",j.node),function(k){k.removeAttribute("_mce_style")})}}},_convertLists:function(h,f){var j=h.editor.dom,i,m,e=-1,g,n=[],l,k;c(j.select("p",f.node),function(u){var r,v="",t,s,o,q;for(r=u.firstChild;r&&r.nodeType==3;r=r.nextSibling){v+=r.nodeValue}v=u.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(v)){t="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(v)){t="ol"}if(t){g=parseFloat(u.style.marginLeft||0);if(g>e){n.push(g)}if(!i||t!=l){i=j.create(t);j.insertAfter(i,u)}else{if(g>e){i=m.appendChild(j.create(t))}else{if(g<e){o=tinymce.inArray(n,g);q=j.getParents(i.parentNode,t);i=q[q.length-1-o]||i}}}c(j.select("span",u),function(w){var p=w.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(t=="ul"&&/^[\u2022\u00b7\u00a7\u00d8o]/.test(p)){j.remove(w)}else{if(/^[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){j.remove(w)}}});s=u.innerHTML;if(t=="ul"){s=u.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*(&nbsp;|\u00a0)+\s*/,"")}else{s=u.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/,"")}m=i.appendChild(j.create("li",0,s));j.remove(u);e=g;l=t}else{i=e=0}});k=f.node.innerHTML;if(k.indexOf("__MCE_ITEM__")!=-1){f.node.innerHTML=k.replace(/__MCE_ITEM__/g,"")}},_insertBlockContent:function(l,h,m){var f,j,g=l.selection,q,n,e,o,i,k="mce_marker";function p(t){var s;if(tinymce.isIE){s=l.getDoc().body.createTextRange();s.moveToElementText(t);s.collapse(false);s.select()}else{g.select(t,1);g.collapse(false)}}this._insert('<span id="'+k+'">&nbsp;</span>',1);j=h.get(k);f=h.getParent(j,"p,h1,h2,h3,h4,h5,h6,ul,ol,th,td");if(f&&!/TD|TH/.test(f.nodeName)){j=h.split(f,j);c(h.create("div",0,m).childNodes,function(r){q=j.parentNode.insertBefore(r.cloneNode(true),j)});p(q)}else{h.setOuterHTML(j,m);g.select(l.getBody(),1);g.collapse(0)}while(n=h.get(k)){h.remove(n)}n=g.getStart();e=h.getViewPort(l.getWin());o=l.dom.getPos(n).y;i=n.clientHeight;if(o<e.y||o+i>e.y+e.h){l.getDoc().body.scrollTop=o<e.y?o:o-e.h+25}},_insert:function(g,e){var f=this.editor,i=f.selection.getRng();if(!f.selection.isCollapsed()&&i.startContainer!=i.endContainer){f.getDoc().execCommand("Delete",false,null)}f.execCommand(tinymce.isGecko?"insertHTML":"mceInsertContent",false,g,{skip_undo:e})},_insertPlainText:function(j,x,v){var t,u,l,k,r,e,p,f,n=j.getWin(),z=j.getDoc(),s=j.selection,m=tinymce.is,y=tinymce.inArray,g=b(j,"paste_text_linebreaktype"),o=b(j,"paste_text_replacements");function q(h){c(h,function(i){if(i.constructor==RegExp){v=v.replace(i,"")}else{v=v.replace(i[0],i[1])}})}if((typeof(v)==="string")&&(v.length>0)){if(!d){d=("34,quot,38,amp,39,apos,60,lt,62,gt,"+j.serializer.settings.entities).split(",")}if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(v)){q([/[\n\r]+/g])}else{q([/\r+/g])}q([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/&(#\d+|[a-z0-9]{1,10});/gi,function(i,h){if(h.charAt(0)==="#"){return String.fromCharCode(h.slice(1))}else{return((i=y(d,h))>0)?String.fromCharCode(d[i-1]):" "}}],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"],[/\n{3,}/g,"\n\n"],/^\s+|\s+$/g]);v=x.encode(v);if(!s.isCollapsed()){z.execCommand("Delete",false,null)}if(m(o,"array")||(m(o,"array"))){q(o)}else{if(m(o,"string")){q(new RegExp(o,"gi"))}}if(g=="none"){q([[/\n+/g," "]])}else{if(g=="br"){q([[/\n/g,"<br />"]])}else{q([/^\s+|\s+$/g,[/\n\n/g,"</p><p>"],[/\n/g,"<br />"]])}}if((l=v.indexOf("</p><p>"))!=-1){k=v.lastIndexOf("</p><p>");r=s.getNode();e=[];do{if(r.nodeType==1){if(r.nodeName=="TD"||r.nodeName=="BODY"){break}e[e.length]=r}}while(r=r.parentNode);if(e.length>0){p=v.substring(0,l);f="";for(t=0,u=e.length;t<u;t++){p+="</"+e[t].nodeName.toLowerCase()+">";f+="<"+e[e.length-t-1].nodeName.toLowerCase()+">"}if(l==k){v=p+f+v.substring(l+7)}else{v=p+v.substring(l+4,k+4)+f+v.substring(k+7)}}}j.execCommand("mceInsertRawHTML",false,v+'<span id="_plain_text_marker">&nbsp;</span>');window.setTimeout(function(){var h=x.get("_plain_text_marker"),B,i,A,w;s.select(h,false);z.execCommand("Delete",false,null);h=null;B=s.getStart();i=x.getViewPort(n);A=x.getPos(B).y;w=B.clientHeight;if((A<i.y)||(A+w>i.y+i.h)){z.body.scrollTop=A<i.y?A:A-i.h+25}},0)}},_legacySupport:function(){var f=this,e=f.editor;e.addCommand("mcePasteWord",function(){e.windowManager.open({file:f.url+"/pasteword.htm",width:parseInt(b(e,"paste_dialog_width")),height:parseInt(b(e,"paste_dialog_height")),inline:1})});if(b(e,"paste_text_use_dialog")){e.addCommand("mcePasteText",function(){e.windowManager.open({file:f.url+"/pastetext.htm",width:parseInt(b(e,"paste_dialog_width")),height:parseInt(b(e,"paste_dialog_height")),inline:1})})}e.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_enable_default_filters:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_text_use_dialog:false,paste_text_sticky:false,paste_text_sticky_default:false,paste_text_notifyalways:false,paste_text_linebreaktype:"p",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){return false}});d.pasteAsPlainText=b(d,"paste_text_sticky_default");function h(m,k){var l=d.dom,i,j;f.onPreProcess.dispatch(f,m);m.node=l.create("div",0,m.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){j=l.select("p,h1,h2,h3,h4,h5,h6,pre",m.node);if(j.length==1&&m.content.indexOf("__MCE_ITEM__")===-1){l.remove(j.reverse(),true)}}}f.onPostProcess.dispatch(f,m);m.content=d.serializer.serialize(m.node,{getInner:1});if((!k)&&(d.pasteAsPlainText)){f._insertPlainText(d,l,m.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(m.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,t,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:r.replace(/\r?\n/g,"<br />")});return}}if(o.get("_mcePaste")){return}l=o.add(q,"div",{id:"_mcePaste","class":"mcePaste","data-mce-bogus":"1"},"\uFEFF\uFEFF");if(q!=d.getDoc().body){i=o.getPos(d.selection.getStart(),q).y}else{i=q.scrollTop+o.getViewPort().y}o.setStyles(l,{position:"absolute",left:-10000,top:i,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){t=k.getRng();j=o.doc.body.createTextRange();j.moveToElementText(l);j.execCommand("Paste");o.remove(l);if(l.innerHTML==="\uFEFF\uFEFF"){d.execCommand("mcePasteWord");s.preventDefault();return}k.setRng(t);k.setContent("");setTimeout(function(){h({content:l.innerHTML})},0);return tinymce.dom.Event.cancel(s)}else{function m(n){n.preventDefault()}o.bind(d.getDoc(),"mousedown",m);o.bind(d.getDoc(),"keydown",m);p=d.selection.getRng();l=l.firstChild;j=d.getDoc().createRange();j.setStart(l,0);j.setEnd(l,2);k.setRng(j);window.setTimeout(function(){var u="",n;if(!o.select("div.mcePaste > div.mcePaste").length){n=o.select("div.mcePaste");c(n,function(w){var v=w.firstChild;if(v&&v.nodeName=="DIV"&&v.style.marginTop&&v.style.backgroundColor){o.remove(v,1)}c(o.select("span.Apple-style-span",w),function(x){o.remove(x,1)});c(o.select("br[data-mce-bogus]",w),function(x){o.remove(x)});if(w.parentNode.className!="mcePaste"){u+=w.innerHTML}})}else{u="<pre>"+o.encode(r).replace(/\r?\n/g,"<br />")+"</pre>"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},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}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9){d([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g,"$1"]])}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(j)||e.wordContent){e.wordContent=true;d([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(k,"paste_convert_middot_lists")){d([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/&quot;/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l<d.length;l++){o=d[l];j=h.getStyle(m,o);if(j){n[o]=j;k++}}}h.setAttrib(m,"style","");if(d&&k>0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f<d){n=tinymce.inArray(m,f);o=i.getParents(h.parentNode,s);h=o[o.length-1-n]||h}}}c(i.select("span",t),function(v){var p=v.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(j,x,v){var t,u,l,k,r,e,p,f,n=j.getWin(),z=j.getDoc(),s=j.selection,m=tinymce.is,y=tinymce.inArray,g=b(j,"paste_text_linebreaktype"),o=b(j,"paste_text_replacements");function q(d){c(d,function(h){if(h.constructor==RegExp){v=v.replace(h,"")}else{v=v.replace(h[0],h[1])}})}if((typeof(v)==="string")&&(v.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(v)){q([/[\n\r]+/g])}else{q([/\r+/g])}q([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"],[/\n{3,}/g,"\n\n"],/^\s+|\s+$/g]);v=x.decode(tinymce.html.Entities.encodeRaw(v));if(!s.isCollapsed()){z.execCommand("Delete",false,null)}if(m(o,"array")||(m(o,"array"))){q(o)}else{if(m(o,"string")){q(new RegExp(o,"gi"))}}if(g=="none"){q([[/\n+/g," "]])}else{if(g=="br"){q([[/\n/g,"<br />"]])}else{q([/^\s+|\s+$/g,[/\n\n/g,"</p><p>"],[/\n/g,"<br />"]])}}if((l=v.indexOf("</p><p>"))!=-1){k=v.lastIndexOf("</p><p>");r=s.getNode();e=[];do{if(r.nodeType==1){if(r.nodeName=="TD"||r.nodeName=="BODY"){break}e[e.length]=r}}while(r=r.parentNode);if(e.length>0){p=v.substring(0,l);f="";for(t=0,u=e.length;t<u;t++){p+="</"+e[t].nodeName.toLowerCase()+">";f+="<"+e[e.length-t-1].nodeName.toLowerCase()+">"}if(l==k){v=p+f+v.substring(l+7)}else{v=p+v.substring(l+4,k+4)+f+v.substring(k+7)}}}j.execCommand("mceInsertRawHTML",false,v+'<span id="_plain_text_marker">&nbsp;</span>');window.setTimeout(function(){var d=x.get("_plain_text_marker"),A,h,w,i;s.select(d,false);z.execCommand("Delete",false,null);d=null;A=s.getStart();h=x.getViewPort(n);w=x.getPos(A).y;i=A.clientHeight;if((w<h.y)||(w+i>h.y+h.h)){z.body.scrollTop=w<h.y?w:w-h.h+25}},0)}},_legacySupport:function(){var e=this,d=e.editor;d.addCommand("mcePasteWord",function(){d.windowManager.open({file:e.url+"/pasteword.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})});if(b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(){d.windowManager.open({file:e.url+"/pastetext.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})})}d.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
index 4c3bf6542..ef5fe3a7c 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
@@ -10,9 +10,9 @@
 

 (function() {

 	var each = tinymce.each,

-		entities = null,

 		defs = {

 			paste_auto_cleanup_on_paste : true,

+			paste_enable_default_filters : true,

 			paste_block_drop : false,

 			paste_retain_style_properties : "none",

 			paste_strip_class_attributes : "mso",

@@ -25,6 +25,7 @@
 			paste_dialog_height : "400",

 			paste_text_use_dialog : false,

 			paste_text_sticky : false,

+			paste_text_sticky_default : false,

 			paste_text_notifyalways : false,

 			paste_text_linebreaktype : "p",

 			paste_text_replacements : [

@@ -63,13 +64,19 @@
 				ed.execCallback('paste_postprocess', pl, o);

 			});

 

+			ed.onKeyDown.addToTop(function(ed, e) {

+				// Block ctrl+v from adding an undo level since the default logic in tinymce.Editor will add that

+				if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45))

+					return false; // Stop other listeners

+			});

+

 			// Initialize plain text flag

-			ed.pasteAsPlainText = false;

+			ed.pasteAsPlainText = getParam(ed, 'paste_text_sticky_default');

 

 			// This function executes the process handlers and inserts the contents

 			// force_rich overrides plain text mode set by user, important for pasting with execCommand

 			function process(o, force_rich) {

-				var dom = ed.dom;

+				var dom = ed.dom, rng, nodes;

 

 				// Execute pre process handlers

 				t.onPreProcess.dispatch(t, o);

@@ -77,6 +84,19 @@
 				// Create DOM structure

 				o.node = dom.create('div', 0, o.content);

 

+				// If pasting inside the same element and the contents is only one block

+				// remove the block and keep the text since Firefox will copy parts of pre and h1-h6 as a pre element

+				if (tinymce.isGecko) {

+					rng = ed.selection.getRng(true);

+					if (rng.startContainer == rng.endContainer && rng.startContainer.nodeType == 3) {

+						nodes = dom.select('p,h1,h2,h3,h4,h5,h6,pre', o.node);

+

+						// Is only one block node and it doesn't contain word stuff

+						if (nodes.length == 1 && o.content.indexOf('__MCE_ITEM__') === -1)

+							dom.remove(nodes.reverse(), true);

+					}

+				}

+

 				// Execute post process handlers

 				t.onPostProcess.dispatch(t, o);

 

@@ -91,9 +111,6 @@
 						ed.pasteAsPlainText = false;

 						ed.controlManager.setActive("pastetext", false);

 					}

-				} else if (/<(p|h[1-6]|ul|ol)/.test(o.content)) {

-					// Handle insertion of contents containing block elements separately

-					t._insertBlockContent(ed, dom, o.content);

 				} else {

 					t._insert(o.content);

 				}

@@ -132,26 +149,30 @@
 			// hidden div and placing the caret inside it and after the browser paste

 			// is done it grabs that contents and processes that

 			function grabContent(e) {

-				var n, or, rng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY;

+				var n, or, rng, oldRng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY, textContent;

 

 				// Check if browser supports direct plaintext access

-				if (ed.pasteAsPlainText && (e.clipboardData || dom.doc.dataTransfer)) {

-					e.preventDefault();

-					process({content : (e.clipboardData || dom.doc.dataTransfer).getData('Text')}, true);

-					return;

+				if (e.clipboardData || dom.doc.dataTransfer) {

+					textContent = (e.clipboardData || dom.doc.dataTransfer).getData('Text');

+

+					if (ed.pasteAsPlainText) {

+						e.preventDefault();

+						process({content : textContent.replace(/\r?\n/g, '<br />')});

+						return;

+					}

 				}

 

 				if (dom.get('_mcePaste'))

 					return;

 

 				// Create container to paste into

-				n = dom.add(body, 'div', {id : '_mcePaste', 'class' : 'mcePaste'}, '\uFEFF');

+				n = dom.add(body, 'div', {id : '_mcePaste', 'class' : 'mcePaste', 'data-mce-bogus' : '1'}, '\uFEFF\uFEFF');

 

 				// If contentEditable mode we need to find out the position of the closest element

 				if (body != ed.getDoc().body)

 					posY = dom.getPos(ed.selection.getStart(), body).y;

 				else

-					posY = body.scrollTop;

+					posY = body.scrollTop + dom.getViewPort().y;

 

 				// Styles needs to be applied after the element is added to the document since WebKit will otherwise remove all styles

 				dom.setStyles(n, {

@@ -164,6 +185,9 @@
 				});

 

 				if (tinymce.isIE) {

+					// Store away the old range

+					oldRng = sel.getRng();

+

 					// Select the container

 					rng = dom.doc.body.createTextRange();

 					rng.moveToElementText(n);

@@ -174,14 +198,23 @@
 

 					// Check if the contents was changed, if it wasn't then clipboard extraction failed probably due

 					// to IE security settings so we pass the junk though better than nothing right

-					if (n.innerHTML === '\uFEFF') {

+					if (n.innerHTML === '\uFEFF\uFEFF') {

 						ed.execCommand('mcePasteWord');

 						e.preventDefault();

 						return;

 					}

 

-					// Process contents

-					process({content : n.innerHTML});

+					// Restore the old range and clear the contents before pasting

+					sel.setRng(oldRng);

+					sel.setContent('');

+

+					// For some odd reason we need to detach the the mceInsertContent call from the paste event

+					// It's like IE has a reference to the parent element that you paste in and the selection gets messed up

+					// when it tries to restore the selection

+					setTimeout(function() {

+						// Process contents

+						process({content : n.innerHTML});

+					}, 0);

 

 					// Block the real paste event

 					return tinymce.dom.Event.cancel(e);

@@ -196,34 +229,51 @@
 

 					or = ed.selection.getRng();

 

-					// Move caret into hidden div

+					// Move select contents inside DIV

 					n = n.firstChild;

 					rng = ed.getDoc().createRange();

 					rng.setStart(n, 0);

-					rng.setEnd(n, 1);

+					rng.setEnd(n, 2);

 					sel.setRng(rng);

 

 					// Wait a while and grab the pasted contents

 					window.setTimeout(function() {

-						var h = '', nl = dom.select('div.mcePaste');

+						var h = '', nl;

 

-						// WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string

-						each(nl, function(n) {

-							// WebKit duplicates the divs so we need to remove them

-							each(dom.select('div.mcePaste', n), function(n) {

-								dom.remove(n, 1);

-							});

+						// Paste divs duplicated in paste divs seems to happen when you paste plain text so lets first look for that broken behavior in WebKit

+						if (!dom.select('div.mcePaste > div.mcePaste').length) {

+							nl = dom.select('div.mcePaste');

 

-							// Remove apply style spans

-							each(dom.select('span.Apple-style-span', n), function(n) {

-								dom.remove(n, 1);

-							});

+							// WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string

+							each(nl, function(n) {

+								var child = n.firstChild;

 

-							h += n.innerHTML;

-						});

+								// WebKit inserts a DIV container with lots of odd styles

+								if (child && child.nodeName == 'DIV' && child.style.marginTop && child.style.backgroundColor) {

+									dom.remove(child, 1);

+								}

+

+								// Remove apply style spans

+								each(dom.select('span.Apple-style-span', n), function(n) {

+									dom.remove(n, 1);

+								});

+

+								// Remove bogus br elements

+								each(dom.select('br[data-mce-bogus]', n), function(n) {

+									dom.remove(n);

+								});

+

+								// WebKit will make a copy of the DIV for each line of plain text pasted and insert them into the DIV

+								if (n.parentNode.className != 'mcePaste')

+									h += n.innerHTML;

+							});

+						} else {

+							// Found WebKit weirdness so force the content into plain text mode

+							h = '<pre>' + dom.encode(textContent).replace(/\r?\n/g, '<br />') + '</pre>';

+						}

 

 						// Remove the nodes

-						each(nl, function(n) {

+						each(dom.select('div.mcePaste'), function(n) {

 							dom.remove(n);

 						});

 

@@ -244,7 +294,7 @@
 			if (getParam(ed, "paste_auto_cleanup_on_paste")) {

 				// Is it's Opera or older FF use key handler

 				if (tinymce.isOpera || /Firefox\/2/.test(navigator.userAgent)) {

-					ed.onKeyDown.add(function(ed, e) {

+					ed.onKeyDown.addToTop(function(ed, e) {

 						if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45))

 							grabContent(e);

 					});

@@ -256,17 +306,19 @@
 				}

 			}

 

-			// Block all drag/drop events

-			if (getParam(ed, "paste_block_drop")) {

-				ed.onInit.add(function() {

+			ed.onInit.add(function() {

+				ed.controlManager.setActive("pastetext", ed.pasteAsPlainText);

+

+				// Block all drag/drop events

+				if (getParam(ed, "paste_block_drop")) {

 					ed.dom.bind(ed.getBody(), ['dragend', 'dragover', 'draggesture', 'dragdrop', 'drop', 'drag'], function(e) {

 						e.preventDefault();

 						e.stopPropagation();

 

 						return false;

 					});

-				});

-			}

+				}

+			});

 

 			// Add legacy support

 			t._legacySupport();

@@ -283,8 +335,6 @@
 		},

 

 		_preProcess : function(pl, o) {

-			//console.log('Before preprocess:' + o.content);

-

 			var ed = this.editor,

 				h = o.content,

 				grep = tinymce.grep,

@@ -292,6 +342,8 @@
 				trim = tinymce.trim,

 				len, stripClass;

 

+			//console.log('Before preprocess:' + o.content);

+

 			function process(items) {

 				each(items, function(v) {

 					// Remove or replace

@@ -301,6 +353,14 @@
 						h = h.replace(v[0], v[1]);

 				});

 			}

+			

+			if (ed.settings.paste_enable_default_filters == false) {

+				return;

+			}

+

+			// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser

+			if (tinymce.isIE && document.documentMode >= 9)

+				process([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g, '$1']]);

 

 			// Detect Word content and process it more aggressive

 			if (/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(h) || o.wordContent) {

@@ -320,7 +380,8 @@
 				if (getParam(ed, "paste_convert_middot_lists")) {

 					process([

 						[/<!--\[if !supportLists\]-->/gi, '$&__MCE_ITEM__'],					// Convert supportLists to a list item marker

-						[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi, '$1__MCE_ITEM__']		// Convert mso-list and symbol spans to item markers

+						[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi, '$1__MCE_ITEM__'],		// Convert mso-list and symbol spans to item markers

+						[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi, '$1__MCE_ITEM__']				// Convert mso-list and symbol paragraphs to item markers (FF)

 					]);

 				}

 

@@ -472,6 +533,11 @@
 				]);

 			}

 

+			process([

+				// Copy paste from Java like Open Office will produce this junk on FF

+				[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi, '']

+			]);

+

 			// Class attribute options are: leave all as-is ("none"), remove all ("all"), or remove only those starting with mso ("mso").

 			// Note:-  paste_strip_class_attributes: "none", verify_css_classes: true is also a good variation.

 			stripClass = getParam(ed, "paste_strip_class_attributes");

@@ -491,7 +557,7 @@
 				};

 

 				h = h.replace(/ class="([^"]+)"/gi, removeClasses);

-				h = h.replace(/ class=(\w+)/gi, removeClasses);

+				h = h.replace(/ class=([\-\w]+)/gi, removeClasses);

 			}

 

 			// Remove spans option

@@ -510,6 +576,10 @@
 		_postProcess : function(pl, o) {

 			var t = this, ed = t.editor, dom = ed.dom, styleProps;

 

+			if (ed.settings.paste_enable_default_filters == false) {

+				return;

+			}

+			

 			if (o.wordContent) {

 				// Remove named anchors or TOC links

 				each(dom.select('a', o.node), function(a) {

@@ -561,14 +631,14 @@
 			if (getParam(ed, "paste_remove_styles") || (getParam(ed, "paste_remove_styles_if_webkit") && tinymce.isWebKit)) {

 				each(dom.select('*[style]', o.node), function(el) {

 					el.removeAttribute('style');

-					el.removeAttribute('_mce_style');

+					el.removeAttribute('data-mce-style');

 				});

 			} else {

 				if (tinymce.isWebKit) {

 					// We need to compress the styles on WebKit since if you paste <img border="0" /> it will become <img border="0" style="... lots of junk ..." />

 					// Removing the mce_style that contains the real value will force the Serializer engine to compress the styles

 					each(dom.select('*', o.node), function(el) {

-						el.removeAttribute('_mce_style');

+						el.removeAttribute('data-mce-style');

 					});

 				}

 			}

@@ -591,11 +661,11 @@
 				val = p.innerHTML.replace(/<\/?\w+[^>]*>/gi, '').replace(/&nbsp;/g, '\u00a0');

 

 				// Detect unordered lists look for bullets

-				if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(val))

+				if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(val))

 					type = 'ul';

 

 				// Detect ordered lists 1., a. or ixv.

-				if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(val))

+				if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(val))

 					type = 'ol';

 

 				// Check if node value matches the list pattern: o&nbsp;&nbsp;

@@ -625,9 +695,9 @@
 						var html = span.innerHTML.replace(/<\/?\w+[^>]*>/gi, '');

 

 						// Remove span with the middot or the number

-						if (type == 'ul' && /^[\u2022\u00b7\u00a7\u00d8o]/.test(html))

+						if (type == 'ul' && /^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(html))

 							dom.remove(span);

-						else if (/^[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(html))

+						else if (/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(html))

 							dom.remove(span);

 					});

 

@@ -635,7 +705,7 @@
 

 					// Remove middot/list items

 					if (type == 'ul')

-						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*(&nbsp;|\u00a0)+\s*/, '');

+						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/, '');

 					else

 						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/, '');

 

@@ -656,65 +726,6 @@
 		},

 

 		/**

-		 * This method will split the current block parent and insert the contents inside the split position.

-		 * This logic can be improved so text nodes at the start/end remain in the start/end block elements

-		 */

-		_insertBlockContent : function(ed, dom, content) {

-			var parentBlock, marker, sel = ed.selection, last, elm, vp, y, elmHeight, markerId = 'mce_marker';

-

-			function select(n) {

-				var r;

-

-				if (tinymce.isIE) {

-					r = ed.getDoc().body.createTextRange();

-					r.moveToElementText(n);

-					r.collapse(false);

-					r.select();

-				} else {

-					sel.select(n, 1);

-					sel.collapse(false);

-				}

-			}

-

-			// Insert a marker for the caret position

-			this._insert('<span id="' + markerId + '">&nbsp;</span>', 1);

-			marker = dom.get(markerId);

-			parentBlock = dom.getParent(marker, 'p,h1,h2,h3,h4,h5,h6,ul,ol,th,td');

-

-			// If it's a parent block but not a table cell

-			if (parentBlock && !/TD|TH/.test(parentBlock.nodeName)) {

-				// Split parent block

-				marker = dom.split(parentBlock, marker);

-

-				// Insert nodes before the marker

-				each(dom.create('div', 0, content).childNodes, function(n) {

-					last = marker.parentNode.insertBefore(n.cloneNode(true), marker);

-				});

-

-				// Move caret after marker

-				select(last);

-			} else {

-				dom.setOuterHTML(marker, content);

-				sel.select(ed.getBody(), 1);

-				sel.collapse(0);

-			}

-

-			// Remove marker if it's left

-			while (elm = dom.get(markerId))

-				dom.remove(elm);

-

-			// Get element, position and height

-			elm = sel.getStart();

-			vp = dom.getViewPort(ed.getWin());

-			y = ed.dom.getPos(elm).y;

-			elmHeight = elm.clientHeight;

-

-			// Is element within viewport if not then scroll it into view

-			if (y < vp.y || y + elmHeight > vp.y + vp.h)

-				ed.getDoc().body.scrollTop = y < vp.y ? y : y - vp.h + 25;

-		},

-

-		/**

 		 * Inserts the specified contents at the caret position.

 		 */

 		_insert : function(h, skip_undo) {

@@ -724,8 +735,7 @@
 			if (!ed.selection.isCollapsed() && r.startContainer != r.endContainer)

 				ed.getDoc().execCommand('Delete', false, null);

 

-			// It's better to use the insertHTML method on Gecko since it will combine paragraphs correctly before inserting the contents

-			ed.execCommand(tinymce.isGecko ? 'insertHTML' : 'mceInsertContent', false, h, {skip_undo : skip_undo});

+			ed.execCommand('mceInsertContent', false, h, {skip_undo : skip_undo});

 		},

 

 		/**

@@ -757,9 +767,6 @@
 			};

 

 			if ((typeof(h) === "string") && (h.length > 0)) {

-				if (!entities)

-					entities = ("34,quot,38,amp,39,apos,60,lt,62,gt," + ed.serializer.settings.entities).split(",");

-

 				// If HTML content with line-breaking tags, then remove all cr/lf chars because only tags will break a line

 				if (/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(h)) {

 					process([

@@ -778,26 +785,12 @@
 					[/<\/t[dh]>\s*<t[dh][^>]*>/gi, "\t"],		// Table cells get tabs betweem them

 					/<[a-z!\/?][^>]*>/gi,						// Delete all remaining tags

 					[/&nbsp;/gi, " "],							// Convert non-break spaces to regular spaces (remember, *plain text*)

-					[

-						// HTML entity

-						/&(#\d+|[a-z0-9]{1,10});/gi,

-

-						// Replace with actual character

-						function(e, s) {

-							if (s.charAt(0) === "#") {

-								return String.fromCharCode(s.slice(1));

-							}

-							else {

-								return ((e = inArray(entities, s)) > 0)? String.fromCharCode(entities[e-1]) : " ";

-							}

-						}

-					],

 					[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi, "$1"],	// Cool little RegExp deletes whitespace around linebreak chars.

 					[/\n{3,}/g, "\n\n"],							// Max. 2 consecutive linebreaks

 					/^\s+|\s+$/g									// Trim the front & back

 				]);

 

-				h = dom.encode(h);

+				h = dom.decode(tinymce.html.Entities.encodeRaw(h));

 

 				// Delete any highlighted text before pasting

 				if (!sel.isCollapsed()) {

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
index cd9c985b7..165bc12df 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.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
+(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){window.focus();a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.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/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
index 1433a06a4..4c87e8fa7 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
@@ -12,6 +12,10 @@
 	tinymce.create('tinymce.plugins.SearchReplacePlugin', {

 		init : function(ed, url) {

 			function open(m) {

+				// Keep IE from writing out the f/r character to the editor

+				// instance while initializing a new dialog. See: #3131190

+				window.focus();

+

 				ed.windowManager.open({

 					file : url + '/searchreplace.htm',

 					width : 420 + parseInt(ed.getLang('searchreplace.delta_width', 0)),

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
index c0a624329..80284b9f3 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
@@ -2,14 +2,18 @@ tinyMCEPopup.requireLangPack();
 

 var SearchReplaceDialog = {

 	init : function(ed) {

-		var f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");

+		var t = this, f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");

 

-		this.switchMode(m);

+		t.switchMode(m);

 

 		f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string");

 

 		// Focus input field

 		f[m + '_panel_searchstring'].focus();

+		

+		mcTabs.onChange.add(function(tab_id, panel_id) {

+			t.switchMode(tab_id.substring(0, tab_id.indexOf('_')));

+		});

 	},

 

 	switchMode : function(m) {

@@ -42,21 +46,23 @@ var SearchReplaceDialog = {
 		ca = f[m + '_panel_casesensitivebox'].checked;

 		rs = f['replace_panel_replacestring'].value;

 

+		if (tinymce.isIE) {

+			r = ed.getDoc().selection.createRange();

+		}

+

 		if (s == '')

 			return;

 

 		function fix() {

 			// Correct Firefox graphics glitches

+			// TODO: Verify if this is actually needed any more, maybe it was for very old FF versions? 

 			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);

+			ed.selection.setContent(rs); // Needs to be duplicated due to selection bug in IE

 		};

 

 		// IE flags

@@ -70,6 +76,9 @@ var SearchReplaceDialog = {
 				ed.selection.collapse(true);

 

 				if (tinymce.isIE) {

+					ed.focus();

+					r = ed.getDoc().selection.createRange();

+

 					while (r.findText(s, b ? -1 : 1, fl)) {

 						r.scrollIntoView();

 						r.select();

@@ -111,6 +120,9 @@ var SearchReplaceDialog = {
 			return;

 

 		if (tinymce.isIE) {

+			ed.focus();

+			r = ed.getDoc().selection.createRange();

+

 			if (r.findText(s, b ? -1 : 1, fl)) {

 				r.scrollIntoView();

 				r.select();

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
index d0424cfc9..5a22d8aa4 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
@@ -8,27 +8,28 @@
 	<script type="text/javascript" src="js/searchreplace.js"></script>

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

 </head>

-<body style="display:none;">

+<body style="display:none;" role="application" aria-labelledby="app_title">

+<span id="app_title" style="display:none">{#searchreplace_dlg.replace_title}</span>

 <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>

+			<li id="search_tab" aria-controls="search_panel"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>

+			<li id="replace_tab" aria-controls="replace_panel"><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">

+			<table role="presentation" 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>

+					<td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" aria-required="true" /></td>

 				</tr>

 				<tr>

 					<td colspan="2">

-						<table border="0" cellspacing="0" cellpadding="0" class="direction">

-							<tr>

-								<td><label>{#searchreplace_dlg.direction}</label></td>

+						<table role="presentation" border="0" cellspacing="0" cellpadding="0" class="direction">

+							<tr role="group" aria-labelledby="search_panel_backwards_label">

+								<td><label id="search_panel_backwards_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>

@@ -39,7 +40,7 @@
 				</tr>

 				<tr>

 					<td colspan="2">

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

+						<table role="presentation" 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>

@@ -51,20 +52,20 @@
 		</div>

 

 		<div id="replace_panel" class="panel">

-			<table border="0" cellspacing="0" cellpadding="2">

+			<table role="presentation" 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>

+					<td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" aria-required="true" /></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>

+					<td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" aria-required="true" /></td>

 				</tr>

 				<tr>

 					<td colspan="2">

-						<table border="0" cellspacing="0" cellpadding="0" class="direction">

-							<tr>

-								<td><label>{#searchreplace_dlg.direction}</label></td>

+						<table role="presentation" border="0" cellspacing="0" cellpadding="0" class="direction">

+							<tr role="group" aria-labelledby="replace_panel_dir_label">

+								<td><label id="replace_panel_dir_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>

@@ -75,7 +76,7 @@
 				</tr>

 				<tr>

 					<td colspan="2">

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

+						<table role="presentation" 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>

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
index a4d2925e4..90cde6a54 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=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(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});e.onInit.add(function(){if(e.settings.content_css!==false){e.dom.loadCSS(f+"/css/content.css")}});e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.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(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){l.setSelected(1);f.selectedItem.setSelected(0);f.selectedItem=l;f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);if(n==f.selectedLang){f.selectedItem=l}})});return g}},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(e){var f=this.editor,h=f.dom,g=f.selection,d=g.getBookmark();c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!e||h.decode(i.innerHTML)==e){h.remove(i,1)}}});g.moveToBookmark(d)},_markWords:function(o){var i,h,g,f,e,n="",k=this.editor,p=this._getSeparators(),j=k.dom,d=[];var l=k.selection,m=l.getBookmark();c(o,function(q){n+=(n?"|":"")+q});i=new RegExp("(["+p+"])("+n+")(["+p+"])","g");h=new RegExp("^("+n+")","g");g=new RegExp("("+n+")(["+p+"]?)$","g");f=new RegExp("^("+n+")(["+p+"]?)$","g");e=new RegExp("("+n+")(["+p+"])","g");this._walk(this.editor.getBody(),function(q){if(q.nodeType==3){d.push(q)}});c(d,function(r){var q;if(r.nodeType==3){q=r.nodeValue;if(i.test(q)||h.test(q)||g.test(q)||f.test(q)){q=j.encode(q);q=q.replace(e,'<span class="mceItemHiddenSpellWord">$1</span>$2');q=q.replace(g,'<span class="mceItemHiddenSpellWord">$1</span>$2');j.replace(j.create("span",{"class":"mceItemHidden"},q),r)}}});l.moveToBookmark(m)},_showMenu:function(g,i){var h=this,g=h.editor,d=h._menu,k,j=g.dom,f=j.getViewPort(g.getWin());if(!d){k=b.getPos(g.getContentAreaContainer());d=g.controlManager.createDropMenu("spellcheckermenu",{offset_x:k.x,offset_y:k.y,"class":"mceNoIcons"});h._menu=d}if(j.hasClass(i.target,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);h._sendRPC("getSuggestions",[h.selectedLang,j.decode(i.target.innerHTML)],function(l){var e;d.removeAll();if(l.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(l,function(m){d.add({title:m,onclick:function(){j.replace(g.getDoc().createTextNode(m),i.target);h._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}e=h.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var m=i.target.innerHTML;j.remove(i.target,1);h._checkDone();if(e){g.setProgressState(1);h._sendRPC("ignoreWord",[h.selectedLang,m],function(n){g.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var m=i.target.innerHTML;h._removeWords(j.decode(m));h._checkDone();if(e){g.setProgressState(1);h._sendRPC("ignoreWords",[h.selectedLang,m],function(n){g.setProgressState(0)})}}});if(h.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var m=i.target.innerHTML;j.remove(i.target,1);h._checkDone();g.setProgressState(1);h._sendRPC("learnWord",[h.selectedLang,m],function(n){g.setProgressState(0)})}})}d.update()});g.selection.select(i.target);k=j.getPos(i.target);d.showMenu(k.x,k.y+i.target.offsetHeight-f.y);return tinymce.dom.Event.cancel(i)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=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(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});if(e.settings.content_css!==false){e.contentCSS.push(f+"/css/content.css")}e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.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(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){if(n==f.selectedLang){return}l.setSelected(1);f.selectedItem.setSelected(0);f.selectedItem=l;f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);if(n==f.selectedLang){f.selectedItem=l}})});return g}},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(e){var f=this.editor,h=f.dom,g=f.selection,d=g.getBookmark();c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!e||h.decode(i.innerHTML)==e){h.remove(i,1)}}});g.moveToBookmark(d)},_markWords:function(l){var g=this.editor,f=g.dom,j=g.getDoc(),h=g.selection,i=h.getBookmark(),d=[],k=l.join("|"),m=this._getSeparators(),e=new RegExp("(^|["+m+"])("+k+")(?=["+m+"]|$)","g");this._walk(g.getBody(),function(o){if(o.nodeType==3){d.push(o)}});c(d,function(t){var r,q,o,s,p=t.nodeValue;if(e.test(p)){p=f.encode(p);q=f.create("span",{"class":"mceItemHidden"});if(tinymce.isIE){p=p.replace(e,"$1<mcespell>$2</mcespell>");while((s=p.indexOf("<mcespell>"))!=-1){o=p.substring(0,s);if(o.length){r=j.createTextNode(f.decode(o));q.appendChild(r)}p=p.substring(s+10);s=p.indexOf("</mcespell>");o=p.substring(0,s);p=p.substring(s+11);q.appendChild(f.create("span",{"class":"mceItemHiddenSpellWord"},o))}if(p.length){r=j.createTextNode(f.decode(p));q.appendChild(r)}}else{q.innerHTML=p.replace(e,'$1<span class="mceItemHiddenSpellWord">$2</span>')}f.replace(q,t)}});h.moveToBookmark(i)},_showMenu:function(h,j){var i=this,h=i.editor,d=i._menu,l,k=h.dom,g=k.getViewPort(h.getWin()),f=j.target;j=0;if(!d){d=h.controlManager.createDropMenu("spellcheckermenu",{"class":"mceNoIcons"});i._menu=d}if(k.hasClass(f,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);i._sendRPC("getSuggestions",[i.selectedLang,k.decode(f.innerHTML)],function(m){var e;d.removeAll();if(m.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(m,function(n){d.add({title:n,onclick:function(){k.replace(h.getDoc().createTextNode(n),f);i._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}e=i.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var n=f.innerHTML;i._removeWords(k.decode(n));i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWords",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});if(i.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();h.setProgressState(1);i._sendRPC("learnWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}})}d.update()});l=k.getPos(h.getContentAreaContainer());d.settings.offset_x=l.x;d.settings.offset_y=l.y;h.selection.select(f);l=k.getPos(f);d.showMenu(l.x,l.y+f.offsetHeight-g.y);return tinymce.dom.Event.cancel(j)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
index a924fabac..9757aec9c 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
@@ -70,10 +70,8 @@
 					t._done();

 			});

 

-			ed.onInit.add(function() {

-				if (ed.settings.content_css !== false)

-					ed.dom.loadCSS(url + '/css/content.css');

-			});

+			if (ed.settings.content_css !== false)

+				ed.contentCSS.push(url + '/css/content.css');

 

 			ed.onClick.add(t._showMenu, t);

 			ed.onContextMenu.add(t._showMenu, t);

@@ -132,6 +130,9 @@
 						var o = {icon : 1}, mi;

 

 						o.onclick = function() {

+							if (v == t.selectedLang) {

+								return;

+							}

 							mi.setSelected(1);

 							t.selectedItem.setSelected(0);

 							t.selectedItem = mi;

@@ -220,21 +221,11 @@
 		},

 

 		_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');

+			var ed = this.editor, dom = ed.dom, doc = ed.getDoc(), se = ed.selection, b = se.getBookmark(), nl = [],

+				w = wl.join('|'), re = this._getSeparators(), rx = new RegExp('(^|[' + re + '])(' + w + ')(?=[' + re + ']|$)', 'g');

 

 			// Collect all text nodes

-			this._walk(this.editor.getBody(), function(n) {

+			this._walk(ed.getBody(), function(n) {

 				if (n.nodeType == 3) {

 					nl.push(n);

 				}

@@ -242,18 +233,49 @@
 

 			// 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);

+				var node, elem, txt, pos, v = n.nodeValue;

+

+				if (rx.test(v)) {

+					// Encode the content

+					v = dom.encode(v);

+					// Create container element

+					elem = dom.create('span', {'class' : 'mceItemHidden'});

+

+					// Following code fixes IE issues by creating text nodes

+					// using DOM methods instead of innerHTML.

+					// Bug #3124: <PRE> elements content is broken after spellchecking.

+					// Bug #1408: Preceding whitespace characters are removed

+					// @TODO: I'm not sure that both are still issues on IE9.

+					if (tinymce.isIE) {

+						// Enclose mispelled words with temporal tag

+						v = v.replace(rx, '$1<mcespell>$2</mcespell>');

+						// Loop over the content finding mispelled words

+						while ((pos = v.indexOf('<mcespell>')) != -1) {

+							// Add text node for the content before the word

+							txt = v.substring(0, pos);

+							if (txt.length) {

+								node = doc.createTextNode(dom.decode(txt));

+								elem.appendChild(node);

+							}

+							v = v.substring(pos+10);

+							pos = v.indexOf('</mcespell>');

+							txt = v.substring(0, pos);

+							v = v.substring(pos+11);

+							// Add span element for the word

+							elem.appendChild(dom.create('span', {'class' : 'mceItemHiddenSpellWord'}, txt));

+						}

+						// Add text node for the rest of the content

+						if (v.length) {

+							node = doc.createTextNode(dom.decode(v));

+							elem.appendChild(node);

+						}

+					} else {

+						// Other browsers preserve whitespace characters on innerHTML usage

+						elem.innerHTML = v.replace(rx, '$1<span class="mceItemHiddenSpellWord">$2</span>');

 					}

+

+					// Finally, replace the node with the container

+					dom.replace(elem, n);

 				}

 			});

 

@@ -261,26 +283,20 @@
 		},

 

 		_showMenu : function(ed, e) {

-			var t = this, ed = t.editor, m = t._menu, p1, dom = ed.dom, vp = dom.getViewPort(ed.getWin());

+			var t = this, ed = t.editor, m = t._menu, p1, dom = ed.dom, vp = dom.getViewPort(ed.getWin()), wordSpan = e.target;

 

-			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'

-				});

+			e = 0; // Fixes IE memory leak

 

+			if (!m) {

+				m = ed.controlManager.createDropMenu('spellcheckermenu', {'class' : 'mceNoIcons'});

 				t._menu = m;

 			}

 

-			if (dom.hasClass(e.target, 'mceItemHiddenSpellWord')) {

+			if (dom.hasClass(wordSpan, 'mceItemHiddenSpellWord')) {

 				m.removeAll();

 				m.add({title : 'spellchecker.wait', 'class' : 'mceMenuItemTitle'}).setDisabled(1);

 

-				t._sendRPC('getSuggestions', [t.selectedLang, dom.decode(e.target.innerHTML)], function(r) {

+				t._sendRPC('getSuggestions', [t.selectedLang, dom.decode(wordSpan.innerHTML)], function(r) {

 					var ignoreRpc;

 

 					m.removeAll();

@@ -289,7 +305,7 @@
 						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);

+								dom.replace(ed.getDoc().createTextNode(v), wordSpan);

 								t._checkDone();

 							}});

 						});

@@ -302,9 +318,9 @@
 					m.add({

 						title : 'spellchecker.ignore_word',

 						onclick : function() {

-							var word = e.target.innerHTML;

+							var word = wordSpan.innerHTML;

 

-							dom.remove(e.target, 1);

+							dom.remove(wordSpan, 1);

 							t._checkDone();

 

 							// tell the server if we need to

@@ -320,7 +336,7 @@
 					m.add({

 						title : 'spellchecker.ignore_words',

 						onclick : function() {

-							var word = e.target.innerHTML;

+							var word = wordSpan.innerHTML;

 

 							t._removeWords(dom.decode(word));

 							t._checkDone();

@@ -340,9 +356,9 @@
 						m.add({

 							title : 'spellchecker.learn_word',

 							onclick : function() {

-								var word = e.target.innerHTML;

+								var word = wordSpan.innerHTML;

 

-								dom.remove(e.target, 1);

+								dom.remove(wordSpan, 1);

 								t._checkDone();

 

 								ed.setProgressState(1);

@@ -356,9 +372,13 @@
 					m.update();

 				});

 

-				ed.selection.select(e.target);

-				p1 = dom.getPos(e.target);

-				m.showMenu(p1.x, p1.y + e.target.offsetHeight - vp.y);

+				p1 = dom.getPos(ed.getContentAreaContainer());

+				m.settings.offset_x = p1.x;

+				m.settings.offset_y = p1.y;

+

+				ed.selection.select(wordSpan);

+				p1 = dom.getPos(wordSpan);

+				m.showMenu(p1.x, p1.y + wordSpan.offsetHeight - vp.y);

 

 				return tinymce.dom.Event.cancel(e);

 			} else

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
index a8dd93dec..c8e160424 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
@@ -177,11 +177,7 @@ function setupFormData() {
 

 	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_float', ce.style.cssFloat || ce.style.styleFloat, true, true);

 

 	selectByValue(f, 'box_clear', ce.style.clear, true, true);

 

@@ -440,9 +436,7 @@ function generateCSS() {
 	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.cssFloat = f.box_float.value;

 

 	ce.style.clear = f.box_clear.value;

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
index 5026313e2..df0a173c7 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
@@ -59,5 +59,12 @@ visibility:"Visibility",
 zindex:"Z-index",

 overflow:"Overflow",

 placement:"Placement",

-clip:"Clip"

+clip:"Clip",

+text:"Text",

+background:"Background",

+block:"Block",

+box:"Box",

+border:"Border",

+list:"List",

+position:"Position"

 });
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm
index 549ed0408..b5a3d15d9 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm
@@ -10,277 +10,317 @@
 	<link href="css/props.css" rel="stylesheet" type="text/css" />
 </head>
 
-<body id="styleprops" style="display: none">
+<body id="styleprops" style="display: none" role="application" aria-labelledby="app_title">
+<span id="app_title" style="display:none">{#style_dlg.title}</span>
 <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>
+		<li id="text_tab" class="current" aria-controls="text_panel"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onMouseDown="return false;">{#style_dlg.text_tab}</a></span></li>
+		<li id="background_tab" aria-controls="background_panel"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onMouseDown="return false;">{#style_dlg.background_tab}</a></span></li>
+		<li id="block_tab" aria-controls="block_panel"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onMouseDown="return false;">{#style_dlg.block_tab}</a></span></li>
+		<li id="box_tab" aria-controls="box_panel"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onMouseDown="return false;">{#style_dlg.box_tab}</a></span></li>
+		<li id="border_tab" aria-controls="border_panel"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onMouseDown="return false;">{#style_dlg.border_tab}</a></span></li>
+		<li id="list_tab" aria-controls="list_panel"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onMouseDown="return false;">{#style_dlg.list_tab}</a></span></li>
+		<li id="positioning_tab" aria-controls="positioning_panel"><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>
+	<fieldset>
+		<legend>{#style_dlg.text}</legend>
+		<table role="presentation" 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 role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="text_size_measurement_label" for="text_size_measurement" style="display: none; visibility: hidden;">Text Size Measurement Unit</label>
+								<select id="text_size_measurement" name="text_size_measurement" aria-labelledby="text_size_measurement_label"></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 role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td>
+								<select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
+							</td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="text_lineheight_measurement_label" for="text_lineheight_measurement" style="display: none; visibility: hidden;">Line Height Measurement Unit</label>
+								<select id="text_lineheight_measurement" name="text_lineheight_measurement" aria-labelledby="text_lineheight_measurement_label"></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 role="presentation" 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 role="presentation" 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>
+	</fieldset>
 </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>
+	<fieldset>
+		<legend>{#style_dlg.background}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="background_color">{#style_dlg.background_color}</label></td>
+				<td>
+					<table role="presentation" 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 role="presentation" 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>
+					</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_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_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 role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="background_hpos_measurement_label" for="background_hpos_measurement" style="display: none; visibility: hidden;">Horizontal position measurement unit</label>
+								<select id="background_hpos_measurement" name="background_hpos_measurement" aria-labelledby="background_hpos_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</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 role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
 
-		<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>
+								<label id="background_vpos_measurement_label" for="background_vpos_measurement" style="display: none; visibility: hidden;">Vertical position measurement unit</label>
+								<select id="background_vpos_measurement" name="background_vpos_measurement" aria-labelledby="background_vpos_measurement_label">></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
 </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>
+	<fieldset>
+		<legend>{#style_dlg.block}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="block_wordspacing">{#style_dlg.block_wordspacing}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_wordspacing_measurement_label" for="block_wordspacing_measurement" style="display: none; visibility: hidden;">Word spacing measurement unit</label>
+								<select id="block_wordspacing_measurement" name="block_wordspacing_measurement" aria-labelledby="block_wordspacing_measurement_label"></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_letterspacing">{#style_dlg.block_letterspacing}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_letterspacing_measurement_label" for="block_letterspacing_measurement" style="display: none; visibility: hidden;">Letter spacing measurement unit</label>
+								<select id="block_letterspacing_measurement" name="block_letterspacing_measurement" aria-labelledby="block_letterspacing_measurement_label"></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_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_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_text_indent">{#style_dlg.block_text_indent}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_text_indent_measurement_label" for="block_text_indent_measurement" style="display: none; visibility: hidden;">Text Indent Measurement Unit</label>
 
-		<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>
+								<select id="block_text_indent_measurement" name="block_text_indent_measurement" aria-labelledby="block_text_indent_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</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>
+			<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>
+	</fieldset>
 </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>
+	<fieldset>
+		<legend>{#style_dlg.box}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="box_width">{#style_dlg.box_width}</label></td>
+				<td>
+					<table role="presentation" 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>
+								<label id="box_width_measurement_label" for="box_width_measurement" style="display: none; visibility: hidden;">Box Width Measurement Unit</label>
+								<select id="box_width_measurement" name="box_width_measurement" aria-labelledby="box_width_measurement_label"></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>
+			<tr>
+				<td><label for="box_height">{#style_dlg.box_height}</label></td>
+				<td>
+					<table role="presentation" 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>
+								<label id="box_height_measurement_label" for="box_height_measurement" style="display: none; visibility: hidden;">Box Height Measurement Unit</label>
+								<select id="box_height_measurement" name="box_height_measurement" aria-labelledby="box_height_measurement_label"></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">
+		<table role="presentation" 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>
@@ -288,11 +328,14 @@
 			<tr>
 				<td><label for="box_padding_top">{#style_dlg.top}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="box_padding_top_measurement_label" for="box_padding_top_measurement" style="display: none; visibility: hidden;">Padding Top Measurement Unit</label>
+								<select id="box_padding_top_measurement" name="box_padding_top_measurement" aria-labelledby="box_padding_top_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -300,11 +343,14 @@
 			<tr>
 				<td><label for="box_padding_right">{#style_dlg.right}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="box_padding_right_measurement_label" for="box_padding_right_measurement" style="display: none; visibility: hidden;">Padding Right Measurement Unit</label>
+								<select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled" aria-labelledby="box_padding_right_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -312,11 +358,14 @@
 			<tr>
 				<td><label for="box_padding_bottom">{#style_dlg.bottom}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="box_padding_bottom_measurement_label" for="box_padding_bottom_measurement" style="display: none; visibility: hidden;">Padding Bottom Measurement Unit</label>
+								<select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled" aria-labelledby="box_padding_bottom_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -324,11 +373,14 @@
 			<tr>
 				<td><label for="box_padding_left">{#style_dlg.left}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="box_padding_left_measurement_label" for="box_padding_left_measurement" style="display: none; visibility: hidden;">Padding Left Measurement Unit</label>
+								<select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled" aria-labelledby="box_padding_left_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -341,7 +393,7 @@
 	<fieldset>
 		<legend>{#style_dlg.margin}</legend>
 
-		<table border="0">
+		<table role="presentation" 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>
@@ -349,11 +401,14 @@
 			<tr>
 				<td><label for="box_margin_top">{#style_dlg.top}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="box_margin_top_measurement_label" for="box_margin_top_measurement" style="display: none; visibility: hidden;">Margin Top Measurement Unit</label>
+								<select id="box_margin_top_measurement" name="box_margin_top_measurement" aria-labelledby="box_margin_top_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -361,11 +416,14 @@
 			<tr>
 				<td><label for="box_margin_right">{#style_dlg.right}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="box_margin_right_measurement_label" for="box_margin_right_measurement" style="display: none; visibility: hidden;">Margin Right Measurement Unit</label>
+								<select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled" aria-labelledby="box_margin_right_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -373,11 +431,14 @@
 			<tr>
 				<td><label for="box_margin_bottom">{#style_dlg.bottom}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="box_margin_bottom_measurement_label" for="box_margin_bottom_measurement" style="display: none; visibility: hidden;">Margin Bottom Measurement Unit</label>
+								<select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled" aria-labelledby="box_margin_bottom_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -385,11 +446,14 @@
 			<tr>
 				<td><label for="box_margin_left">{#style_dlg.left}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="box_margin_left_measurement_label" for="box_margin_left_measurement" style="display: none; visibility: hidden;">Margin Left Measurement Unit</label>
+								<select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled" aria-labelledby="box_margin_left_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -401,131 +465,148 @@
 </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>
+	<fieldset>
+		<legend>{#style_dlg.border}</legend>	
+		<table role="presentation" 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 role="presentation" 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>
+							<label id="border_width_top_measurement_label" for="border_width_top_measurement" style="display: none; visibility: hidden;">Width top Measurement Unit</label>
+							<select id="border_width_top_measurement" name="border_width_top_measurement" aria-labelledby="border_width_top_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" 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 role="presentation" 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>
+							<label id="border_width_right_measurement_label" for="border_width_right_measurement" style="display: none; visibility: hidden;">Width Right Measurement Unit</label>
+							<select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled" aria-labelledby="border_width_right_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" 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 role="presentation" 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>
+							<label id="border_width_bottom_measurement_label" for="border_width_bottom_measurement" style="display: none; visibility: hidden;">Width Bottom Measurement Unit</label>
+							<select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled" aria-labelledby="border_width_bottom_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" 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 role="presentation" 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>
+							<label id="border_width_left_measurement_label" for="border_width_left_measurement" style="display: none; visibility: hidden;">Width Left Measurement Unit</label>
+							<select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled" aria-labelledby="border_width_left_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" 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>
-	</td>
-</tr>
-</table>
+	</fieldset>
 </div>
 
 <div id="list_panel" class="panel">
-	<table border="0">
+<fieldset>
+	<legend>{#style_dlg.list}</legend>
+	<table role="presentation" 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>
@@ -541,10 +622,13 @@
 			<td><select id="list_position" name="list_position" class="mceEditableSelect"></select></td>
 		</tr>
 	</table>
+</fieldset>
 </div>
 
 <div id="positioning_panel" class="panel">
-<table border="0">
+<fieldset>
+	<legend>{#style_dlg.position}</legend>
+<table role="presentation" 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>
@@ -555,11 +639,14 @@
 	<tr>
 		<td><label for="positioning_width">{#style_dlg.width}</label></td>
 		<td>
-			<table border="0" cellspacing="0" cellpadding="0">
+			<table role="presentation" 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>
+					<td>
+						<label id="positioning_width_measurement_label" for="positioning_width_measurement" style="display: none; visibility: hidden;">Positioning width Measurement Unit</label>
+						<select id="positioning_width_measurement" name="positioning_width_measurement" aria-labelledby="positioning_width_measurement_label"></select>
+					</td>
 				</tr>
 			</table>
 		</td>
@@ -570,11 +657,14 @@
 	<tr>
 		<td><label for="positioning_height">{#style_dlg.height}</label></td>
 		<td>
-			<table border="0" cellspacing="0" cellpadding="0">
+			<table role="presentation" 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>
+					<td>
+						<label id="positioning_height_measurement_label" for="positioning_height_measurement" style="display: none; visibility: hidden;">Positioning Height Measurement Unit</label>
+						<select id="positioning_height_measurement" name="positioning_height_measurement" aria-labelledby="positioning_height_measurement_label"></select>
+					</td>
 				</tr>
 			</table>
 		</td>
@@ -587,7 +677,7 @@
 	<fieldset>
 		<legend>{#style_dlg.placement}</legend>
 
-		<table border="0">
+		<table role="presentation" 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>
@@ -595,11 +685,14 @@
 			<tr>
 				<td>{#style_dlg.top}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="positioning_placement_top_measurement_label" for="positioning_placement_top_measurement" style="display: none; visibility: hidden;">Placement Top Measurement Unit</label>
+								<select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement" aria-labelledby="positioning_placement_top_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -607,11 +700,14 @@
 			<tr>
 				<td>{#style_dlg.right}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="positioning_placement_right_measurement_label" for="positioning_placement_right_measurement" style="display: none; visibility: hidden;">Placement Right Measurement Unit</label>
+								<select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled" aria-labelledby="positioning_placement_right_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -619,11 +715,14 @@
 			<tr>
 				<td>{#style_dlg.bottom}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="positioning_placement_bottom_measurement_label" for="positioning_placement_bottom_measurement" style="display: none; visibility: hidden;">Placement Bottom Measurement Unit</label>
+								<select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled" aria-labelledby="positioning_placement_bottom_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -631,11 +730,14 @@
 			<tr>
 				<td>{#style_dlg.left}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="positioning_placement_left_measurement_label" for="positioning_placement_left_measurement" style="display: none; visibility: hidden;">Placement Left Measurement Unit</label>
+								<select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled" aria-labelledby="positioning_placement_left_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -648,7 +750,7 @@
 	<fieldset>
 		<legend>{#style_dlg.clip}</legend>
 
-		<table border="0">
+		<table role="presentation" 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>
@@ -656,11 +758,14 @@
 			<tr>
 				<td>{#style_dlg.top}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="positioning_clip_top_measurement_label" for="positioning_clip_top_measurement" style="display: none; visibility: hidden;">Clip Top Measurement Unit</label>
+								<select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement" aria-labelledby="positioning_clip_top_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -668,11 +773,14 @@
 			<tr>
 				<td>{#style_dlg.right}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="positioning_clip_right_measurement_label" for="positioning_clip_right_measurement" style="display: none; visibility: hidden;">Clip Right Measurement Unit</label>
+								<select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled" aria-labelledby="positioning_clip_right_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -680,11 +788,14 @@
 			<tr>
 				<td>{#style_dlg.bottom}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="positioning_clip_bottom_measurement_label" for="positioning_clip_bottom_measurement" style="display: none; visibility: hidden;">Clip Bottom Measurement Unit</label>
+								<select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled" aria-labelledby="positioning_clip_bottom_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -692,11 +803,14 @@
 			<tr>
 				<td>{#style_dlg.left}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" 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>
+							<td>
+								<label id="positioning_clip_left_measurement_label" for="positioning_clip_left_measurement" style="display: none; visibility: hidden;">Clip Left Measurement Unit</label>
+								<select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled" aria-labelledby="positioning_clip_left_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -706,6 +820,7 @@
 </div>
 <br style="clear: both" />
 </div>
+</fieldset>
 </div>
 
 <div class="mceActionPanel">
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
index 27d244022..d18689ddb 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(i){o=c.getParent(l.id,"form");n=o.elements;if(o){d(n,function(s,r){if(s.id==l.id){j=r;return false}});if(i>0){for(m=j+1;m<n.length;m++){if(n[m].type!="hidden"){return n[m]}}}else{for(m=j-1;m>=0;m--){if(n[m].type!="hidden"){return n[m]}}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(l=tinymce.get(n.id||n.name)){l.focus()}else{window.setTimeout(function(){window.focus();n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}f.onInit.add(function(){d(c.select("a:first,a:last",f.getContainer()),function(i){a.add(i,"focus",function(){f.focus()})})})},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(r){n=c.select(":input:enabled,*[tabindex]");function i(s){return s.type!="hidden"&&s.tabIndex!="-1"&&!(n[m].style.display=="none")&&!(n[m].style.visibility=="hidden")}d(n,function(t,s){if(t.id==l.id){j=s;return false}});if(r>0){for(m=j+1;m<n.length;m++){if(i(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(i(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
index c2be2f40a..f4545e167 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
@@ -22,27 +22,30 @@
 				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];

-							}

+					el = DOM.select(':input:enabled,*[tabindex]');

+					function canSelect(e) {

+						return e.type != 'hidden' && 

+						e.tabIndex != '-1' && 

+							!(el[i].style.display == "none") && 

+							!(el[i].style.visibility == "hidden");

+				    }

+

+					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 (canSelect(el[i]))

+								return el[i];

+						}

+					} else {

+						for (i = x - 1; i >= 0; i--) {

+							if (canSelect(el[i]))

+								return el[i];

 						}

 					}

 

@@ -71,10 +74,14 @@
 					}

 

 					if (el) {

-						if (ed = tinymce.get(el.id || el.name))

+						if (el.id && (ed = tinymce.get(el.id || el.name)))

 							ed.focus();

 						else

-							window.setTimeout(function() {window.focus();el.focus();}, 10);

+							window.setTimeout(function() {

+								if (!tinymce.isWebKit)

+									window.focus();

+								el.focus();

+							}, 10);

 

 						return Event.cancel(e);

 					}

@@ -89,11 +96,6 @@
 			} else

 				ed.onKeyDown.add(tabHandler);

 

-			ed.onInit.add(function() {

-				each(DOM.select('a:first,a:last', ed.getContainer()), function(n) {

-					Event.add(n, 'focus', function() {ed.focus();});

-				});

-			});

 		},

 

 		getInfo : function() {

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/cell.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
index d243e1d83..4afb6afa3 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
@@ -9,12 +9,12 @@
 	<script type="text/javascript" src="js/cell.js"></script>

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

 </head>

-<body id="tablecell" style="display: none">

+<body id="tablecell" style="display: none" role="application">

 	<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>

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

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

 			</ul>

 		</div>

 

@@ -23,7 +23,7 @@
 				<fieldset>

 					<legend>{#table_dlg.general_props}</legend>

 

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

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

 						<tr>

 							<td><label for="align">{#table_dlg.align}</label></td>

 							<td>

@@ -92,7 +92,7 @@
 				<fieldset>

 					<legend>{#table_dlg.advanced_props}</legend>

 

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

+					<table role="presentation" 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> 

@@ -124,7 +124,7 @@
 						<tr>

 							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 

 							<td>

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

+								<table role="presentation" 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>

@@ -133,10 +133,10 @@
 							</td> 

 						</tr>

 

-						<tr>

-							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 

+						<tr role="group" aria-labelledby="bordercolor_label">

+							<td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td> 

 							<td>

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

+								<table role="presentation" 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>

@@ -145,10 +145,10 @@
 							</td> 

 						</tr>

 

-						<tr>

-							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 

+						<tr role="group" aria-labelledby="bgcolor_label">

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

 							<td>

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

+								<table role="presentation" 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>

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
index 266d7d537..727ae4e79 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
@@ -1 +1 @@
-(function(b){var c=b.each;function a(F,E,I){var e,J,B,n;r();n=E.getParent(I.getStart(),"th,td");if(n){J=D(n);B=G();n=v(J.x,J.y)}function w(L,K){L=L.cloneNode(K);L.removeAttribute("id");return L}function r(){var K=0;e=[];c(["thead","tbody","tfoot"],function(L){var M=E.select(L+" tr",F);c(M,function(N,O){O+=K;c(E.select("td,th",N),function(U,P){var Q,R,S,T;if(e[O]){while(e[O][P]){P++}}S=g(U,"rowspan");T=g(U,"colspan");for(R=O;R<O+S;R++){if(!e[R]){e[R]=[]}for(Q=P;Q<P+T;Q++){e[R][Q]={part:L,real:R==O&&Q==P,elm:U,rowspan:S,colspan:T}}}})});K+=M.length})}function v(K,M){var L;L=e[M];if(L){return L[K]}}function g(L,K){return parseInt(L.getAttribute(K)||1)}function h(K){return E.hasClass(K.elm,"mceSelected")||K==n}function j(){var K=[];c(F.rows,function(L){c(L.cells,function(M){if(E.hasClass(M,"mceSelected")||M==n.elm){K.push(L);return false}})});return K}function q(){var K=E.createRng();K.setStartAfter(F);K.setEndAfter(F);I.setRng(K);E.remove(F)}function d(K){var L;b.walk(K,function(N){var M;if(N.nodeType==3){c(E.getParents(N.parentNode,null,K).reverse(),function(O){O=w(O,false);if(!L){L=M=O}else{if(M){M.appendChild(O)}}M=O});if(M){M.innerHTML=b.isIE?"&nbsp;":'<br _mce_bogus="1" />'}return false}},"childNodes");K=w(K,false);K.rowSpan=K.colSpan=1;if(L){K.appendChild(L)}else{if(!b.isIE){K.innerHTML='<br _mce_bogus="1" />'}}return K}function p(){var K=E.createRng();c(E.select("tr",F),function(L){if(L.cells.length==0){E.remove(L)}});if(E.select("tr",F).length==0){K.setStartAfter(F);K.setEndAfter(F);I.setRng(K);E.remove(F);return}c(E.select("thead,tbody,tfoot",F),function(L){if(L.rows.length==0){E.remove(L)}});r();row=e[Math.min(e.length-1,J.y)];if(row){I.select(row[Math.min(row.length-1,J.x)].elm,true);I.collapse(true)}}function s(Q,O,S,P){var N,L,K,M,R;N=e[O][Q].elm.parentNode;for(K=1;K<=S;K++){N=E.getNext(N,"tr");if(N){for(L=Q;L>=0;L--){R=e[O+K][L].elm;if(R.parentNode==N){for(M=1;M<=P;M++){E.insertAfter(d(R),R)}break}}if(L==-1){for(M=1;M<=P;M++){N.insertBefore(d(N.cells[0]),N.cells[0])}}}}}function A(){c(e,function(K,L){c(K,function(N,M){var Q,P,R,O;if(h(N)){N=N.elm;Q=g(N,"colspan");P=g(N,"rowspan");if(Q>1||P>1){N.colSpan=N.rowSpan=1;for(O=0;O<Q-1;O++){E.insertAfter(d(N),N)}s(M,L,P-1,Q)}}})})}function o(S,P,V){var N,M,U,T,R,O,Q,K,S,L;if(S){pos=D(S);N=pos.x;M=pos.y;U=N+(P-1);T=M+(V-1)}else{N=J.x;M=J.y;U=B.x;T=B.y}Q=v(N,M);K=v(U,T);if(Q&&K&&Q.part==K.part){A();r();Q=v(N,M).elm;Q.colSpan=(U-N)+1;Q.rowSpan=(T-M)+1;for(O=M;O<=T;O++){for(R=N;R<=U;R++){S=e[O][R].elm;if(S!=Q){L=b.grep(S.childNodes);c(L,function(X,W){if(X.nodeName!="BR"||W!=L.length-1){Q.appendChild(X)}});E.remove(S)}}}p()}}function k(N){var K,P,M,O,Q,R,L,S;c(e,function(T,U){c(T,function(W,V){if(h(W)){W=W.elm;Q=W.parentNode;R=w(Q,false);K=U;if(N){return false}}});if(N){return !K}});for(O=0;O<e[0].length;O++){P=e[K][O].elm;if(P!=M){if(!N){rowSpan=g(P,"rowspan");if(rowSpan>1){P.rowSpan=rowSpan+1;continue}}else{if(K>0&&e[K-1][O]){S=e[K-1][O].elm;rowSpan=g(S,"rowspan");if(rowSpan>1){S.rowSpan=rowSpan+1;continue}}}L=d(P);L.colSpan=P.colSpan;R.appendChild(L);M=P}}if(R.hasChildNodes()){if(!N){E.insertAfter(R,Q)}else{Q.parentNode.insertBefore(R,Q)}}}function f(L){var M,K;c(e,function(N,O){c(N,function(Q,P){if(h(Q)){M=P;if(L){return false}}});if(L){return !M}});c(e,function(Q,R){var N=Q[M].elm,O,P;if(N!=K){P=g(N,"colspan");O=g(N,"rowspan");if(P==1){if(!L){E.insertAfter(d(N),N);s(M,R,O-1,P)}else{N.parentNode.insertBefore(d(N),N);s(M,R,O-1,P)}}else{N.colSpan++}K=N}})}function m(){var K=[];c(e,function(L,M){c(L,function(O,N){if(h(O)&&b.inArray(K,N)===-1){c(e,function(R){var P=R[N].elm,Q;Q=g(P,"colspan");if(Q>1){P.colSpan=Q-1}else{E.remove(P)}});K.push(N)}})});p()}function l(){var L;function K(O){var N,P,M;N=E.getNext(O,"tr");c(O.cells,function(Q){var R=g(Q,"rowspan");if(R>1){Q.rowSpan=R-1;P=D(Q);s(P.x,P.y,1,1)}});P=D(O.cells[0]);c(e[P.y],function(Q){var R;Q=Q.elm;if(Q!=M){R=g(Q,"rowspan");if(R<=1){E.remove(Q)}else{Q.rowSpan=R-1}M=Q}})}L=j();c(L.reverse(),function(M){K(M)});p()}function C(){var K=j();E.remove(K);p();return K}function H(){var K=j();c(K,function(M,L){K[L]=w(M,true)});return K}function z(M,L){var N=j(),K=N[L?0:N.length-1],O=K.cells.length;c(e,function(Q){var P;O=0;c(Q,function(S,R){if(S.real){O+=S.colspan}if(S.elm.parentNode==K){P=1}});if(P){return false}});if(!L){M.reverse()}c(M,function(R){var Q=R.cells.length,P;for(i=0;i<Q;i++){P=R.cells[i];P.colSpan=P.rowSpan=1}for(i=Q;i<O;i++){R.appendChild(d(R.cells[Q-1]))}for(i=O;i<Q;i++){E.remove(R.cells[i])}if(L){K.parentNode.insertBefore(R,K)}else{E.insertAfter(R,K)}})}function D(K){var L;c(e,function(M,N){c(M,function(P,O){if(P.elm==K){L={x:O,y:N};return false}});return !L});return L}function u(K){J=D(K)}function G(){var M,L,K;L=K=0;c(e,function(N,O){c(N,function(Q,P){var S,R;if(h(Q)){Q=e[O][P];if(P>L){L=P}if(O>K){K=O}if(Q.real){S=Q.colspan-1;R=Q.rowspan-1;if(S){if(P+S>L){L=P+S}}if(R){if(O+R>K){K=O+R}}}}})});return{x:L,y:K}}function t(Q){var N,M,S,R,L,K,O,P;B=D(Q);if(J&&B){N=Math.min(J.x,B.x);M=Math.min(J.y,B.y);S=Math.max(J.x,B.x);R=Math.max(J.y,B.y);L=S;K=R;for(y=M;y<=K;y++){Q=e[y][N];if(!Q.real){if(N-(Q.colspan-1)<N){N-=Q.colspan-1}}}for(x=N;x<=L;x++){Q=e[M][x];if(!Q.real){if(M-(Q.rowspan-1)<M){M-=Q.rowspan-1}}}for(y=M;y<=R;y++){for(x=N;x<=S;x++){Q=e[y][x];if(Q.real){O=Q.colspan-1;P=Q.rowspan-1;if(O){if(x+O>L){L=x+O}}if(P){if(y+P>K){K=y+P}}}}}E.removeClass(E.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=M;y<=K;y++){for(x=N;x<=L;x++){E.addClass(e[y][x].elm,"mceSelected")}}}}b.extend(this,{deleteTable:q,split:A,merge:o,insertRow:k,insertCol:f,deleteCols:m,deleteRows:l,cutRows:C,copyRows:H,pasteRows:z,getPos:D,setStartCell:u,setEndCell:t})}b.create("tinymce.plugins.TablePlugin",{init:function(e,f){var d,j;function h(m){var l=e.selection,k=e.dom.getParent(m||l.getNode(),"table");if(k){return new a(k,e.dom,l)}}function g(){e.getBody().style.webkitUserSelect="";e.dom.removeClass(e.dom.select("td.mceSelected,th.mceSelected"),"mceSelected")}c([["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(k){e.addButton(k[0],{title:k[1],cmd:k[2],ui:k[3]})});if(!b.isIE){e.onClick.add(function(k,l){l=l.target;if(l.nodeName==="TABLE"){k.selection.select(l)}})}e.onNodeChange.add(function(l,k,o){var m;o=l.selection.getStart();m=l.dom.getParent(o,"td,th,caption");k.setActive("table",o.nodeName==="TABLE"||!!m);if(m&&m.nodeName==="CAPTION"){m=0}k.setDisabled("delete_table",!m);k.setDisabled("delete_col",!m);k.setDisabled("delete_table",!m);k.setDisabled("delete_row",!m);k.setDisabled("col_after",!m);k.setDisabled("col_before",!m);k.setDisabled("row_after",!m);k.setDisabled("row_before",!m);k.setDisabled("row_props",!m);k.setDisabled("cell_props",!m);k.setDisabled("split_cells",!m);k.setDisabled("merge_cells",!m)});e.onInit.add(function(l){var k,o,p=l.dom,m;d=l.windowManager;l.onMouseDown.add(function(q,r){if(r.button!=2){g();o=p.getParent(r.target,"td,th");k=p.getParent(o,"table")}});p.bind(l.getDoc(),"mouseover",function(t){var r,q,s=t.target;if(o&&(m||s!=o)&&(s.nodeName=="TD"||s.nodeName=="TH")){q=p.getParent(s,"table");if(q==k){if(!m){m=h(q);m.setStartCell(o);l.getBody().style.webkitUserSelect="none"}m.setEndCell(s)}r=l.selection.getSel();if(r.removeAllRanges){r.removeAllRanges()}else{r.empty()}t.preventDefault()}});l.onMouseUp.add(function(z,A){var r,t=z.selection,B,C=t.getSel(),q,u,s,w;if(o){if(m){z.getBody().style.webkitUserSelect=""}function v(D,F){var E=new b.dom.TreeWalker(D,D);do{if(D.nodeType==3&&b.trim(D.nodeValue).length!=0){if(F){r.setStart(D,0)}else{r.setEnd(D,D.nodeValue.length)}return}if(D.nodeName=="BR"){if(F){r.setStartBefore(D)}else{r.setEndBefore(D)}return}}while(D=(F?E.next():E.prev()))}B=p.select("td.mceSelected,th.mceSelected");if(B.length>0){r=p.createRng();u=B[0];w=B[B.length-1];v(u,1);q=new b.dom.TreeWalker(u,p.getParent(B[0],"table"));do{if(u.nodeName=="TD"||u.nodeName=="TH"){if(!p.hasClass(u,"mceSelected")){break}s=u}}while(u=q.next());v(s);t.setRng(r)}z.nodeChanged();o=m=k=null}});l.onKeyUp.add(function(q,r){g()});if(l&&l.plugins.contextmenu){l.plugins.contextmenu.onContextMenu.add(function(s,q,u){var v,t=l.selection,r=t.getNode()||l.getBody();if(l.dom.getParent(u,"td")||l.dom.getParent(u,"th")||l.dom.select("td.mceSelected,th.mceSelected").length){q.removeAll();if(r.nodeName=="A"&&!l.dom.getAttrib(r,"name")){q.add({title:"advanced.link_desc",icon:"link",cmd:l.plugins.advlink?"mceAdvLink":"mceLink",ui:true});q.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});q.addSeparator()}if(r.nodeName=="IMG"&&r.className.indexOf("mceItem")==-1){q.add({title:"advanced.image_desc",icon:"image",cmd:l.plugins.advimage?"mceAdvImage":"mceImage",ui:true});q.addSeparator()}q.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});q.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});q.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});q.addSeparator();v=q.addMenu({title:"table.cell"});v.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});v.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});v.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});v=q.addMenu({title:"table.row"});v.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});v.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});v.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});v.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});v.addSeparator();v.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});v.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});v.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!j);v.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!j);v=q.addMenu({title:"table.col"});v.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});v.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});v.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{q.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(!b.isIE){function n(){var q;for(q=l.getBody().lastChild;q&&q.nodeType==3&&!q.nodeValue.length;q=q.previousSibling){}if(q&&q.nodeName=="TABLE"){l.dom.add(l.getBody(),"p",null,'<br mce_bogus="1" />')}}if(b.isGecko){l.onKeyDown.add(function(r,t){var q,s,u=r.dom;if(t.keyCode==37||t.keyCode==38){q=r.selection.getRng();s=u.getParent(q.startContainer,"table");if(s&&r.getBody().firstChild==s){if(isAtStart(q,s)){q=u.createRng();q.setStartBefore(s);q.setEndBefore(s);r.selection.setRng(q);t.preventDefault()}}}})}l.onKeyUp.add(n);l.onSetContent.add(n);l.onVisualAid.add(n);l.onPreProcess.add(function(q,s){var r=s.node.lastChild;if(r&&r.childNodes.length==1&&r.firstChild.nodeName=="BR"){q.dom.remove(r)}});n()}});c({mceTableSplitCells:function(k){k.split()},mceTableMergeCells:function(l){var m,n,k;k=e.dom.getParent(e.selection.getNode(),"th,td");if(k){m=k.rowSpan;n=k.colSpan}if(!e.dom.select("td.mceSelected,th.mceSelected").length){d.open({url:f+"/merge_cells.htm",width:240+parseInt(e.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(e.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:m,cols:n,onaction:function(o){l.merge(k,o.cols,o.rows)},plugin_url:f})}else{l.merge()}},mceTableInsertRowBefore:function(k){k.insertRow(true)},mceTableInsertRowAfter:function(k){k.insertRow()},mceTableInsertColBefore:function(k){k.insertCol(true)},mceTableInsertColAfter:function(k){k.insertCol()},mceTableDeleteCol:function(k){k.deleteCols()},mceTableDeleteRow:function(k){k.deleteRows()},mceTableCutRow:function(k){j=k.cutRows()},mceTableCopyRow:function(k){j=k.copyRows()},mceTablePasteRowBefore:function(k){k.pasteRows(j,true)},mceTablePasteRowAfter:function(k){k.pasteRows(j)},mceTableDelete:function(k){k.deleteTable()}},function(l,k){e.addCommand(k,function(){var m=h();if(m){l(m);e.execCommand("mceRepaint");g()}})});c({mceInsertTable:function(k){d.open({url:f+"/table.htm",width:400+parseInt(e.getLang("table.table_delta_width",0)),height:320+parseInt(e.getLang("table.table_delta_height",0)),inline:1},{plugin_url:f,action:k?k.action:0})},mceTableRowProps:function(){d.open({url:f+"/row.htm",width:400+parseInt(e.getLang("table.rowprops_delta_width",0)),height:295+parseInt(e.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:f})},mceTableCellProps:function(){d.open({url:f+"/cell.htm",width:400+parseInt(e.getLang("table.cellprops_delta_width",0)),height:295+parseInt(e.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:f})}},function(l,k){e.addCommand(k,function(m,n){l(n)})})}});b.PluginManager.add("table",b.plugins.TablePlugin)})(tinymce);
\ No newline at end of file
+(function(c){var d=c.each;function b(f,g){var h=g.ownerDocument,e=h.createRange(),j;e.setStartBefore(g);e.setEnd(f.endContainer,f.endOffset);j=h.createElement("body");j.appendChild(e.cloneContents());return j.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length==0}function a(H,G,K){var f,L,D,o;t();o=G.getParent(K.getStart(),"th,td");if(o){L=F(o);D=I();o=z(L.x,L.y)}function A(N,M){N=N.cloneNode(M);N.removeAttribute("id");return N}function t(){var M=0;f=[];d(["thead","tbody","tfoot"],function(N){var O=G.select("> "+N+" tr",H);d(O,function(P,Q){Q+=M;d(G.select("> td, > th",P),function(W,R){var S,T,U,V;if(f[Q]){while(f[Q][R]){R++}}U=h(W,"rowspan");V=h(W,"colspan");for(T=Q;T<Q+U;T++){if(!f[T]){f[T]=[]}for(S=R;S<R+V;S++){f[T][S]={part:N,real:T==Q&&S==R,elm:W,rowspan:U,colspan:V}}}})});M+=O.length})}function z(M,O){var N;N=f[O];if(N){return N[M]}}function h(N,M){return parseInt(N.getAttribute(M)||1)}function s(O,M,N){if(O){N=parseInt(N);if(N===1){O.removeAttribute(M,1)}else{O.setAttribute(M,N,1)}}}function j(M){return M&&(G.hasClass(M.elm,"mceSelected")||M==o)}function k(){var M=[];d(H.rows,function(N){d(N.cells,function(O){if(G.hasClass(O,"mceSelected")||O==o.elm){M.push(N);return false}})});return M}function r(){var M=G.createRng();M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H)}function e(M){var N;c.walk(M,function(P){var O;if(P.nodeType==3){d(G.getParents(P.parentNode,null,M).reverse(),function(Q){Q=A(Q,false);if(!N){N=O=Q}else{if(O){O.appendChild(Q)}}O=Q});if(O){O.innerHTML=c.isIE?"&nbsp;":'<br data-mce-bogus="1" />'}return false}},"childNodes");M=A(M,false);s(M,"rowSpan",1);s(M,"colSpan",1);if(N){M.appendChild(N)}else{if(!c.isIE){M.innerHTML='<br data-mce-bogus="1" />'}}return M}function q(){var M=G.createRng();d(G.select("tr",H),function(N){if(N.cells.length==0){G.remove(N)}});if(G.select("tr",H).length==0){M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H);return}d(G.select("thead,tbody,tfoot",H),function(N){if(N.rows.length==0){G.remove(N)}});t();row=f[Math.min(f.length-1,L.y)];if(row){K.select(row[Math.min(row.length-1,L.x)].elm,true);K.collapse(true)}}function u(S,Q,U,R){var P,N,M,O,T;P=f[Q][S].elm.parentNode;for(M=1;M<=U;M++){P=G.getNext(P,"tr");if(P){for(N=S;N>=0;N--){T=f[Q+M][N].elm;if(T.parentNode==P){for(O=1;O<=R;O++){G.insertAfter(e(T),T)}break}}if(N==-1){for(O=1;O<=R;O++){P.insertBefore(e(P.cells[0]),P.cells[0])}}}}}function C(){d(f,function(M,N){d(M,function(P,O){var S,R,T,Q;if(j(P)){P=P.elm;S=h(P,"colspan");R=h(P,"rowspan");if(S>1||R>1){s(P,"rowSpan",1);s(P,"colSpan",1);for(Q=0;Q<S-1;Q++){G.insertAfter(e(P),P)}u(O,N,R-1,S)}}})})}function p(V,S,Y){var P,O,X,W,U,R,T,M,V,N,Q;if(V){pos=F(V);P=pos.x;O=pos.y;X=P+(S-1);W=O+(Y-1)}else{P=L.x;O=L.y;X=D.x;W=D.y}T=z(P,O);M=z(X,W);if(T&&M&&T.part==M.part){C();t();T=z(P,O).elm;s(T,"colSpan",(X-P)+1);s(T,"rowSpan",(W-O)+1);for(R=O;R<=W;R++){for(U=P;U<=X;U++){if(!f[R]||!f[R][U]){continue}V=f[R][U].elm;if(V!=T){N=c.grep(V.childNodes);d(N,function(Z){T.appendChild(Z)});if(N.length){N=c.grep(T.childNodes);Q=0;d(N,function(Z){if(Z.nodeName=="BR"&&G.getAttrib(Z,"data-mce-bogus")&&Q++<N.length-1){T.removeChild(Z)}})}G.remove(V)}}}q()}}function l(Q){var M,S,P,R,T,U,N,V,O;d(f,function(W,X){d(W,function(Z,Y){if(j(Z)){Z=Z.elm;T=Z.parentNode;U=A(T,false);M=X;if(Q){return false}}});if(Q){return !M}});for(R=0;R<f[0].length;R++){if(!f[M][R]){continue}S=f[M][R].elm;if(S!=P){if(!Q){O=h(S,"rowspan");if(O>1){s(S,"rowSpan",O+1);continue}}else{if(M>0&&f[M-1][R]){V=f[M-1][R].elm;O=h(V,"rowSpan");if(O>1){s(V,"rowSpan",O+1);continue}}}N=e(S);s(N,"colSpan",S.colSpan);U.appendChild(N);P=S}}if(U.hasChildNodes()){if(!Q){G.insertAfter(U,T)}else{T.parentNode.insertBefore(U,T)}}}function g(N){var O,M;d(f,function(P,Q){d(P,function(S,R){if(j(S)){O=R;if(N){return false}}});if(N){return !O}});d(f,function(S,T){var P,Q,R;if(!S[O]){return}P=S[O].elm;if(P!=M){R=h(P,"colspan");Q=h(P,"rowspan");if(R==1){if(!N){G.insertAfter(e(P),P);u(O,T,Q-1,R)}else{P.parentNode.insertBefore(e(P),P);u(O,T,Q-1,R)}}else{s(P,"colSpan",P.colSpan+1)}M=P}})}function n(){var M=[];d(f,function(N,O){d(N,function(Q,P){if(j(Q)&&c.inArray(M,P)===-1){d(f,function(T){var R=T[P].elm,S;S=h(R,"colSpan");if(S>1){s(R,"colSpan",S-1)}else{G.remove(R)}});M.push(P)}})});q()}function m(){var N;function M(Q){var P,R,O;P=G.getNext(Q,"tr");d(Q.cells,function(S){var T=h(S,"rowSpan");if(T>1){s(S,"rowSpan",T-1);R=F(S);u(R.x,R.y,1,1)}});R=F(Q.cells[0]);d(f[R.y],function(S){var T;S=S.elm;if(S!=O){T=h(S,"rowSpan");if(T<=1){G.remove(S)}else{s(S,"rowSpan",T-1)}O=S}})}N=k();d(N.reverse(),function(O){M(O)});q()}function E(){var M=k();G.remove(M);q();return M}function J(){var M=k();d(M,function(O,N){M[N]=A(O,true)});return M}function B(O,N){var P=k(),M=P[N?0:P.length-1],Q=M.cells.length;d(f,function(S){var R;Q=0;d(S,function(U,T){if(U.real){Q+=U.colspan}if(U.elm.parentNode==M){R=1}});if(R){return false}});if(!N){O.reverse()}d(O,function(T){var S=T.cells.length,R;for(i=0;i<S;i++){R=T.cells[i];s(R,"colSpan",1);s(R,"rowSpan",1)}for(i=S;i<Q;i++){T.appendChild(e(T.cells[S-1]))}for(i=Q;i<S;i++){G.remove(T.cells[i])}if(N){M.parentNode.insertBefore(T,M)}else{G.insertAfter(T,M)}})}function F(M){var N;d(f,function(O,P){d(O,function(R,Q){if(R.elm==M){N={x:Q,y:P};return false}});return !N});return N}function w(M){L=F(M)}function I(){var O,N,M;N=M=0;d(f,function(P,Q){d(P,function(S,R){var U,T;if(j(S)){S=f[Q][R];if(R>N){N=R}if(Q>M){M=Q}if(S.real){U=S.colspan-1;T=S.rowspan-1;if(U){if(R+U>N){N=R+U}}if(T){if(Q+T>M){M=Q+T}}}}})});return{x:N,y:M}}function v(S){var P,O,U,T,N,M,Q,R;D=F(S);if(L&&D){P=Math.min(L.x,D.x);O=Math.min(L.y,D.y);U=Math.max(L.x,D.x);T=Math.max(L.y,D.y);N=U;M=T;for(y=O;y<=M;y++){S=f[y][P];if(!S.real){if(P-(S.colspan-1)<P){P-=S.colspan-1}}}for(x=P;x<=N;x++){S=f[O][x];if(!S.real){if(O-(S.rowspan-1)<O){O-=S.rowspan-1}}}for(y=O;y<=T;y++){for(x=P;x<=U;x++){S=f[y][x];if(S.real){Q=S.colspan-1;R=S.rowspan-1;if(Q){if(x+Q>N){N=x+Q}}if(R){if(y+R>M){M=y+R}}}}}G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=O;y<=M;y++){for(x=P;x<=N;x++){if(f[y][x]){G.addClass(f[y][x].elm,"mceSelected")}}}}}c.extend(this,{deleteTable:r,split:C,merge:p,insertRow:l,insertCol:g,deleteCols:n,deleteRows:m,cutRows:E,copyRows:J,pasteRows:B,getPos:F,setStartCell:w,setEndCell:v})}c.create("tinymce.plugins.TablePlugin",{init:function(f,g){var e,k;function j(n){var m=f.selection,l=f.dom.getParent(n||m.getNode(),"table");if(l){return new a(l,f.dom,m)}}function h(){f.getBody().style.webkitUserSelect="";f.dom.removeClass(f.dom.select("td.mceSelected,th.mceSelected"),"mceSelected")}d([["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(l){f.addButton(l[0],{title:l[1],cmd:l[2],ui:l[3]})});if(!c.isIE){f.onClick.add(function(l,m){m=m.target;if(m.nodeName==="TABLE"){l.selection.select(m);l.nodeChanged()}})}f.onPreProcess.add(function(m,n){var l,o,p,r=m.dom,q;l=r.select("table",n.node);o=l.length;while(o--){p=l[o];r.setAttrib(p,"data-mce-style","");if((q=r.getAttrib(p,"width"))){r.setStyle(p,"width",q);r.setAttrib(p,"width","")}if((q=r.getAttrib(p,"height"))){r.setStyle(p,"height",q);r.setAttrib(p,"height","")}}});f.onNodeChange.add(function(m,l,q){var o;q=m.selection.getStart();o=m.dom.getParent(q,"td,th,caption");l.setActive("table",q.nodeName==="TABLE"||!!o);if(o&&o.nodeName==="CAPTION"){o=0}l.setDisabled("delete_table",!o);l.setDisabled("delete_col",!o);l.setDisabled("delete_table",!o);l.setDisabled("delete_row",!o);l.setDisabled("col_after",!o);l.setDisabled("col_before",!o);l.setDisabled("row_after",!o);l.setDisabled("row_before",!o);l.setDisabled("row_props",!o);l.setDisabled("cell_props",!o);l.setDisabled("split_cells",!o);l.setDisabled("merge_cells",!o)});f.onInit.add(function(m){var l,p,q=m.dom,n;e=m.windowManager;m.onMouseDown.add(function(r,s){if(s.button!=2){h();p=q.getParent(s.target,"td,th");l=q.getParent(p,"table")}});q.bind(m.getDoc(),"mouseover",function(v){var t,s,u=v.target;if(p&&(n||u!=p)&&(u.nodeName=="TD"||u.nodeName=="TH")){s=q.getParent(u,"table");if(s==l){if(!n){n=j(s);n.setStartCell(p);m.getBody().style.webkitUserSelect="none"}n.setEndCell(u)}t=m.selection.getSel();try{if(t.removeAllRanges){t.removeAllRanges()}else{t.empty()}}catch(r){}v.preventDefault()}});m.onMouseUp.add(function(A,B){var s,u=A.selection,C,D=u.getSel(),r,v,t,z;if(p){if(n){A.getBody().style.webkitUserSelect=""}function w(E,G){var F=new c.dom.TreeWalker(E,E);do{if(E.nodeType==3&&c.trim(E.nodeValue).length!=0){if(G){s.setStart(E,0)}else{s.setEnd(E,E.nodeValue.length)}return}if(E.nodeName=="BR"){if(G){s.setStartBefore(E)}else{s.setEndBefore(E)}return}}while(E=(G?F.next():F.prev()))}C=q.select("td.mceSelected,th.mceSelected");if(C.length>0){s=q.createRng();v=C[0];z=C[C.length-1];w(v,1);r=new c.dom.TreeWalker(v,q.getParent(C[0],"table"));do{if(v.nodeName=="TD"||v.nodeName=="TH"){if(!q.hasClass(v,"mceSelected")){break}t=v}}while(v=r.next());w(t);u.setRng(s)}A.nodeChanged();p=n=l=null}});m.onKeyUp.add(function(r,s){h()});if(m&&m.plugins.contextmenu){m.plugins.contextmenu.onContextMenu.add(function(t,r,v){var w,u=m.selection,s=u.getNode()||m.getBody();if(m.dom.getParent(v,"td")||m.dom.getParent(v,"th")||m.dom.select("td.mceSelected,th.mceSelected").length){r.removeAll();if(s.nodeName=="A"&&!m.dom.getAttrib(s,"name")){r.add({title:"advanced.link_desc",icon:"link",cmd:m.plugins.advlink?"mceAdvLink":"mceLink",ui:true});r.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});r.addSeparator()}if(s.nodeName=="IMG"&&s.className.indexOf("mceItem")==-1){r.add({title:"advanced.image_desc",icon:"image",cmd:m.plugins.advimage?"mceAdvImage":"mceImage",ui:true});r.addSeparator()}r.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});r.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});r.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});r.addSeparator();w=r.addMenu({title:"table.cell"});w.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});w.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});w.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});w=r.addMenu({title:"table.row"});w.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});w.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});w.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});w.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});w.addSeparator();w.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});w.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});w.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!k);w.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!k);w=r.addMenu({title:"table.col"});w.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});w.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});w.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{r.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(!c.isIE){function o(){var r;for(r=m.getBody().lastChild;r&&r.nodeType==3&&!r.nodeValue.length;r=r.previousSibling){}if(r&&r.nodeName=="TABLE"){m.dom.add(m.getBody(),"p",null,'<br mce_bogus="1" />')}}if(c.isGecko){m.onKeyDown.add(function(s,u){var r,t,v=s.dom;if(u.keyCode==37||u.keyCode==38){r=s.selection.getRng();t=v.getParent(r.startContainer,"table");if(t&&s.getBody().firstChild==t){if(b(r,t)){r=v.createRng();r.setStartBefore(t);r.setEndBefore(t);s.selection.setRng(r);u.preventDefault()}}}})}m.onKeyUp.add(o);m.onSetContent.add(o);m.onVisualAid.add(o);m.onPreProcess.add(function(r,t){var s=t.node.lastChild;if(s&&s.childNodes.length==1&&s.firstChild.nodeName=="BR"){r.dom.remove(s)}});o()}});d({mceTableSplitCells:function(l){l.split()},mceTableMergeCells:function(m){var n,o,l;l=f.dom.getParent(f.selection.getNode(),"th,td");if(l){n=l.rowSpan;o=l.colSpan}if(!f.dom.select("td.mceSelected,th.mceSelected").length){e.open({url:g+"/merge_cells.htm",width:240+parseInt(f.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(f.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:n,cols:o,onaction:function(p){m.merge(l,p.cols,p.rows)},plugin_url:g})}else{m.merge()}},mceTableInsertRowBefore:function(l){l.insertRow(true)},mceTableInsertRowAfter:function(l){l.insertRow()},mceTableInsertColBefore:function(l){l.insertCol(true)},mceTableInsertColAfter:function(l){l.insertCol()},mceTableDeleteCol:function(l){l.deleteCols()},mceTableDeleteRow:function(l){l.deleteRows()},mceTableCutRow:function(l){k=l.cutRows()},mceTableCopyRow:function(l){k=l.copyRows()},mceTablePasteRowBefore:function(l){l.pasteRows(k,true)},mceTablePasteRowAfter:function(l){l.pasteRows(k)},mceTableDelete:function(l){l.deleteTable()}},function(m,l){f.addCommand(l,function(){var n=j();if(n){m(n);f.execCommand("mceRepaint");h()}})});d({mceInsertTable:function(l){e.open({url:g+"/table.htm",width:400+parseInt(f.getLang("table.table_delta_width",0)),height:320+parseInt(f.getLang("table.table_delta_height",0)),inline:1},{plugin_url:g,action:l?l.action:0})},mceTableRowProps:function(){e.open({url:g+"/row.htm",width:400+parseInt(f.getLang("table.rowprops_delta_width",0)),height:295+parseInt(f.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:g})},mceTableCellProps:function(){e.open({url:g+"/cell.htm",width:400+parseInt(f.getLang("table.cellprops_delta_width",0)),height:295+parseInt(f.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:g})}},function(m,l){f.addCommand(l,function(n,o){m(o)})})}});c.PluginManager.add("table",c.plugins.TablePlugin)})(tinymce);
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
index c2f307f04..442e465c4 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
@@ -11,6 +11,20 @@
 (function(tinymce) {

 	var each = tinymce.each;

 

+	// Checks if the selection/caret is at the start of the specified block element

+	function isAtStart(rng, par) {

+		var doc = par.ownerDocument, rng2 = doc.createRange(), elm;

+

+		rng2.setStartBefore(par);

+		rng2.setEnd(rng.endContainer, rng.endOffset);

+

+		elm = doc.createElement('body');

+		elm.appendChild(rng2.cloneContents());

+

+		// Check for text characters of other elements that should be treated as content

+		return elm.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi, '-').replace(/<[^>]+>/g, '').length == 0;

+	};

+

 	/**

 	 * Table Grid class.

 	 */

@@ -38,12 +52,12 @@
 			grid = [];

 

 			each(['thead', 'tbody', 'tfoot'], function(part) {

-				var rows = dom.select(part + ' tr', table);

+				var rows = dom.select('> ' + part + ' tr', table);

 

 				each(rows, function(tr, y) {

 					y += startY;

 

-					each(dom.select('td,th', tr), function(td, x) {

+					each(dom.select('> td, > th', tr), function(td, x) {

 						var x2, y2, rowspan, colspan;

 

 						// Skip over existing cells produced by rowspan

@@ -90,8 +104,19 @@
 			return parseInt(td.getAttribute(name) || 1);

 		};

 

+		function setSpanVal(td, name, val) {

+			if (td) {

+				val = parseInt(val);

+

+				if (val === 1)

+					td.removeAttribute(name, 1);

+				else

+					td.setAttribute(name, val, 1);

+			}

+		}

+

 		function isCellSelected(cell) {

-			return dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell;

+			return cell && (dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell);

 		};

 

 		function getSelectedRows() {

@@ -141,20 +166,21 @@
 

 					// Add something to the inner node

 					if (curNode)

-						curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br _mce_bogus="1" />';

+						curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br data-mce-bogus="1" />';

 

 					return false;

 				}

 			}, 'childNodes');

 

 			cell = cloneNode(cell, false);

-			cell.rowSpan = cell.colSpan = 1;

+			setSpanVal(cell, 'rowSpan', 1);

+			setSpanVal(cell, 'colSpan', 1);

 

 			if (formatNode) {

 				cell.appendChild(formatNode);

 			} else {

 				if (!tinymce.isIE)

-					cell.innerHTML = '<br _mce_bogus="1" />';

+					cell.innerHTML = '<br data-mce-bogus="1" />';

 			}

 

 			return cell;

@@ -236,7 +262,8 @@
 						rowSpan = getSpanVal(cell, 'rowspan');

 

 						if (colSpan > 1 || rowSpan > 1) {

-							cell.colSpan = cell.rowSpan = 1;

+							setSpanVal(cell, 'rowSpan', 1);

+							setSpanVal(cell, 'colSpan', 1);

 

 							// Insert cells right

 							for (i = 0; i < colSpan - 1; i++)

@@ -250,7 +277,7 @@
 		};

 

 		function merge(cell, cols, rows) {

-			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children;

+			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children, count;

 

 			// Use specified cell and cols/rows

 			if (cell) {

@@ -279,23 +306,34 @@
 

 				// Set row/col span to start cell

 				startCell = getCell(startX, startY).elm;

-				startCell.colSpan = (endX - startX) + 1;

-				startCell.rowSpan = (endY - startY) + 1;

+				setSpanVal(startCell, 'colSpan', (endX - startX) + 1);

+				setSpanVal(startCell, 'rowSpan', (endY - startY) + 1);

 

 				// Remove other cells and add it's contents to the start cell

 				for (y = startY; y <= endY; y++) {

 					for (x = startX; x <= endX; x++) {

+						if (!grid[y] || !grid[y][x])

+							continue;

+

 						cell = grid[y][x].elm;

 

 						if (cell != startCell) {

 							// Move children to startCell

 							children = tinymce.grep(cell.childNodes);

-							each(children, function(node, i) {

-								// Jump over last BR element

-								if (node.nodeName != 'BR' || i != children.length - 1)

-									startCell.appendChild(node);

+							each(children, function(node) {

+								startCell.appendChild(node);

 							});

 

+							// Remove bogus nodes if there is children in the target cell

+							if (children.length) {

+								children = tinymce.grep(startCell.childNodes);

+								count = 0;

+								each(children, function(node) {

+									if (node.nodeName == 'BR' && dom.getAttrib(node, 'data-mce-bogus') && count++ < children.length - 1)

+										startCell.removeChild(node);

+								});

+							}

+							

 							// Remove cell

 							dom.remove(cell);

 						}

@@ -308,7 +346,7 @@
 		};

 

 		function insertRow(before) {

-			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell;

+			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell, rowSpan;

 

 			// Find first/last row

 			each(grid, function(row, y) {

@@ -329,30 +367,35 @@
 			});

 

 			for (x = 0; x < grid[0].length; x++) {

+				// Cell not found could be because of an invalid table structure

+				if (!grid[posY][x])

+					continue;

+

 				cell = grid[posY][x].elm;

 

 				if (cell != lastCell) {

 					if (!before) {

 						rowSpan = getSpanVal(cell, 'rowspan');

 						if (rowSpan > 1) {

-							cell.rowSpan = rowSpan + 1;

+							setSpanVal(cell, 'rowSpan', rowSpan + 1);

 							continue;

 						}

 					} else {

 						// Check if cell above can be expanded

 						if (posY > 0 && grid[posY - 1][x]) {

 							otherCell = grid[posY - 1][x].elm;

-							rowSpan = getSpanVal(otherCell, 'rowspan');

+							rowSpan = getSpanVal(otherCell, 'rowSpan');

 							if (rowSpan > 1) {

-								otherCell.rowSpan = rowSpan + 1;

+								setSpanVal(otherCell, 'rowSpan', rowSpan + 1);

 								continue;

 							}

 						}

 					}

 

 					// Insert new cell into new row

-					newCell = cloneCell(cell)

-					newCell.colSpan = cell.colSpan;

+					newCell = cloneCell(cell);

+					setSpanVal(newCell, 'colSpan', cell.colSpan);

+

 					newRow.appendChild(newCell);

 

 					lastCell = cell;

@@ -386,8 +429,12 @@
 			});

 

 			each(grid, function(row, y) {

-				var cell = row[posX].elm, rowSpan, colSpan;

+				var cell, rowSpan, colSpan;

+

+				if (!row[posX])

+					return;

 

+				cell = row[posX].elm;

 				if (cell != lastCell) {

 					colSpan = getSpanVal(cell, 'colspan');

 					rowSpan = getSpanVal(cell, 'rowspan');

@@ -401,7 +448,7 @@
 							fillLeftDown(posX, y, rowSpan - 1, colSpan);

 						}

 					} else

-						cell.colSpan++;

+						setSpanVal(cell, 'colSpan', cell.colSpan + 1);

 

 					lastCell = cell;

 				}

@@ -418,10 +465,10 @@
 						each(grid, function(row) {

 							var cell = row[x].elm, colSpan;

 

-							colSpan = getSpanVal(cell, 'colspan');

+							colSpan = getSpanVal(cell, 'colSpan');

 

 							if (colSpan > 1)

-								cell.colSpan = colSpan - 1;

+								setSpanVal(cell, 'colSpan', colSpan - 1);

 							else

 								dom.remove(cell);

 						});

@@ -444,10 +491,10 @@
 

 				// Move down row spanned cells

 				each(tr.cells, function(cell) {

-					var rowSpan = getSpanVal(cell, 'rowspan');

+					var rowSpan = getSpanVal(cell, 'rowSpan');

 

 					if (rowSpan > 1) {

-						cell.rowSpan = rowSpan - 1;

+						setSpanVal(cell, 'rowSpan', rowSpan - 1);

 						pos = getPos(cell);

 						fillLeftDown(pos.x, pos.y, 1, 1);

 					}

@@ -461,12 +508,12 @@
 					cell = cell.elm;

 

 					if (cell != lastCell) {

-						rowSpan = getSpanVal(cell, 'rowspan');

+						rowSpan = getSpanVal(cell, 'rowSpan');

 

 						if (rowSpan <= 1)

 							dom.remove(cell);

 						else

-							cell.rowSpan = rowSpan - 1;

+							setSpanVal(cell, 'rowSpan', rowSpan - 1);

 

 						lastCell = cell;

 					}

@@ -534,7 +581,8 @@
 				// Remove col/rowspans

 				for (i = 0; i < cellCount; i++) {

 					cell = row.cells[i];

-					cell.colSpan = cell.rowSpan = 1;

+					setSpanVal(cell, 'colSpan', 1);

+					setSpanVal(cell, 'rowSpan', 1);

 				}

 

 				// Needs more cells

@@ -676,8 +724,10 @@
 

 				// Add new selection

 				for (y = startY; y <= maxY; y++) {

-					for (x = startX; x <= maxX; x++)

-						dom.addClass(grid[y][x].elm, 'mceSelected');

+					for (x = startX; x <= maxX; x++) {

+						if (grid[y][x])

+							dom.addClass(grid[y][x].elm, 'mceSelected');

+					}

 				}

 			}

 		};

@@ -740,11 +790,34 @@
 				ed.onClick.add(function(ed, e) {

 					e = e.target;

 

-					if (e.nodeName === 'TABLE')

+					if (e.nodeName === 'TABLE') {

 						ed.selection.select(e);

+						ed.nodeChanged();

+					}

 				});

 			}

 

+			ed.onPreProcess.add(function(ed, args) {

+				var nodes, i, node, dom = ed.dom, value;

+

+				nodes = dom.select('table', args.node);

+				i = nodes.length;

+				while (i--) {

+					node = nodes[i];

+					dom.setAttrib(node, 'data-mce-style', '');

+

+					if ((value = dom.getAttrib(node, 'width'))) {

+						dom.setStyle(node, 'width', value);

+						dom.setAttrib(node, 'width', '');

+					}

+

+					if ((value = dom.getAttrib(node, 'height'))) {

+						dom.setStyle(node, 'height', value);

+						dom.setAttrib(node, 'height', '');

+					}

+				}

+			});

+

 			// Handle node change updates

 			ed.onNodeChange.add(function(ed, cm, n) {

 				var p;

@@ -805,10 +878,14 @@
 						// Remove current selection

 						sel = ed.selection.getSel();

 

-						if (sel.removeAllRanges)

-							sel.removeAllRanges();

-						else

-							sel.empty();

+						try {

+							if (sel.removeAllRanges)

+								sel.removeAllRanges();

+							else

+								sel.empty();

+						} catch (ex) {

+							// IE9 might throw errors here

+						}

 

 						e.preventDefault();

 					}

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
index b5fc1fda3..45e6061fd 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
@@ -83,8 +83,6 @@ function updateAction() {
 		return;

 	}

 

-	ed.execCommand('mceBeginUndoLevel');

-

 	switch (getSelectValue(formObj, 'action')) {

 		case "cell":

 			var celltype = getSelectValue(formObj, 'celltype');

@@ -166,15 +164,15 @@ function updateCell(td, skip_id) {
 	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'));

+		dom.setAttrib(td, 'id', formObj.id.value);

+

+	dom.setAttrib(td, 'align', formObj.align.value);

+	dom.setAttrib(td, 'vAlign', formObj.valign.value);

+	dom.setAttrib(td, 'lang', formObj.lang.value);

+	dom.setAttrib(td, 'dir', getSelectValue(formObj, 'dir'));

+	dom.setAttrib(td, 'style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));

+	dom.setAttrib(td, 'scope', formObj.scope.value);

+	dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));

 

 	// Clear deprecated attributes

 	ed.dom.setAttrib(td, 'width', '');

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
index 70d95b672..b275e6ea9 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
@@ -80,8 +80,6 @@ function updateAction() {
 		return;

 	}

 

-	inst.execCommand('mceBeginUndoLevel');

-

 	switch (action) {

 		case "row":

 			updateRow(trElm);

@@ -123,19 +121,19 @@ function updateRow(tr_elm, skip_id, skip_parent) {
 

 	// Update row element

 	if (!skip_id)

-		tr_elm.setAttribute('id', formObj.id.value);

+		dom.setAttrib(tr_elm, '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, 'align', getSelectValue(formObj, 'align'));

+	dom.setAttrib(tr_elm, 'vAlign', getSelectValue(formObj, 'valign'));

+	dom.setAttrib(tr_elm, 'lang', formObj.lang.value);

+	dom.setAttrib(tr_elm, 'dir', getSelectValue(formObj, 'dir'));

+	dom.setAttrib(tr_elm, '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', '');

+	dom.setAttrib(tr_elm, 'background', '');

+	dom.setAttrib(tr_elm, 'bgColor', '');

+	dom.setAttrib(tr_elm, 'height', '');

 

 	// Set styles

 	tr_elm.style.height = getCSSSize(formObj.height.value);

@@ -163,13 +161,10 @@ function updateRow(tr_elm, skip_id, skip_parent) {
 		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);

+			if (theTable.firstChild.nodeName == 'CAPTION')

+				inst.dom.insertAfter(newParent, theTable.firstChild);

+			else

+				theTable.insertBefore(newParent, theTable.firstChild);

 		}

 

 		// append the row to the new parent

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/table.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
index 36ef6871f..520d857fc 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
@@ -12,7 +12,7 @@ function insertTable() {
 	tinyMCEPopup.restoreSelection();

 

 	if (!AutoValidator.validate(formObj)) {

-		tinyMCEPopup.alert(inst.getLang('invalid_data'));

+		tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');

 		return false;

 	}

 

@@ -21,7 +21,7 @@ function insertTable() {
 	// Get form data

 	cols = formObj.elements['cols'].value;

 	rows = formObj.elements['rows'].value;

-	border = formObj.elements['border'].value != "" ? formObj.elements['border'].value  : 0;

+	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 = getSelectValue(formObj, "align");

@@ -58,8 +58,6 @@ function insertTable() {
 

 	// 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);

@@ -82,7 +80,7 @@ function insertTable() {
 			capEl = elm.ownerDocument.createElement('caption');

 

 			if (!tinymce.isIE)

-				capEl.innerHTML = '<br _mce_bogus="1"/>';

+				capEl.innerHTML = '<br data-mce-bogus="1"/>';

 

 			elm.insertBefore(capEl, elm.firstChild);

 		}

@@ -151,7 +149,7 @@ function insertTable() {
 	html += makeAttrib('border', border);

 	html += makeAttrib('cellpadding', cellpadding);

 	html += makeAttrib('cellspacing', cellspacing);

-	html += makeAttrib('_mce_new', '1');

+	html += makeAttrib('data-mce-new', '1');

 

 	if (width && inst.settings.inline_styles) {

 		if (style)

@@ -187,7 +185,7 @@ function insertTable() {
 

 	if (caption) {

 		if (!tinymce.isIE)

-			html += '<caption><br _mce_bogus="1"/></caption>';

+			html += '<caption><br data-mce-bogus="1"/></caption>';

 		else

 			html += '<caption></caption>';

 	}

@@ -197,7 +195,7 @@ function insertTable() {
 

 		for (var x=0; x<cols; x++) {

 			if (!tinymce.isIE)

-				html += '<td><br _mce_bogus="1"/></td>';

+				html += '<td><br data-mce-bogus="1"/></td>';

 			else

 				html += '<td></td>';

 		}

@@ -207,8 +205,6 @@ function insertTable() {
 

 	html += "</table>";

 

-	inst.execCommand('mceBeginUndoLevel');

-

 	// Move table

 	if (inst.settings.fix_table_elements) {

 		var patt = '';

@@ -231,13 +227,18 @@ function insertTable() {
 	} else

 		inst.execCommand('mceInsertContent', false, html);

 

-	tinymce.each(dom.select('table[_mce_new]'), function(node) {

+	tinymce.each(dom.select('table[data-mce-new]'), function(node) {

 		var td = dom.select('td', node);

 

-		inst.selection.select(td[0], true);

-		inst.selection.collapse();

+		try {

+			// IE9 might fail to do this selection

+			inst.selection.select(td[0], true);

+			inst.selection.collapse();

+		} catch (ex) {

+			// Ignore

+		}

 

-		dom.setAttrib(node, '_mce_new', '');

+		dom.setAttrib(node, 'data-mce-new', '');

 	});

 

 	inst.addVisual();

@@ -279,7 +280,7 @@ function init() {
 

 	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 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");

@@ -316,7 +317,7 @@ function init() {
 		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");

+		background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");

 		formObj.caption.checked = elm.getElementsByTagName('caption').length > 0;

 

 		orgTableWidth = width;

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
index 000332a35..8352d9ffa 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
@@ -7,7 +7,7 @@ rowtype:"Row in table part",
 title:"Insert/Modify table",

 width:"Width",

 height:"Height",

-cols:"Cols",

+cols:"Columns",

 rows:"Rows",

 cellspacing:"Cellspacing",

 cellpadding:"Cellpadding",

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
index 9736ed8c0..d231090e7 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
@@ -7,20 +7,20 @@
 	<script type="text/javascript" src="../../utils/validate.js"></script>

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

 </head>

-<body style="margin: 8px">

+<body style="margin: 8px" role="application">

 <form onsubmit="MergeCellsDialog.merge();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>

+		<table role="presentation" border="0" cellpadding="0" cellspacing="3" width="100%">

+			<tr>

+				<td><label for="numcols">{#table_dlg.cols}</label>:</td>

+				<td align="right"><input type="text" id="numcols" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" aria-required="true" /></td>

+			</tr>

+			<tr>

+				<td><label for="numrows">{#table_dlg.rows}</label>:</td>

+				<td align="right"><input type="text" id="numrows" name="numrows" value="" class="number min1" style="width: 30px" aria-required="true" /></td>

+			</tr>

+		</table>

 	</fieldset>

 

 	<div class="mceActionPanel">

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/row.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/row.htm
index 092e6c827..c197ff6c7 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/row.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/row.htm
@@ -9,12 +9,12 @@
 	<script type="text/javascript" src="js/row.js"></script>

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

 </head>

-<body id="tablerow" style="display: none">

+<body id="tablerow" style="display: none" role="application">

 	<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>

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

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

 			</ul>

 		</div>

 

@@ -23,7 +23,7 @@
 				<fieldset>

 					<legend>{#table_dlg.general_props}</legend>

 

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

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

 						<tr>

 							<td><label for="rowtype">{#table_dlg.rowtype}</label></td>

 							<td class="col2">

@@ -80,7 +80,7 @@
 				<fieldset>

 					<legend>{#table_dlg.advanced_props}</legend>

 

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

+					<table role="presentation" 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> 

@@ -112,7 +112,7 @@
 						<tr>

 							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 

 							<td>

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

+								<table role="presentation" 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>

@@ -122,14 +122,16 @@
 						</tr>

 

 						<tr>

-							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 

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

 							<td>

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

+								<span role="group" aria-labelledby="bgcolor_label">

+								<table role="presentation" 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>

+								</span>

 							</td> 

 						</tr>

 					</table>

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/table.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/table.htm
index f26903922..4a873b0a6 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/table.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/table.htm
@@ -10,12 +10,13 @@
 	<script type="text/javascript" src="js/table.js"></script>

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

 </head>

-<body id="table" style="display: none">

+<body id="table" style="display: none" role="application" aria-labelledby="app_title">

+	<span style="display:none;" id="app_title">{#table_dlg.title}</span>

 	<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>

+				<li id="general_tab" aria-controls="general_panel" 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" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

 			</ul>

 		</div>

 

@@ -23,48 +24,48 @@
 			<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="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>

+					<table role="presentation" 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" aria-required="true" /></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" aria-required="true" /></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="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>

 

@@ -72,7 +73,7 @@
 				<fieldset>

 					<legend>{#table_dlg.advanced_props}</legend>

 

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

+					<table role="presentation" 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> 

@@ -98,7 +99,7 @@
 						<tr>

 							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 

 							<td>

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

+								<table role="presentation" aria-labelledby="backgroundimage_label" 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>

@@ -150,10 +151,10 @@
 							</td> 

 						</tr>

 

-						<tr>

-							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 

+						<tr role="group" aria-labelledby="bordercolor_label">

+							<td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td> 

 							<td>

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

+								<table role="presentation" 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>

@@ -162,10 +163,10 @@
 							</td> 

 						</tr>

 

-						<tr>

-							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 

+						<tr role="group" aria-labelledby="bgcolor_label">

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

 							<td>

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

+								<table role="presentation" 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>

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/template/js/template.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
index 24045d731..bc3045d24 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
@@ -42,7 +42,7 @@ var TemplateDialog = {
 

 		if (e) {

 			e.style.height = Math.abs(h) + 'px';

-			e.style.width  = Math.abs(w - 5) + 'px';

+			e.style.width = Math.abs(w - 5) + 'px';

 		}

 	},

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js
index 53d31c44f..1a148e8b4 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state){c.state=true;c._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 m=this,g=m.editor,a,e,f,k=g.getDoc(),l=g.getBody(),j,n=g.selection,c;m.state=!m.state;g.controlManager.setActive("visualchars",m.state);if(m.state){a=[];tinymce.walk(l,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(e=0;e<a.length;e++){j=a[e].nodeValue;j=j.replace(/(\u00a0+)/g,'<span class="mceItemHidden mceVisualNbsp">$1</span>');j=j.replace(/\u00a0/g,"\u00b7");g.dom.setOuterHTML(a[e],j,k)}}else{a=tinymce.grep(g.dom.select("span",l),function(b){return g.dom.hasClass(b,"mceVisualNbsp")});for(e=0;e<a.length;e++){g.dom.setOuterHTML(a[e],a[e].innerHTML.replace(/(&middot;|\u00b7)/g,"&nbsp;"),k)}}}});tinymce.PluginManager.add("visualchars",tinymce.plugins.VisualChars)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state&&e.format!="raw"&&!e.draft){c.state=true;c._toggleVisualChars(false)}})},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(m){var p=this,k=p.editor,a,g,j,n=k.getDoc(),o=k.getBody(),l,q=k.selection,e,c,f;p.state=!p.state;k.controlManager.setActive("visualchars",p.state);if(m){f=q.getBookmark()}if(p.state){a=[];tinymce.walk(o,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(g=0;g<a.length;g++){l=a[g].nodeValue;l=l.replace(/(\u00a0)/g,'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');c=k.dom.create("div",null,l);while(node=c.lastChild){k.dom.insertAfter(node,a[g])}k.dom.remove(a[g])}}else{a=k.dom.select("span.mceItemNbsp",o);for(g=a.length-1;g>=0;g--){k.dom.remove(a[g],1)}}q.moveToBookmark(f)}});tinymce.PluginManager.add("visualchars",tinymce.plugins.VisualChars)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
index 0a5275fe2..df985905b 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
@@ -22,9 +22,9 @@
 			ed.addButton('visualchars', {title : 'visualchars.desc', cmd : 'mceVisualChars'});

 

 			ed.onBeforeGetContent.add(function(ed, o) {

-				if (t.state) {

+				if (t.state && o.format != 'raw' && !o.draft) {

 					t.state = true;

-					t._toggleVisualChars();

+					t._toggleVisualChars(false);

 				}

 			});

 		},

@@ -41,12 +41,15 @@
 

 		// Private methods

 

-		_toggleVisualChars : function() {

-			var t = this, ed = t.editor, nl, i, h, d = ed.getDoc(), b = ed.getBody(), nv, s = ed.selection, bo;

+		_toggleVisualChars : function(bookmark) {

+			var t = this, ed = t.editor, nl, i, h, d = ed.getDoc(), b = ed.getBody(), nv, s = ed.selection, bo, div, bm;

 

 			t.state = !t.state;

 			ed.controlManager.setActive('visualchars', t.state);

 

+			if (bookmark)

+				bm = s.getBookmark();

+

 			if (t.state) {

 				nl = [];

 				tinymce.walk(b, function(n) {

@@ -54,20 +57,24 @@
 						nl.push(n);

 				}, 'childNodes');

 

-				for (i=0; i<nl.length; i++) {

+				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);

+					nv = nv.replace(/(\u00a0)/g, '<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');

+

+					div = ed.dom.create('div', null, nv);

+					while (node = div.lastChild)

+						ed.dom.insertAfter(node, nl[i]);

+

+					ed.dom.remove(nl[i]);

 				}

 			} else {

-				nl = tinymce.grep(ed.dom.select('span', b), function(n) {

-					return ed.dom.hasClass(n, 'mceVisualNbsp');

-				});

+				nl = ed.dom.select('span.mceItemNbsp', b);

 

-				for (i=0; i<nl.length; i++)

-					ed.dom.setOuterHTML(nl[i], nl[i].innerHTML.replace(/(&middot;|\u00b7)/g, '&nbsp;'), d);

+				for (i = nl.length - 1; i >= 0; i--)

+					ed.dom.remove(nl[i], 1);

 			}

+

+			s.moveToBookmark(bm);

 		}

 	});

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
index f1928359c..e769d09f6 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(a,b){var c=this,d=0;c.countre=a.getParam("wordcount_countregex",/\S\s+/g);c.cleanre=a.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$¿'"_+=\\/-]*/g);c.id=a.id+"-word-count";a.onPostRender.add(function(f,e){var g,h;h=f.getParam("wordcount_target_id");if(!h){g=tinymce.DOM.get(f.id+"_path_row");if(g){tinymce.DOM.add(g.parentNode,"div",{style:"float: right"},f.getLang("wordcount.words","Words: ")+'<span id="'+c.id+'">0</span>')}}else{tinymce.DOM.add(h,"span",{},'<span id="'+c.id+'">0</span>')}});a.onInit.add(function(e){e.selection.onSetContent.add(function(){c._count(e)});c._count(e)});a.onSetContent.add(function(e){c._count(e)});a.onKeyUp.add(function(f,g){if(g.keyCode==d){return}if(13==g.keyCode||8==d||46==d){c._count(f)}d=g.keyCode})},_count:function(b){var c=this,a=0;if(c.block){return}c.block=1;setTimeout(function(){var d=b.getContent({format:"raw"});if(d){d=d.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");d=d.replace(c.cleanre,"");d.replace(c.countre,function(){a++})}tinymce.DOM.setHTML(c.id,a.toString());setTimeout(function(){c.block=0},2000)},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(a,b){var c=this,d=0;c.countre=a.getParam("wordcount_countregex",/[\w\u2019\'-]+/g);c.cleanre=a.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);c.id=a.id+"-word-count";a.onPostRender.add(function(f,e){var g,h;h=f.getParam("wordcount_target_id");if(!h){g=tinymce.DOM.get(f.id+"_path_row");if(g){tinymce.DOM.add(g.parentNode,"div",{style:"float: right"},f.getLang("wordcount.words","Words: ")+'<span id="'+c.id+'">0</span>')}}else{tinymce.DOM.add(h,"span",{},'<span id="'+c.id+'">0</span>')}});a.onInit.add(function(e){e.selection.onSetContent.add(function(){c._count(e)});c._count(e)});a.onSetContent.add(function(e){c._count(e)});a.onKeyUp.add(function(f,g){if(g.keyCode==d){return}if(13==g.keyCode||8==d||46==d){c._count(f)}d=g.keyCode})},_getCount:function(c){var a=0;var b=c.getContent({format:"raw"});if(b){b=b.replace(/\.\.\./g," ");b=b.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");b=b.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," ");b=b.replace(this.cleanre,"");var d=b.match(this.countre);if(d){a=d.length}}return a},_count:function(a){var b=this;if(b.block){return}b.block=1;setTimeout(function(){var c=b._getCount(a);tinymce.DOM.setHTML(b.id,c.toString());setTimeout(function(){b.block=0},2000)},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
index bdfebf1b3..6c9a3ead2 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
@@ -9,7 +9,7 @@
  */

 

 (function() {

-    tinymce.create('tinymce.plugins.WordCount', {

+	tinymce.create('tinymce.plugins.WordCount', {

 		block : 0,

 		id : null,

 		countre : null,

@@ -18,8 +18,8 @@
 		init : function(ed, url) {

 			var t = this, last = 0;

 

-			t.countre = ed.getParam('wordcount_countregex', /\S\s+/g);

-			t.cleanre = ed.getParam('wordcount_cleanregex', /[0-9.(),;:!?%#$¿'"_+=\\/-]*/g);

+			t.countre = ed.getParam('wordcount_countregex', /[\w\u2019\'-]+/g); // u2019 == &rsquo;

+			t.cleanre = ed.getParam('wordcount_cleanregex', /[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);

 			t.id = ed.id + '-word-count';

 

 			ed.onPostRender.add(function(ed, cm) {

@@ -32,11 +32,12 @@
 

 					if (row)

 						tinymce.DOM.add(row.parentNode, 'div', {'style': 'float: right'}, ed.getLang('wordcount.words', 'Words: ') + '<span id="' + t.id + '">0</span>');

-				} else

+				} else {

 					tinymce.DOM.add(id, 'span', {}, '<span id="' + t.id + '">0</span>');

+				}

 			});

 

-            ed.onInit.add(function(ed) {

+			ed.onInit.add(function(ed) {

 				ed.selection.onSetContent.add(function() {

 					t._count(ed);

 				});

@@ -59,8 +60,29 @@
 			});

 		},

 

+		_getCount : function(ed) {

+			var tc = 0;

+			var tx = ed.getContent({ format: 'raw' });

+

+			if (tx) {

+					tx = tx.replace(/\.\.\./g, ' '); // convert ellipses to spaces

+					tx = tx.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' '); // remove html tags and space chars

+

+					// deal with html entities

+					tx = tx.replace(/(\w+)(&.+?;)+(\w+)/, "$1$3").replace(/&.+?;/g, ' ');

+					tx = tx.replace(this.cleanre, ''); // remove numbers and punctuation

+

+					var wordArray = tx.match(this.countre);

+					if (wordArray) {

+							tc = wordArray.length;

+					}

+			}

+

+			return tc;

+		},

+

 		_count : function(ed) {

-			var t = this, tc = 0;

+			var t = this;

 

 			// Keep multiple calls from happening at the same time

 			if (t.block)

@@ -69,21 +91,15 @@
 			t.block = 1;

 

 			setTimeout(function() {

-				var tx = ed.getContent({format : 'raw'});

-

-				if (tx) {

-					tx = tx.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' '); // remove html tags and space chars

-					tx = tx.replace(t.cleanre, ''); // remove numbers and punctuation

-					tx.replace(t.countre, function() {tc++;}); // count the words

-				}

+					var tc = t._getCount(ed);

 

-				tinymce.DOM.setHTML(t.id, tc.toString());

+					tinymce.DOM.setHTML(t.id, tc.toString());

 

-				setTimeout(function() {t.block = 0;}, 2000);

+					setTimeout(function() {t.block = 0;}, 2000);

 			}, 1);

 		},

 

-        getInfo: function() {

+		getInfo: function() {

 			return {

 				longname : 'Word Count plugin',

 				author : 'Moxiecode Systems AB',

@@ -91,8 +107,8 @@
 				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount',

 				version : tinymce.majorVersion + "." + tinymce.minorVersion

 			};

-        }

-    });

+		}

+	});

 

-    tinymce.PluginManager.add('wordcount', tinymce.plugins.WordCount);

+	tinymce.PluginManager.add('wordcount', tinymce.plugins.WordCount);

 })();

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
index 3aeac0deb..30a894f7c 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/abbr.js"></script>

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

 </head>

-<body style="display: none">

+<body style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_abbr_element}</span>

 <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="general_tab" class="current" aria-controls="general_panel"><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>

@@ -23,7 +24,7 @@
 		<div id="general_panel" class="panel current">

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

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

+				<table role="presentation" 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> 

@@ -41,7 +42,7 @@
 						</td>

 					</tr>

 					<tr>

-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

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

 					</tr>

 					<tr>

@@ -67,7 +68,7 @@
 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

 

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

+				<table role="presentation" 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> 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
index 31ee7b70f..c10934592 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/acronym.js"></script>

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

 </head>

-<body style="display: none">

+<body style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_acronym_element}</span>

 <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="general_tab" class="current" aria-controls="general_panel"><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>

@@ -23,7 +24,7 @@
 		<div id="general_panel" class="panel current">

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

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

+				<table role="presentation" 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> 

@@ -41,7 +42,7 @@
 						</td>

 					</tr>

 					<tr>

-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

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

 					</tr>

 					<tr>

@@ -67,7 +68,7 @@
 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

 

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

+				<table role="presentation" 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> 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
index 17054da3e..e8d606a34 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
@@ -9,12 +9,13 @@
 	<script type="text/javascript" src="js/attributes.js"></script>

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

 </head>

-<body style="display: none">

+<body style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.attribs_title}</span>

 <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>

+			<li id="general_tab" class="current" aria-controls="general_panel"><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" aria-controls="events_panel"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_events_tab}</a></span></li>

 		</ul>

 	</div>

 

@@ -22,7 +23,7 @@
 		<div id="general_panel" class="panel current">

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.attribute_attrib_tab}</legend>

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

+				<table role="presentation" 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> 

@@ -75,7 +76,7 @@
 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.attribute_events_tab}</legend>

 

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

+				<table role="presentation" 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> 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
index d0a3e3a8e..0ac6bdb66 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/cite.js"></script>

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

 </head>

-<body style="display: none">

+<body style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_cite_element}</span>

 <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="general_tab" class="current" aria-controls="general_panel"><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>

@@ -23,7 +24,7 @@
 		<div id="general_panel" class="panel current">

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

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

+				<table role="presentation" 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> 

@@ -67,7 +68,7 @@
 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

 

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

+				<table role="presentation" 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> 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
index 8b07fa842..5f667510f 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/del.js"></script>

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

 </head>

-<body id="xhtmlxtrasins" style="display: none">

+<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_del_element}</span>

 <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="general_tab" class="current" aria-controls="general_panel"><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>

@@ -23,14 +24,14 @@
 		<div id="general_panel" class="panel current">

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>

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

+				<table role="presentation" 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">

+							<table role="presentation" 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" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>

+									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse" role="button" aria-labelledby="datetimelabel"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>

 								</tr>

 							</table>

 						</td>

@@ -43,7 +44,7 @@
 			</fieldset>

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

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

+				<table role="presentation" 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> 

@@ -61,7 +62,7 @@
 						</td>

 					</tr>

 					<tr>

-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

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

 					</tr>

 					<tr>

@@ -87,7 +88,7 @@
 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

 

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

+				<table role="presentation" 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> 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
index e5195265e..9b98a5154 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(b,c){b.addCommand("mceCite",function(){b.windowManager.open({file:c+"/cite.htm",width:350+parseInt(b.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(b.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:c})});b.addCommand("mceAcronym",function(){b.windowManager.open({file:c+"/acronym.htm",width:350+parseInt(b.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(b.getLang("xhtmlxtras.acronym_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceAbbr",function(){b.windowManager.open({file:c+"/abbr.htm",width:350+parseInt(b.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(b.getLang("xhtmlxtras.abbr_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceDel",function(){b.windowManager.open({file:c+"/del.htm",width:340+parseInt(b.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(b.getLang("xhtmlxtras.del_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceIns",function(){b.windowManager.open({file:c+"/ins.htm",width:340+parseInt(b.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(b.getLang("xhtmlxtras.ins_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceAttributes",function(){b.windowManager.open({file:c+"/attributes.htm",width:380,height:370,inline:1},{plugin_url:c})});b.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});b.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});b.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});b.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});b.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});b.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});if(tinymce.isIE){function a(d,e){if(e.set){e.content=e.content.replace(/<abbr([^>]+)>/gi,"<html:abbr $1>");e.content=e.content.replace(/<\/abbr>/gi,"</html:abbr>")}}b.onBeforeSetContent.add(a);b.onPostProcess.add(a)}b.onNodeChange.add(function(e,d,g,f){g=e.dom.getParent(g,"CITE,ACRONYM,ABBR,DEL,INS");d.setDisabled("cite",f);d.setDisabled("acronym",f);d.setDisabled("abbr",f);d.setDisabled("del",f);d.setDisabled("ins",f);d.setDisabled("attribs",g&&g.nodeName=="BODY");d.setActive("cite",0);d.setActive("acronym",0);d.setActive("abbr",0);d.setActive("del",0);d.setActive("ins",0);if(g){do{d.setDisabled(g.nodeName.toLowerCase(),0);d.setActive(g.nodeName.toLowerCase(),1)}while(g=g.parentNode)}});b.onPreInit.add(function(){b.dom.create("abbr")})},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
+(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(a,b){a.addCommand("mceCite",function(){a.windowManager.open({file:b+"/cite.htm",width:350+parseInt(a.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAcronym",function(){a.windowManager.open({file:b+"/acronym.htm",width:350+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.acronym_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAbbr",function(){a.windowManager.open({file:b+"/abbr.htm",width:350+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.abbr_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceDel",function(){a.windowManager.open({file:b+"/del.htm",width:340+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.del_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceIns",function(){a.windowManager.open({file:b+"/ins.htm",width:340+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.ins_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAttributes",function(){a.windowManager.open({file:b+"/attributes.htm",width:380+parseInt(a.getLang("xhtmlxtras.attr_delta_width",0)),height:370+parseInt(a.getLang("xhtmlxtras.attr_delta_height",0)),inline:1},{plugin_url:b})});a.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});a.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});a.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});a.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});a.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});a.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});a.onNodeChange.add(function(d,c,f,e){f=d.dom.getParent(f,"CITE,ACRONYM,ABBR,DEL,INS");c.setDisabled("cite",e);c.setDisabled("acronym",e);c.setDisabled("abbr",e);c.setDisabled("del",e);c.setDisabled("ins",e);c.setDisabled("attribs",f&&f.nodeName=="BODY");c.setActive("cite",0);c.setActive("acronym",0);c.setActive("abbr",0);c.setActive("del",0);c.setActive("ins",0);if(f){do{c.setDisabled(f.nodeName.toLowerCase(),0);c.setActive(f.nodeName.toLowerCase(),1)}while(f=f.parentNode)}});a.onPreInit.add(function(){a.dom.create("abbr")})},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/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
index 9b51b8368..f24057211 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
@@ -27,7 +27,7 @@
 				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)),

+					height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_height', 0)),

 					inline : 1

 				}, {

 					plugin_url : url

@@ -38,7 +38,7 @@
 				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)),

+					height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_height', 0)),

 					inline : 1

 				}, {

 					plugin_url : url

@@ -49,7 +49,7 @@
 				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)),

+					height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_height', 0)),

 					inline : 1

 				}, {

 					plugin_url : url

@@ -60,7 +60,7 @@
 				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)),

+					height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_height', 0)),

 					inline : 1

 				}, {

 					plugin_url : url

@@ -70,8 +70,8 @@
 			ed.addCommand('mceAttributes', function() {

 				ed.windowManager.open({

 					file : url + '/attributes.htm',

-					width : 380,

-					height : 370,

+					width : 380 + parseInt(ed.getLang('xhtmlxtras.attr_delta_width', 0)),

+					height : 370 + parseInt(ed.getLang('xhtmlxtras.attr_delta_height', 0)),

 					inline : 1

 				}, {

 					plugin_url : url

@@ -86,18 +86,6 @@
 			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');

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
index 6c5470cfc..d001ac7c4 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/ins.js"></script>

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

 </head>

-<body id="xhtmlxtrasins" style="display: none">

+<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_ins_element}</span>

 <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="general_tab" class="current" aria-controls="general_panel"><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>

@@ -23,19 +24,19 @@
 		<div id="general_panel" class="panel current">

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>

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

+				<table role="presentation" 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">

+							<table role="presentation" 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" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>

+									<td ><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse" role="button" aria-labelledby="datetimelabel"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>

 								</tr>

 							</table>

 						</td>

 					</tr>

-					<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>

@@ -43,9 +44,9 @@
 			</fieldset>

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

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

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

 					<tr>

-						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<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>

@@ -61,7 +62,7 @@
 						</td>

 					</tr>

 					<tr>

-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

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

 					</tr>

 					<tr>

@@ -87,7 +88,7 @@
 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

 

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

+				<table role="presentation" 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> 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
index d62a219e6..9c99995ad 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
@@ -53,7 +53,6 @@ function insertAction() {
 	var inst = tinyMCEPopup.editor;

 	var elm = inst.selection.getNode();

 

-	tinyMCEPopup.execCommand("mceBeginUndoLevel");	

 	setAllAttribs(elm);

 	tinyMCEPopup.execCommand("mceEndUndoLevel");

 	tinyMCEPopup.close();

@@ -72,21 +71,7 @@ function setAttrib(elm, attrib, value) {
 			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);

+	dom.setAttrib(elm, attrib.toLowerCase(), value);

 }

 

 function setAllAttribs(elm) {

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
index 9e5d8c571..1f957dc78 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
@@ -21,17 +21,17 @@ function setElementAttribs(elm) {
 	setAllCommonAttribs(elm);

 	setAttrib(elm, 'datetime');

 	setAttrib(elm, 'cite');

+	elm.removeAttribute('data-mce-new');

 }

 

 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) {

 			insertInlineElement('del');

-			var elementArray = tinymce.grep(SXE.inst.dom.select('del'), function(n) {return n.id == '#sxe_temp_del#';});

+			var elementArray = SXE.inst.dom.select('del[data-mce-new]');

 			for (var i=0; i<elementArray.length; i++) {

 				var elm = elementArray[i];

 				setElementAttribs(elm);

@@ -45,16 +45,6 @@ function insertDel() {
 	tinyMCEPopup.close();

 }

 

-function insertInlineElement(en) {

-	var ed = tinyMCEPopup.editor, dom = ed.dom;

-

-	ed.getDoc().execCommand('FontName', false, 'mceinline');

-	tinymce.each(dom.select(tinymce.isWebKit ? 'span' : 'font'), function(n) {

-		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')

-			dom.replace(dom.create(en), n, 1);

-	});

-}

-

 function removeDel() {

 	SXE.removeElement('del');

 	tinyMCEPopup.close();

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
index 5b494a566..4e5d9c3bb 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
@@ -154,7 +154,6 @@ SXE.initElementDialog = function(element_name) {
 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) {

@@ -165,11 +164,11 @@ SXE.insertElement = function(element_name) {
 			for (var i=0; i<elementArray.length; i++) {

 				var elm = elementArray[i];

 

-				if (SXE.inst.dom.getAttrib(elm, '_mce_new')) {

+				if (SXE.inst.dom.getAttrib(elm, 'data-mce-new')) {

 					elm.id = '';

 					elm.setAttribute('id', '');

 					elm.removeAttribute('id');

-					elm.removeAttribute('_mce_new');

+					elm.removeAttribute('data-mce-new');

 

 					setAllCommonAttribs(elm);

 				}

@@ -186,7 +185,6 @@ 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');

@@ -226,6 +224,6 @@ function insertInlineElement(en) {
 	ed.getDoc().execCommand('FontName', false, 'mceinline');

 	tinymce.each(dom.select('span,font'), function(n) {

 		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')

-			dom.replace(dom.create(en, {_mce_new : 1}), n, 1);

+			dom.replace(dom.create(en, {'data-mce-new' : 1}), n, 1);

 	});

 }

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
index 3774f0a18..c4addfb01 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
@@ -21,16 +21,17 @@ function setElementAttribs(elm) {
 	setAllCommonAttribs(elm);

 	setAttrib(elm, 'datetime');

 	setAttrib(elm, 'cite');

+	elm.removeAttribute('data-mce-new');

 }

 

 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) {

-			insertInlineElement('INS');

-			var elementArray = tinymce.grep(SXE.inst.dom.select('ins'), function(n) {return n.id == '#sxe_temp_ins#';});

+			insertInlineElement('ins');

+			var elementArray = SXE.inst.dom.select('ins[data-mce-new]');

 			for (var i=0; i<elementArray.length; i++) {

 				var elm = elementArray[i];

 				setElementAttribs(elm);

@@ -49,14 +50,4 @@ function removeIns() {
 	tinyMCEPopup.close();

 }

 

-function insertInlineElement(en) {

-	var ed = tinyMCEPopup.editor, dom = ed.dom;

-

-	ed.getDoc().execCommand('FontName', false, 'mceinline');

-	tinymce.each(dom.select(tinymce.isWebKit ? 'span' : 'font'), function(n) {

-		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')

-			dom.replace(dom.create(en), n, 1);

-	});

-}

-

 tinyMCEPopup.onInit.add(init);

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/about.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/about.htm
index 267f837eb..7a97cb715 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/about.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/about.htm
@@ -9,9 +9,9 @@
 <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>

+				<li id="general_tab" class="current" aria-controls="general_panel"><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" aria-hidden="true" aria-controls="help_panel"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{#advanced_dlg.about_help}</a></span></li>

+				<li id="plugins_tab" aria-controls="plugins_panel"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{#advanced_dlg.about_plugins}</a></span></li>

 			</ul>

 		</div>

 

@@ -26,8 +26,6 @@
 

 				<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>

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm
index 2bc63fcfd..75c93b799 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm
@@ -5,15 +5,15 @@
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

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

 </head>

-<body style="display: none">

+<body style="display: none" role="application" aria-labelledby="app_title">

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

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

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

 		<tr>

-			<td colspan="2" class="title">{#advanced_dlg.anchor_title}</td>

+			<td colspan="2" class="title" id="app_title">{#advanced_dlg.anchor_title}</td>

 		</tr>

 		<tr>

-			<td class="nowrap">{#advanced_dlg.anchor_name}:</td>

-			<td><input name="anchorName" type="text" class="mceFocus" id="anchorName" value="" style="width: 200px" /></td>

+			<td class="nowrap"><label for="anchorName">{#advanced_dlg.anchor_name}:</label></td>

+			<td><input name="anchorName" type="text" class="mceFocus" id="anchorName" value="" style="width: 200px" aria-required="true" /></td>

 		</tr>

 	</table>

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
index 3991b8141..2c3b3f27b 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
@@ -6,47 +6,46 @@
 	<script type="text/javascript" src="js/charmap.js"></script>

 </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">

+<table align="center" border="0" cellspacing="0" cellpadding="2" role="presentation">

+	<tr>

+		<td colspan="2" class="title" ><label for="charmapView" id="charmap_label">{#advanced_dlg.charmap_title}</label></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>

+		</td>

+		<td width="100" align="center" valign="top">

+			<table border="0" cellpadding="0" cellspacing="0" width="100" style="height:100px" role="presentation">

+				<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" role="presentation">

+				<tr>

+					<td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;"><label for="codeA">HTML-Code</label></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;"><label for="codeB">NUM-Code</label></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/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
index 096e7550c..ad1bb0f6c 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
@@ -6,13 +6,14 @@
 	<script type="text/javascript" src="../../utils/mctabs.js"></script>

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

 </head>

-<body id="colorpicker" style="display: none">

+<body id="colorpicker" style="display: none" role="application" aria-labelledby="app_label">

+	<span class="mceVoiceLabel" id="app_label" style="display:none;">{#advanced_dlg.colorpicker_title}</span>

 <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>

+			<li id="picker_tab" aria-controls="picker_panel" 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" aria-controls="rgb_panel"><span><a href="javascript:;" onclick="mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_palette_tab}</a></span></li>

+			<li id="named_tab" aria-controls="named_panel"><span><a  href="javascript:;" onclick="javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_named_tab}</a></span></li>

 		</ul>

 	</div>

 

@@ -34,7 +35,7 @@
 

 		<div id="rgb_panel" class="panel">

 			<fieldset>

-				<legend>{#advanced_dlg.colorpicker_palette_title}</legend>

+				<legend id="webcolors_title">{#advanced_dlg.colorpicker_palette_title}</legend>

 				<div id="webcolors">

 					<!-- Gets filled with web safe colors-->

 				</div>

@@ -44,9 +45,9 @@
 		</div>

 

 		<div id="named_panel" class="panel">

-			<fieldset>

-				<legend>{#advanced_dlg.colorpicker_named_title}</legend>

-				<div id="namedcolors">

+			<fieldset id="named_picker_label">

+				<legend id="named_title">{#advanced_dlg.colorpicker_named_title}</legend>

+				<div id="namedcolors" role="listbox" tabindex="0" aria-labelledby="named_picker_label">

 					<!-- Gets filled with named colors-->

 				</div>

 

@@ -65,7 +66,7 @@
 		<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" />

+			<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" class="text mceFocus" aria-required="true" />

 		</div>

 	</div>

 </form>

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
index 008b99557..ba8dd4c30 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
@@ -1 +1 @@
-(function(e){var d=e.DOM,b=e.dom.Event,h=e.extend,f=e.each,a=e.util.Cookie,g,c=e.explode;e.ThemeManager.requireLangPack("advanced");e.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],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(j,k){var l=this,m,i,n;l.editor=j;l.url=k;l.onResolveName=new e.util.Dispatcher(this);l.settings=m=h({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_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",readonly:j.settings.readonly},j.settings);if(!m.font_size_style_values){m.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(e.is(m.theme_advanced_font_sizes,"string")){m.font_size_style_values=e.explode(m.font_size_style_values);m.font_size_classes=e.explode(m.font_size_classes||"");n={};j.settings.theme_advanced_font_sizes=m.theme_advanced_font_sizes;f(j.getParam("theme_advanced_font_sizes","","hash"),function(q,p){var o;if(p==q&&q>=1&&q<=7){p=q+" ("+l.sizes[q-1]+"pt)";o=m.font_size_classes[q-1];q=m.font_size_style_values[q-1]||(l.sizes[q-1]+"pt")}if(/^\s*\./.test(q)){o=q.replace(/\./g,"")}n[p]=o?{"class":o}:{fontSize:q}});m.theme_advanced_font_sizes=n}if((i=m.theme_advanced_path_location)&&i!="none"){m.theme_advanced_statusbar_location=m.theme_advanced_path_location}if(m.theme_advanced_statusbar_location=="none"){m.theme_advanced_statusbar_location=0}j.onInit.add(function(){if(!j.settings.readonly){j.onNodeChange.add(l._nodeChanged,l)}if(j.settings.content_css!==false){j.dom.loadCSS(j.baseURI.toAbsolute("themes/advanced/skins/"+j.settings.skin+"/content.css"))}});j.onSetProgressState.add(function(q,o,r){var s,t=q.id,p;if(o){l.progressTimer=setTimeout(function(){s=q.getContainer();s=s.insertBefore(d.create("DIV",{style:"position:relative"}),s.firstChild);p=d.get(q.id+"_tbl");d.add(s,"div",{id:t+"_blocker","class":"mceBlocker",style:{width:p.clientWidth+2,height:p.clientHeight+2}});d.add(s,"div",{id:t+"_progress","class":"mceProgress",style:{left:p.clientWidth/2,top:p.clientHeight/2}})},r||0)}else{d.remove(t+"_blocker");d.remove(t+"_progress");clearTimeout(l.progressTimer)}});d.loadCSS(m.editor_css?j.documentBaseURI.toAbsolute(m.editor_css):k+"/skins/"+j.settings.skin+"/ui.css");if(m.skin_variant){d.loadCSS(k+"/skins/"+j.settings.skin+"/ui_"+m.skin_variant+".css")}},createControl:function(l,i){var j,k;if(k=i.createControl(l)){return k}switch(l){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((j=this.controls[l])){return i.createButton(l,{title:"advanced."+j[0],cmd:j[1],ui:j[2],value:j[3]})}},execCommand:function(k,j,l){var i=this["_"+k];if(i){i.call(this,j,l);return true}return false},_importClasses:function(k){var i=this.editor,j=i.controlManager.get("styleselect");if(j.getLength()==0){f(i.dom.getClasses(),function(n,l){var m="style_"+l;i.formatter.register(m,{inline:"span",attributes:{"class":n["class"]},selector:"*"});j.add(n["class"],m)})}},_createStyleSelect:function(m){var k=this,i=k.editor,j=i.controlManager,l;l=j.createListBox("styleselect",{title:"advanced.style_select",onselect:function(o){var p,n=[];f(l.items,function(q){n.push(q.value)});i.focus();p=i.formatter.matchAll(n);if(p[0]==o){i.formatter.remove(o)}else{i.formatter.apply(o)}return false}});i.onInit.add(function(){var o=0,n=i.getParam("style_formats");if(n){f(n,function(p){var q,r=0;f(p,function(){r++});if(r>1){q=p.name=p.name||"style_"+(o++);i.formatter.register(q,p);l.add(p.title,q)}else{l.add(p.title)}})}else{f(i.getParam("theme_advanced_styles","","hash"),function(r,q){var p;if(r){p="style_"+(o++);i.formatter.register(p,{inline:"span",classes:r,selector:"*"});l.add(k.editor.translate(q),p)}})}});if(l.getLength()==0){l.onPostRender.add(function(o,p){if(!l.NativeListBox){b.add(p.id+"_text","focus",k._importClasses,k);b.add(p.id+"_text","mousedown",k._importClasses,k);b.add(p.id+"_open","focus",k._importClasses,k);b.add(p.id+"_open","mousedown",k._importClasses,k)}else{b.add(p.id,"focus",k._importClasses,k)}})}return l},_createFontSelect:function(){var k,j=this,i=j.editor;k=i.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(l){i.execCommand("FontName",false,l);return false}});if(k){f(i.getParam("theme_advanced_fonts",j.settings.theme_advanced_fonts,"hash"),function(m,l){k.add(i.translate(l),m,{style:m.indexOf("dings")==-1?"font-family:"+m:""})})}return k},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(i){if(i["class"]){k.focus();k.formatter.toggle("fontsize_class",{value:i["class"]})}else{k.execCommand("FontSize",false,i.fontSize)}return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(o,i){var p=o.fontSize;if(p>=1&&p<=7){p=m.sizes[parseInt(p)-1]+"pt"}n.add(i,o,{style:"font-size:"+p,"class":"mceFontSize"+(l++)+(" "+(o["class"]||""))})})}return n},_createBlockFormats:function(){var k,i={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"},j=this;k=j.editor.controlManager.createListBox("formatselect",{title:"advanced.block",cmd:"FormatBlock"});if(k){f(j.editor.getParam("theme_advanced_blockformats",j.settings.theme_advanced_blockformats,"hash"),function(m,l){k.add(j.editor.translate(l!=m?l:i[m]),m,{"class":"mce_formatPreview mce_"+m})})}return k},_createForeColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_text_colors){l.colors=i}if(k.theme_advanced_default_foreground_color){l.default_color=k.theme_advanced_default_foreground_color}l.title="advanced.forecolor_desc";l.cmd="ForeColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("forecolor",l);return m},_createBackColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_background_colors){l.colors=i}if(k.theme_advanced_default_background_color){l.default_color=k.theme_advanced_default_background_color}l.title="advanced.backcolor_desc";l.cmd="HiliteColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("backcolor",l);return m},renderUI:function(k){var m,l,q,v=this,r=v.editor,w=v.settings,u,j,i;m=j=d.create("span",{id:r.id+"_parent","class":"mceEditor "+r.settings.skin+"Skin"+(w.skin_variant?" "+r.settings.skin+"Skin"+v._ufirst(w.skin_variant):"")});if(!d.boxModel){m=d.add(m,"div",{"class":"mceOldBoxModel"})}m=u=d.add(m,"table",{id:r.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});m=q=d.add(m,"tbody");switch((w.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":l=v._rowLayout(w,q,k);break;case"customlayout":l=r.execCallback("theme_advanced_custom_layout",w,q,k,j);break;default:l=v._simpleLayout(w,q,k,j)}m=k.targetNode;i=d.stdMode?u.getElementsByTagName("tr"):u.rows;d.addClass(i[0],"mceFirst");d.addClass(i[i.length-1],"mceLast");f(d.select("tr",q),function(o){d.addClass(o.firstChild,"mceFirst");d.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(d.get(w.theme_advanced_toolbar_container)){d.get(w.theme_advanced_toolbar_container).appendChild(j)}else{d.insertAfter(j,m)}b.add(r.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){v._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return b.cancel(n)}});if(!r.getParam("accessibility_focus")){b.add(d.add(j,"a",{href:"#"},"<!-- IE -->"),"focus",function(){tinyMCE.get(r.id).focus()})}if(w.theme_advanced_toolbar_location=="external"){k.deltaHeight=0}v.deltaHeight=k.deltaHeight;k.targetNode=null;return{iframeContainer:l,editorContainer:r.id+"_parent",sizeContainer:u,deltaHeight:k.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:e.majorVersion+"."+e.minorVersion}},resizeBy:function(i,j){var k=d.get(this.editor.id+"_tbl");this.resizeTo(k.clientWidth+i,k.clientHeight+j)},resizeTo:function(i,l){var j=this.editor,k=this.settings,m=d.get(j.id+"_tbl"),n=d.get(j.id+"_ifr");i=Math.max(k.theme_advanced_resizing_min_width||100,i);l=Math.max(k.theme_advanced_resizing_min_height||100,l);i=Math.min(k.theme_advanced_resizing_max_width||65535,i);l=Math.min(k.theme_advanced_resizing_max_height||65535,l);d.setStyle(m,"height","");d.setStyle(n,"height",l);if(k.theme_advanced_resize_horizontal){d.setStyle(m,"width","");d.setStyle(n,"width",i);if(i<m.clientWidth){d.setStyle(n,"width",m.clientWidth)}}},destroy:function(){var i=this.editor.id;b.clear(i+"_resize");b.clear(i+"_path_row");b.clear(i+"_external_close")},_simpleLayout:function(y,r,k,i){var x=this,u=x.editor,v=y.theme_advanced_toolbar_location,m=y.theme_advanced_statusbar_location,l,j,q,w;if(y.readonly){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});return j}if(v=="top"){x._addToolbars(r,k)}if(v=="external"){l=w=d.create("div",{style:"position:relative"});l=d.add(l,"div",{id:u.id+"_external","class":"mceExternalToolbar"});d.add(l,"a",{id:u.id+"_external_close",href:"javascript:;","class":"mceExternalClose"});l=d.add(l,"table",{id:u.id+"_tblext",cellSpacing:0,cellPadding:0});q=d.add(l,"tbody");if(i.firstChild.className=="mceOldBoxModel"){i.firstChild.appendChild(w)}else{i.insertBefore(w,i.firstChild)}x._addToolbars(q,k);u.onMouseUp.add(function(){var o=d.get(u.id+"_external");d.show(o);d.hide(g);var n=b.add(u.id+"_external_close","click",function(){d.hide(u.id+"_external");b.remove(u.id+"_external_close","click",n)});d.show(o);d.setStyle(o,"top",0-d.getRect(u.id+"_tblext").h-1);d.hide(o);d.show(o);o.style.filter="";g=u.id+"_external";o=null})}if(m=="top"){x._addStatusBar(r,k)}if(!y.theme_advanced_toolbar_container){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"})}if(v=="bottom"){x._addToolbars(r,k)}if(m=="bottom"){x._addStatusBar(r,k)}return j},_rowLayout:function(w,m,k){var v=this,p=v.editor,u,x,i=p.controlManager,l,j,r,q;u=w.theme_advanced_containers_default_class||"";x=w.theme_advanced_containers_default_align||"center";f(c(w.theme_advanced_containers||""),function(s,o){var n=w["theme_advanced_container_"+s]||"";switch(n.toLowerCase()){case"mceeditor":l=d.add(m,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});break;case"mceelementpath":v._addStatusBar(m,k);break;default:q=(w["theme_advanced_container_"+s+"_align"]||x).toLowerCase();q="mce"+v._ufirst(q);l=d.add(d.add(m,"tr"),"td",{"class":"mceToolbar "+(w["theme_advanced_container_"+s+"_class"]||u)+" "+q||x});r=i.createToolbar("toolbar"+o);v._addControls(n,r);d.setHTML(l,r.renderHTML());k.deltaHeight-=w.theme_advanced_row_height}});return j},_addControls:function(j,i){var k=this,l=k.settings,m,n=k.editor.controlManager;if(l.theme_advanced_disable&&!k._disabled){m={};f(c(l.theme_advanced_disable),function(o){m[o]=1});k._disabled=m}else{m=k._disabled}f(c(j),function(p){var o;if(m&&m[p]){return}if(p=="tablecontrols"){f(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(q){q=k.createControl(q,n);if(q){i.add(q)}});return}o=k.createControl(p,n);if(o){i.add(o)}})},_addToolbars:function(w,k){var z=this,p,m,r=z.editor,A=z.settings,y,j=r.controlManager,u,l,q=[],x;x=A.theme_advanced_toolbar_align.toLowerCase();x="mce"+z._ufirst(x);l=d.add(d.add(w,"tr"),"td",{"class":"mceToolbar "+x});if(!r.getParam("accessibility_focus")){q.push(d.createHTML("a",{href:"#",onfocus:"tinyMCE.get('"+r.id+"').focus();"},"<!-- IE -->"))}q.push(d.createHTML("a",{href:"#",accesskey:"q",title:r.getLang("advanced.toolbar_focus")},"<!-- IE -->"));for(p=1;(y=A["theme_advanced_buttons"+p]);p++){m=j.createToolbar("toolbar"+p,{"class":"mceToolbarRow"+p});if(A["theme_advanced_buttons"+p+"_add"]){y+=","+A["theme_advanced_buttons"+p+"_add"]}if(A["theme_advanced_buttons"+p+"_add_before"]){y=A["theme_advanced_buttons"+p+"_add_before"]+","+y}z._addControls(y,m);q.push(m.renderHTML());k.deltaHeight-=A.theme_advanced_row_height}q.push(d.createHTML("a",{href:"#",accesskey:"z",title:r.getLang("advanced.toolbar_focus"),onfocus:"tinyMCE.getInstanceById('"+r.id+"').focus();"},"<!-- IE -->"));d.setHTML(l,q.join(""))},_addStatusBar:function(m,j){var k,v=this,p=v.editor,w=v.settings,i,q,u,l;k=d.add(m,"tr");k=l=d.add(k,"td",{"class":"mceStatusbar"});k=d.add(k,"div",{id:p.id+"_path_row"},w.theme_advanced_path?p.translate("advanced.path")+": ":"&#160;");d.add(k,"a",{href:"#",accesskey:"x"});if(w.theme_advanced_resizing){d.add(l,"a",{id:p.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize"});if(w.theme_advanced_resizing_use_cookie){p.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+p.id+"_size"),r=d.get(p.id+"_tbl");if(!n){return}v.resizeTo(n.cw,n.ch)})}p.onPostRender.add(function(){b.add(p.id+"_resize","mousedown",function(D){var t,r,s,o,C,z,A,F,n,E,x;function y(G){n=A+(G.screenX-C);E=F+(G.screenY-z);v.resizeTo(n,E)}function B(G){b.remove(d.doc,"mousemove",t);b.remove(p.getDoc(),"mousemove",r);b.remove(d.doc,"mouseup",s);b.remove(p.getDoc(),"mouseup",o);if(w.theme_advanced_resizing_use_cookie){a.setHash("TinyMCE_"+p.id+"_size",{cw:n,ch:E})}}D.preventDefault();C=D.screenX;z=D.screenY;x=d.get(v.editor.id+"_ifr");A=n=x.clientWidth;F=E=x.clientHeight;t=b.add(d.doc,"mousemove",y);r=b.add(p.getDoc(),"mousemove",y);s=b.add(d.doc,"mouseup",B);o=b.add(p.getDoc(),"mouseup",B)})})}j.deltaHeight-=21;k=m=null},_nodeChanged:function(r,z,l,x,j){var C=this,i,y=0,B,u,D=C.settings,A,k,w,m,q;e.each(C.stateControls,function(n){z.setActive(n,r.queryCommandState(C.controls[n][1]))});function o(p){var s,n=j.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s<n.length;s++){if(t(n[s])){return n[s]}}}z.setActive("visualaid",r.hasVisual);z.setDisabled("undo",!r.undoManager.hasUndo()&&!r.typing);z.setDisabled("redo",!r.undoManager.hasRedo());z.setDisabled("outdent",!r.queryCommandState("Outdent"));i=o("A");if(u=z.get("link")){if(!i||!i.name){u.setDisabled(!i&&x);u.setActive(!!i)}}if(u=z.get("unlink")){u.setDisabled(!i&&x);u.setActive(!!i&&!i.name)}if(u=z.get("anchor")){u.setActive(!!i&&i.name)}i=o("IMG");if(u=z.get("image")){u.setActive(!!i&&l.className.indexOf("mceItem")==-1)}if(u=z.get("styleselect")){C._importClasses();m=[];f(u.items,function(n){m.push(n.value)});q=r.formatter.matchAll(m);u.select(q[0])}if(u=z.get("formatselect")){i=o(d.isBlock);if(i){u.select(i.nodeName.toLowerCase())}}o(function(p){if(p.nodeName==="SPAN"){if(!A&&p.className){A=p.className}if(!k&&p.style.fontSize){k=p.style.fontSize}if(!w&&p.style.fontFamily){w=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}}return false});if(u=z.get("fontselect")){u.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==w})}if(u=z.get("fontsizeselect")){if(D.theme_advanced_runtime_fontsize&&!k&&!A){k=r.dom.getStyle(l,"fontSize",true)}u.select(function(n){if(n.fontSize&&n.fontSize===k){return true}if(n["class"]&&n["class"]===A){return true}})}if(D.theme_advanced_path&&D.theme_advanced_statusbar_location){i=d.get(r.id+"_path")||d.add(r.id+"_path_row","span",{id:r.id+"_path"});d.setHTML(i,"");o(function(E){var p=E.nodeName.toLowerCase(),s,v,t="";if(E.nodeType!=1||E.nodeName==="BR"||(d.hasClass(E,"mceItemHidden")||d.hasClass(E,"mceItemRemoved"))){return}if(B=d.getAttrib(E,"mce_name")){p=B}if(e.isIE&&E.scopeName!=="HTML"){p=E.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(B=d.getAttrib(E,"src")){t+="src: "+B+" "}break;case"a":if(B=d.getAttrib(E,"name")){t+="name: "+B+" ";p+="#"+B}if(B=d.getAttrib(E,"href")){t+="href: "+B+" "}break;case"font":if(B=d.getAttrib(E,"face")){t+="font: "+B+" "}if(B=d.getAttrib(E,"size")){t+="size: "+B+" "}if(B=d.getAttrib(E,"color")){t+="color: "+B+" "}break;case"span":if(B=d.getAttrib(E,"style")){t+="style: "+B+" "}break}if(B=d.getAttrib(E,"id")){t+="id: "+B+" "}if(B=E.className){B=B.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(B){t+="class: "+B+" ";if(d.isBlock(E)||p=="img"||p=="span"){p+="."+B}}}p=p.replace(/(html:)/g,"");p={name:p,node:E,title:t};C.onResolveName.dispatch(C,p);t=p.title;p=p.name;v=d.create("a",{href:"javascript:;",onmousedown:"return false;",title:t,"class":"mcePath_"+(y++)},p);if(i.hasChildNodes()){i.insertBefore(d.doc.createTextNode(" \u00bb "),i.firstChild);i.insertBefore(v,i.firstChild)}else{i.appendChild(v)}},r.getBody())}},_sel:function(i){this.editor.execCommand("mceSelectNodeDepth",false,i)},_mceInsertAnchor:function(k,j){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/anchor.htm",width:320+parseInt(i.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(i.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/charmap.htm",width:550+parseInt(i.getLang("advanced.charmap_delta_width",0)),height:250+parseInt(i.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(k,j){var i=this.editor;j=j||{};i.windowManager.open({url:e.baseURL+"/themes/advanced/color_picker.htm",width:375+parseInt(i.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(i.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:j.color,func:j.func,theme_url:this.url})},_mceCodeEditor:function(j,k){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/source_editor.htm",width:parseInt(i.getParam("theme_advanced_source_editor_width",720)),height:parseInt(i.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(j,k){var i=this.editor;if(i.dom.getAttrib(i.selection.getNode(),"class").indexOf("mceItem")!=-1){return}i.windowManager.open({url:e.baseURL+"/themes/advanced/image.htm",width:355+parseInt(i.getLang("advanced.image_delta_width",0)),height:275+parseInt(i.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(j,k){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/link.htm",width:310+parseInt(i.getLang("advanced.link_delta_width",0)),height:200+parseInt(i.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var i=this.editor;i.windowManager.confirm("advanced.newdocument",function(j){if(j){i.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var i=this;this._mceColorPicker(0,{color:i.fgColor,func:function(j){i.fgColor=j;i.editor.execCommand("ForeColor",false,j)}})},_mceBackColor:function(){var i=this;this._mceColorPicker(0,{color:i.bgColor,func:function(j){i.bgColor=j;i.editor.execCommand("HiliteColor",false,j)}})},_ufirst:function(i){return i.substring(0,1).toUpperCase()+i.substring(1)}});e.ThemeManager.add("advanced",e.themes.AdvancedTheme)}(tinymce));
\ No newline at end of file
+(function(e){var d=e.DOM,b=e.dom.Event,h=e.extend,f=e.each,a=e.util.Cookie,g,c=e.explode;e.ThemeManager.requireLangPack("advanced");e.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],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(j,k){var l=this,m,i,n;l.editor=j;l.url=k;l.onResolveName=new e.util.Dispatcher(this);j.forcedHighContrastMode=j.settings.detect_highcontrast&&l._isHighContrast();j.settings.skin=j.forcedHighContrastMode?"highcontrast":j.settings.skin;l.settings=m=h({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_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",theme_advanced_font_selector:"span",theme_advanced_show_current_color:0,readonly:j.settings.readonly},j.settings);if(!m.font_size_style_values){m.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(e.is(m.theme_advanced_font_sizes,"string")){m.font_size_style_values=e.explode(m.font_size_style_values);m.font_size_classes=e.explode(m.font_size_classes||"");n={};j.settings.theme_advanced_font_sizes=m.theme_advanced_font_sizes;f(j.getParam("theme_advanced_font_sizes","","hash"),function(q,p){var o;if(p==q&&q>=1&&q<=7){p=q+" ("+l.sizes[q-1]+"pt)";o=m.font_size_classes[q-1];q=m.font_size_style_values[q-1]||(l.sizes[q-1]+"pt")}if(/^\s*\./.test(q)){o=q.replace(/\./g,"")}n[p]=o?{"class":o}:{fontSize:q}});m.theme_advanced_font_sizes=n}if((i=m.theme_advanced_path_location)&&i!="none"){m.theme_advanced_statusbar_location=m.theme_advanced_path_location}if(m.theme_advanced_statusbar_location=="none"){m.theme_advanced_statusbar_location=0}if(j.settings.content_css!==false){j.contentCSS.push(j.baseURI.toAbsolute(k+"/skins/"+j.settings.skin+"/content.css"))}j.onInit.add(function(){if(!j.settings.readonly){j.onNodeChange.add(l._nodeChanged,l);j.onKeyUp.add(l._updateUndoStatus,l);j.onMouseUp.add(l._updateUndoStatus,l);j.dom.bind(j.dom.getRoot(),"dragend",function(){l._updateUndoStatus(j)})}});j.onSetProgressState.add(function(q,o,r){var s,t=q.id,p;if(o){l.progressTimer=setTimeout(function(){s=q.getContainer();s=s.insertBefore(d.create("DIV",{style:"position:relative"}),s.firstChild);p=d.get(q.id+"_tbl");d.add(s,"div",{id:t+"_blocker","class":"mceBlocker",style:{width:p.clientWidth+2,height:p.clientHeight+2}});d.add(s,"div",{id:t+"_progress","class":"mceProgress",style:{left:p.clientWidth/2,top:p.clientHeight/2}})},r||0)}else{d.remove(t+"_blocker");d.remove(t+"_progress");clearTimeout(l.progressTimer)}});d.loadCSS(m.editor_css?j.documentBaseURI.toAbsolute(m.editor_css):k+"/skins/"+j.settings.skin+"/ui.css");if(m.skin_variant){d.loadCSS(k+"/skins/"+j.settings.skin+"/ui_"+m.skin_variant+".css")}},_isHighContrast:function(){var i,j=d.add(d.getRoot(),"div",{style:"background-color: rgb(171,239,86);"});i=(d.getStyle(j,"background-color",true)+"").toLowerCase().replace(/ /g,"");d.remove(j);return i!="rgb(171,239,86)"&&i!="#abef56"},createControl:function(l,i){var j,k;if(k=i.createControl(l)){return k}switch(l){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((j=this.controls[l])){return i.createButton(l,{title:"advanced."+j[0],cmd:j[1],ui:j[2],value:j[3]})}},execCommand:function(k,j,l){var i=this["_"+k];if(i){i.call(this,j,l);return true}return false},_importClasses:function(k){var i=this.editor,j=i.controlManager.get("styleselect");if(j.getLength()==0){f(i.dom.getClasses(),function(n,l){var m="style_"+l;i.formatter.register(m,{inline:"span",attributes:{"class":n["class"]},selector:"*"});j.add(n["class"],m)})}},_createStyleSelect:function(m){var k=this,i=k.editor,j=i.controlManager,l;l=j.createListBox("styleselect",{title:"advanced.style_select",onselect:function(o){var p,n=[];f(l.items,function(q){n.push(q.value)});i.focus();i.undoManager.add();p=i.formatter.matchAll(n);if(!o||p[0]==o){if(p[0]){i.formatter.remove(p[0])}}else{i.formatter.apply(o)}i.undoManager.add();i.nodeChanged();return false}});i.onInit.add(function(){var o=0,n=i.getParam("style_formats");if(n){f(n,function(p){var q,r=0;f(p,function(){r++});if(r>1){q=p.name=p.name||"style_"+(o++);i.formatter.register(q,p);l.add(p.title,q)}else{l.add(p.title)}})}else{f(i.getParam("theme_advanced_styles","","hash"),function(r,q){var p;if(r){p="style_"+(o++);i.formatter.register(p,{inline:"span",classes:r,selector:"*"});l.add(k.editor.translate(q),p)}})}});if(l.getLength()==0){l.onPostRender.add(function(o,p){if(!l.NativeListBox){b.add(p.id+"_text","focus",k._importClasses,k);b.add(p.id+"_text","mousedown",k._importClasses,k);b.add(p.id+"_open","focus",k._importClasses,k);b.add(p.id+"_open","mousedown",k._importClasses,k)}else{b.add(p.id,"focus",k._importClasses,k)}})}return l},_createFontSelect:function(){var k,j=this,i=j.editor;k=i.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(l){var m=k.items[k.selectedIndex];if(!l&&m){i.execCommand("FontName",false,m.value);return}i.execCommand("FontName",false,l);k.select(function(n){return l==n});if(m&&m.value==l){k.select(null)}return false}});if(k){f(i.getParam("theme_advanced_fonts",j.settings.theme_advanced_fonts,"hash"),function(m,l){k.add(i.translate(l),m,{style:m.indexOf("dings")==-1?"font-family:"+m:""})})}return k},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(i){var o=n.items[n.selectedIndex];if(!i&&o){o=o.value;if(o["class"]){k.formatter.toggle("fontsize_class",{value:o["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,o.fontSize)}return}if(i["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:i["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,i.fontSize)}n.select(function(p){return i==p});if(o&&(o.value.fontSize==i.fontSize||o.value["class"]==i["class"])){n.select(null)}return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(o,i){var p=o.fontSize;if(p>=1&&p<=7){p=m.sizes[parseInt(p)-1]+"pt"}n.add(i,o,{style:"font-size:"+p,"class":"mceFontSize"+(l++)+(" "+(o["class"]||""))})})}return n},_createBlockFormats:function(){var k,i={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"},j=this;k=j.editor.controlManager.createListBox("formatselect",{title:"advanced.block",onselect:function(l){j.editor.execCommand("FormatBlock",false,l);return false}});if(k){f(j.editor.getParam("theme_advanced_blockformats",j.settings.theme_advanced_blockformats,"hash"),function(m,l){k.add(j.editor.translate(l!=m?l:i[m]),m,{"class":"mce_formatPreview mce_"+m})})}return k},_createForeColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_text_colors){l.colors=i}if(k.theme_advanced_default_foreground_color){l.default_color=k.theme_advanced_default_foreground_color}l.title="advanced.forecolor_desc";l.cmd="ForeColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("forecolor",l);return m},_createBackColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_background_colors){l.colors=i}if(k.theme_advanced_default_background_color){l.default_color=k.theme_advanced_default_background_color}l.title="advanced.backcolor_desc";l.cmd="HiliteColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("backcolor",l);return m},renderUI:function(k){var m,l,q,v=this,r=v.editor,w=v.settings,u,j,i;if(r.settings){r.settings.aria_label=w.aria_label+r.getLang("advanced.help_shortcut")}m=j=d.create("span",{role:"application","aria-labelledby":r.id+"_voice",id:r.id+"_parent","class":"mceEditor "+r.settings.skin+"Skin"+(w.skin_variant?" "+r.settings.skin+"Skin"+v._ufirst(w.skin_variant):"")});d.add(m,"span",{"class":"mceVoiceLabel",style:"display:none;",id:r.id+"_voice"},w.aria_label);if(!d.boxModel){m=d.add(m,"div",{"class":"mceOldBoxModel"})}m=u=d.add(m,"table",{role:"presentation",id:r.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});m=q=d.add(m,"tbody");switch((w.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":l=v._rowLayout(w,q,k);break;case"customlayout":l=r.execCallback("theme_advanced_custom_layout",w,q,k,j);break;default:l=v._simpleLayout(w,q,k,j)}m=k.targetNode;i=u.rows;d.addClass(i[0],"mceFirst");d.addClass(i[i.length-1],"mceLast");f(d.select("tr",q),function(o){d.addClass(o.firstChild,"mceFirst");d.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(d.get(w.theme_advanced_toolbar_container)){d.get(w.theme_advanced_toolbar_container).appendChild(j)}else{d.insertAfter(j,m)}b.add(r.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){v._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return b.cancel(n)}});if(!r.getParam("accessibility_focus")){b.add(d.add(j,"a",{href:"#"},"<!-- IE -->"),"focus",function(){tinyMCE.get(r.id).focus()})}if(w.theme_advanced_toolbar_location=="external"){k.deltaHeight=0}v.deltaHeight=k.deltaHeight;k.targetNode=null;r.onKeyDown.add(function(p,n){var s=121,o=122;if(n.altKey){if(n.keyCode===s){v.toolbarGroup.focus();return b.cancel(n)}else{if(n.keyCode===o){d.get(p.id+"_path_row").focus();return b.cancel(n)}}}});r.addShortcut("alt+0","","mceShortcuts",v);return{iframeContainer:l,editorContainer:r.id+"_parent",sizeContainer:u,deltaHeight:k.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:e.majorVersion+"."+e.minorVersion}},resizeBy:function(i,j){var k=d.get(this.editor.id+"_ifr");this.resizeTo(k.clientWidth+i,k.clientHeight+j)},resizeTo:function(i,m,k){var j=this.editor,l=this.settings,n=d.get(j.id+"_tbl"),o=d.get(j.id+"_ifr");i=Math.max(l.theme_advanced_resizing_min_width||100,i);m=Math.max(l.theme_advanced_resizing_min_height||100,m);i=Math.min(l.theme_advanced_resizing_max_width||65535,i);m=Math.min(l.theme_advanced_resizing_max_height||65535,m);d.setStyle(n,"height","");d.setStyle(o,"height",m);if(l.theme_advanced_resize_horizontal){d.setStyle(n,"width","");d.setStyle(o,"width",i);if(i<n.clientWidth){i=n.clientWidth;d.setStyle(o,"width",n.clientWidth)}}if(k&&l.theme_advanced_resizing_use_cookie){a.setHash("TinyMCE_"+j.id+"_size",{cw:i,ch:m})}},destroy:function(){var i=this.editor.id;b.clear(i+"_resize");b.clear(i+"_path_row");b.clear(i+"_external_close")},_simpleLayout:function(y,r,k,i){var x=this,u=x.editor,v=y.theme_advanced_toolbar_location,m=y.theme_advanced_statusbar_location,l,j,q,w;if(y.readonly){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});return j}if(v=="top"){x._addToolbars(r,k)}if(v=="external"){l=w=d.create("div",{style:"position:relative"});l=d.add(l,"div",{id:u.id+"_external","class":"mceExternalToolbar"});d.add(l,"a",{id:u.id+"_external_close",href:"javascript:;","class":"mceExternalClose"});l=d.add(l,"table",{id:u.id+"_tblext",cellSpacing:0,cellPadding:0});q=d.add(l,"tbody");if(i.firstChild.className=="mceOldBoxModel"){i.firstChild.appendChild(w)}else{i.insertBefore(w,i.firstChild)}x._addToolbars(q,k);u.onMouseUp.add(function(){var o=d.get(u.id+"_external");d.show(o);d.hide(g);var n=b.add(u.id+"_external_close","click",function(){d.hide(u.id+"_external");b.remove(u.id+"_external_close","click",n)});d.show(o);d.setStyle(o,"top",0-d.getRect(u.id+"_tblext").h-1);d.hide(o);d.show(o);o.style.filter="";g=u.id+"_external";o=null})}if(m=="top"){x._addStatusBar(r,k)}if(!y.theme_advanced_toolbar_container){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"})}if(v=="bottom"){x._addToolbars(r,k)}if(m=="bottom"){x._addStatusBar(r,k)}return j},_rowLayout:function(w,m,k){var v=this,p=v.editor,u,x,i=p.controlManager,l,j,r,q;u=w.theme_advanced_containers_default_class||"";x=w.theme_advanced_containers_default_align||"center";f(c(w.theme_advanced_containers||""),function(s,o){var n=w["theme_advanced_container_"+s]||"";switch(s.toLowerCase()){case"mceeditor":l=d.add(m,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});break;case"mceelementpath":v._addStatusBar(m,k);break;default:q=(w["theme_advanced_container_"+s+"_align"]||x).toLowerCase();q="mce"+v._ufirst(q);l=d.add(d.add(m,"tr"),"td",{"class":"mceToolbar "+(w["theme_advanced_container_"+s+"_class"]||u)+" "+q||x});r=i.createToolbar("toolbar"+o);v._addControls(n,r);d.setHTML(l,r.renderHTML());k.deltaHeight-=w.theme_advanced_row_height}});return j},_addControls:function(j,i){var k=this,l=k.settings,m,n=k.editor.controlManager;if(l.theme_advanced_disable&&!k._disabled){m={};f(c(l.theme_advanced_disable),function(o){m[o]=1});k._disabled=m}else{m=k._disabled}f(c(j),function(p){var o;if(m&&m[p]){return}if(p=="tablecontrols"){f(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(q){q=k.createControl(q,n);if(q){i.add(q)}});return}o=k.createControl(p,n);if(o){i.add(o)}})},_addToolbars:function(x,k){var A=this,p,m,r=A.editor,B=A.settings,z,j=r.controlManager,u,l,q=[],y,w;w=j.createToolbarGroup("toolbargroup",{name:r.getLang("advanced.toolbar"),tab_focus_toolbar:r.getParam("theme_advanced_tab_focus_toolbar")});A.toolbarGroup=w;y=B.theme_advanced_toolbar_align.toLowerCase();y="mce"+A._ufirst(y);l=d.add(d.add(x,"tr",{role:"presentation"}),"td",{"class":"mceToolbar "+y,role:"presentation"});for(p=1;(z=B["theme_advanced_buttons"+p]);p++){m=j.createToolbar("toolbar"+p,{"class":"mceToolbarRow"+p});if(B["theme_advanced_buttons"+p+"_add"]){z+=","+B["theme_advanced_buttons"+p+"_add"]}if(B["theme_advanced_buttons"+p+"_add_before"]){z=B["theme_advanced_buttons"+p+"_add_before"]+","+z}A._addControls(z,m);w.add(m);k.deltaHeight-=B.theme_advanced_row_height}q.push(w.renderHTML());q.push(d.createHTML("a",{href:"#",accesskey:"z",title:r.getLang("advanced.toolbar_focus"),onfocus:"tinyMCE.getInstanceById('"+r.id+"').focus();"},"<!-- IE -->"));d.setHTML(l,q.join(""))},_addStatusBar:function(m,j){var k,v=this,p=v.editor,w=v.settings,i,q,u,l;k=d.add(m,"tr");k=l=d.add(k,"td",{"class":"mceStatusbar"});k=d.add(k,"div",{id:p.id+"_path_row",role:"group","aria-labelledby":p.id+"_path_voice"});if(w.theme_advanced_path){d.add(k,"span",{id:p.id+"_path_voice"},p.translate("advanced.path"));d.add(k,"span",{},": ")}else{d.add(k,"span",{},"&#160;")}if(w.theme_advanced_resizing){d.add(l,"a",{id:p.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize"});if(w.theme_advanced_resizing_use_cookie){p.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+p.id+"_size"),r=d.get(p.id+"_tbl");if(!n){return}v.resizeTo(n.cw,n.ch)})}p.onPostRender.add(function(){b.add(p.id+"_resize","click",function(n){n.preventDefault()});b.add(p.id+"_resize","mousedown",function(D){var t,r,s,o,C,z,A,F,n,E,x;function y(G){G.preventDefault();n=A+(G.screenX-C);E=F+(G.screenY-z);v.resizeTo(n,E)}function B(G){b.remove(d.doc,"mousemove",t);b.remove(p.getDoc(),"mousemove",r);b.remove(d.doc,"mouseup",s);b.remove(p.getDoc(),"mouseup",o);n=A+(G.screenX-C);E=F+(G.screenY-z);v.resizeTo(n,E,true)}D.preventDefault();C=D.screenX;z=D.screenY;x=d.get(v.editor.id+"_ifr");A=n=x.clientWidth;F=E=x.clientHeight;t=b.add(d.doc,"mousemove",y);r=b.add(p.getDoc(),"mousemove",y);s=b.add(d.doc,"mouseup",B);o=b.add(p.getDoc(),"mouseup",B)})})}j.deltaHeight-=21;k=m=null},_updateUndoStatus:function(j){var i=j.controlManager;i.setDisabled("undo",!j.undoManager.hasUndo()&&!j.typing);i.setDisabled("redo",!j.undoManager.hasRedo())},_nodeChanged:function(m,r,D,q,E){var y=this,C,F=0,x,G,z=y.settings,w,k,u,B,l,j,i;e.each(y.stateControls,function(n){r.setActive(n,m.queryCommandState(y.controls[n][1]))});function o(p){var s,n=E.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s<n.length;s++){if(t(n[s])){return n[s]}}}r.setActive("visualaid",m.hasVisual);y._updateUndoStatus(m);r.setDisabled("outdent",!m.queryCommandState("Outdent"));C=o("A");if(G=r.get("link")){if(!C||!C.name){G.setDisabled(!C&&q);G.setActive(!!C)}}if(G=r.get("unlink")){G.setDisabled(!C&&q);G.setActive(!!C&&!C.name)}if(G=r.get("anchor")){G.setActive(!q&&!!C&&C.name)}C=o("IMG");if(G=r.get("image")){G.setActive(!q&&!!C&&D.className.indexOf("mceItem")==-1)}if(G=r.get("styleselect")){y._importClasses();j=[];f(G.items,function(n){j.push(n.value)});i=m.formatter.matchAll(j);G.select(i[0])}if(G=r.get("formatselect")){C=o(d.isBlock);if(C){G.select(C.nodeName.toLowerCase())}}o(function(p){if(p.nodeName==="SPAN"){if(!w&&p.className){w=p.className}}if(m.dom.is(p,z.theme_advanced_font_selector)){if(!k&&p.style.fontSize){k=p.style.fontSize}if(!u&&p.style.fontFamily){u=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}if(!B&&p.style.color){B=p.style.color}if(!l&&p.style.backgroundColor){l=p.style.backgroundColor}}return false});if(G=r.get("fontselect")){G.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==u})}if(G=r.get("fontsizeselect")){if(z.theme_advanced_runtime_fontsize&&!k&&!w){k=m.dom.getStyle(D,"fontSize",true)}G.select(function(n){if(n.fontSize&&n.fontSize===k){return true}if(n["class"]&&n["class"]===w){return true}})}if(z.theme_advanced_show_current_color){function A(p,n){if(G=r.get(p)){if(!n){n=G.settings.default_color}if(n!==G.value){G.displayColor(n)}}}A("forecolor",B);A("backcolor",l)}if(z.theme_advanced_show_current_color){function A(p,n){if(G=r.get(p)){if(!n){n=G.settings.default_color}if(n!==G.value){G.displayColor(n)}}}A("forecolor",B);A("backcolor",l)}if(z.theme_advanced_path&&z.theme_advanced_statusbar_location){C=d.get(m.id+"_path")||d.add(m.id+"_path_row","span",{id:m.id+"_path"});if(y.statusKeyboardNavigation){y.statusKeyboardNavigation.destroy();y.statusKeyboardNavigation=null}d.setHTML(C,"");o(function(H){var p=H.nodeName.toLowerCase(),s,v,t="";if(H.getAttribute("data-mce-bogus")){return}if(H.nodeType!=1||H.nodeName==="BR"||(d.hasClass(H,"mceItemHidden")||d.hasClass(H,"mceItemRemoved"))){return}if(e.isIE&&H.scopeName!=="HTML"){p=H.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(x=d.getAttrib(H,"src")){t+="src: "+x+" "}break;case"a":if(x=d.getAttrib(H,"name")){t+="name: "+x+" ";p+="#"+x}if(x=d.getAttrib(H,"href")){t+="href: "+x+" "}break;case"font":if(x=d.getAttrib(H,"face")){t+="font: "+x+" "}if(x=d.getAttrib(H,"size")){t+="size: "+x+" "}if(x=d.getAttrib(H,"color")){t+="color: "+x+" "}break;case"span":if(x=d.getAttrib(H,"style")){t+="style: "+x+" "}break}if(x=d.getAttrib(H,"id")){t+="id: "+x+" "}if(x=H.className){x=x.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(x){t+="class: "+x+" ";if(d.isBlock(H)||p=="img"||p=="span"){p+="."+x}}}p=p.replace(/(html:)/g,"");p={name:p,node:H,title:t};y.onResolveName.dispatch(y,p);t=p.title;p=p.name;v=d.create("a",{href:"javascript:;",role:"button",onmousedown:"return false;",title:t,"class":"mcePath_"+(F++)},p);if(C.hasChildNodes()){C.insertBefore(d.create("span",{"aria-hidden":"true"},"\u00a0\u00bb "),C.firstChild);C.insertBefore(v,C.firstChild)}else{C.appendChild(v)}},m.getBody());if(d.select("a",C).length>0){y.statusKeyboardNavigation=new e.ui.KeyboardNavigation({root:m.id+"_path_row",items:d.select("a",C),excludeFromTabOrder:true,onCancel:function(){m.focus()}},d)}}},_sel:function(i){this.editor.execCommand("mceSelectNodeDepth",false,i)},_mceInsertAnchor:function(k,j){var i=this.editor;i.windowManager.open({url:this.url+"/anchor.htm",width:320+parseInt(i.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(i.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var i=this.editor;i.windowManager.open({url:this.url+"/charmap.htm",width:550+parseInt(i.getLang("advanced.charmap_delta_width",0)),height:250+parseInt(i.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var i=this.editor;i.windowManager.open({url:this.url+"/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceShortcuts:function(){var i=this.editor;i.windowManager.open({url:this.url+"/shortcuts.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(k,j){var i=this.editor;j=j||{};i.windowManager.open({url:this.url+"/color_picker.htm",width:375+parseInt(i.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(i.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:j.color,func:j.func,theme_url:this.url})},_mceCodeEditor:function(j,k){var i=this.editor;i.windowManager.open({url:this.url+"/source_editor.htm",width:parseInt(i.getParam("theme_advanced_source_editor_width",720)),height:parseInt(i.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(j,k){var i=this.editor;if(i.dom.getAttrib(i.selection.getNode(),"class").indexOf("mceItem")!=-1){return}i.windowManager.open({url:this.url+"/image.htm",width:355+parseInt(i.getLang("advanced.image_delta_width",0)),height:275+parseInt(i.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(j,k){var i=this.editor;i.windowManager.open({url:this.url+"/link.htm",width:310+parseInt(i.getLang("advanced.link_delta_width",0)),height:200+parseInt(i.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var i=this.editor;i.windowManager.confirm("advanced.newdocument",function(j){if(j){i.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var i=this;this._mceColorPicker(0,{color:i.fgColor,func:function(j){i.fgColor=j;i.editor.execCommand("ForeColor",false,j)}})},_mceBackColor:function(){var i=this;this._mceColorPicker(0,{color:i.bgColor,func:function(j){i.bgColor=j;i.editor.execCommand("HiliteColor",false,j)}})},_ufirst:function(i){return i.substring(0,1).toUpperCase()+i.substring(1)}});e.ThemeManager.add("advanced",e.themes.AdvancedTheme)}(tinymce));
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
index f3887697c..2bdef96d5 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
@@ -66,6 +66,9 @@
 			t.url = url;

 			t.onResolveName = new tinymce.util.Dispatcher(this);

 

+			ed.forcedHighContrastMode = ed.settings.detect_highcontrast && t._isHighContrast();

+			ed.settings.skin = ed.forcedHighContrastMode ? 'highcontrast' : ed.settings.skin;

+

 			// Default settings

 			t.settings = s = extend({

 				theme_advanced_path : true,

@@ -81,6 +84,8 @@
 				theme_advanced_resize_horizontal : 1,

 				theme_advanced_resizing_use_cookie : 1,

 				theme_advanced_font_sizes : "1,2,3,4,5,6,7",

+				theme_advanced_font_selector : "span",

+				theme_advanced_show_current_color: 0,

 				readonly : ed.settings.readonly

 			}, ed.settings);

 

@@ -119,13 +124,19 @@
 			if (s.theme_advanced_statusbar_location == 'none')

 				s.theme_advanced_statusbar_location = 0;

 

+			if (ed.settings.content_css !== false)

+				ed.contentCSS.push(ed.baseURI.toAbsolute(url + "/skins/" + ed.settings.skin + "/content.css"));

+

 			// Init editor

 			ed.onInit.add(function() {

-				if (!ed.settings.readonly)

+				if (!ed.settings.readonly) {

 					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.onKeyUp.add(t._updateUndoStatus, t);

+					ed.onMouseUp.add(t._updateUndoStatus, t);

+					ed.dom.bind(ed.dom.getRoot(), 'dragend', function() {

+						t._updateUndoStatus(ed);

+					});

+				}

 			});

 

 			ed.onSetProgressState.add(function(ed, b, ti) {

@@ -153,6 +164,15 @@
 				DOM.loadCSS(url + "/skins/" + ed.settings.skin + "/ui_" + s.skin_variant + ".css");

 		},

 

+		_isHighContrast : function() {

+			var actualColor, div = DOM.add(DOM.getRoot(), 'div', {'style': 'background-color: rgb(171,239,86);'});

+

+			actualColor = (DOM.getStyle(div, 'background-color', true) + '').toLowerCase().replace(/ /g, '');

+			DOM.remove(div);

+

+			return actualColor != 'rgb(171,239,86)' && actualColor != '#abef56';

+		},

+

 		createControl : function(n, cf) {

 			var cd, c;

 

@@ -226,14 +246,19 @@
 					});

 

 					ed.focus();

+					ed.undoManager.add();

 

 					// Toggle off the current format

 					matches = ed.formatter.matchAll(formatNames);

-					if (matches[0] == name)

-						ed.formatter.remove(name);

-					else

+					if (!name || matches[0] == name) {

+						if (matches[0]) 

+							ed.formatter.remove(matches[0]);

+					} else

 						ed.formatter.apply(name);

 

+					ed.undoManager.add();

+					ed.nodeChanged();

+

 					return false; // No auto select

 				}

 			});

@@ -296,7 +321,24 @@
 			c = ed.controlManager.createListBox('fontselect', {

 				title : 'advanced.fontdefault',

 				onselect : function(v) {

+					var cur = c.items[c.selectedIndex];

+

+					if (!v && cur) {

+						ed.execCommand('FontName', false, cur.value);

+						return;

+					}

+

 					ed.execCommand('FontName', false, v);

+

+					// Fake selection, execCommand will fire a nodeChange and update the selection

+					c.select(function(sv) {

+						return v == sv;

+					});

+

+					if (cur && cur.value == v) {

+						c.select(null);

+					}

+

 					return false; // No auto select

 				}

 			});

@@ -314,12 +356,40 @@
 			var t = this, ed = t.editor, c, i = 0, cl = [];

 

 			c = ed.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', onselect : function(v) {

+				var cur = c.items[c.selectedIndex];

+

+				if (!v && cur) {

+					cur = cur.value;

+

+					if (cur['class']) {

+						ed.formatter.toggle('fontsize_class', {value : cur['class']});

+						ed.undoManager.add();

+						ed.nodeChanged();

+					} else {

+						ed.execCommand('FontSize', false, cur.fontSize);

+					}

+

+					return;

+				}

+

 				if (v['class']) {

 					ed.focus();

+					ed.undoManager.add();

 					ed.formatter.toggle('fontsize_class', {value : v['class']});

+					ed.undoManager.add();

+					ed.nodeChanged();

 				} else

 					ed.execCommand('FontSize', false, v.fontSize);

 

+				// Fake selection, execCommand will fire a nodeChange and update the selection

+				c.select(function(sv) {

+					return v == sv;

+				});

+

+				if (cur && (cur.value.fontSize == v.fontSize || cur.value['class'] == v['class'])) {

+					c.select(null);

+				}

+

 				return false; // No auto select

 			}});

 

@@ -356,7 +426,11 @@
 				samp : 'advanced.samp'

 			}, t = this;

 

-			c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', cmd : 'FormatBlock'});

+			c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', onselect : function(v) {

+				t.editor.execCommand('FormatBlock', false, v);

+				return false;

+			}});

+

 			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});

@@ -427,12 +501,19 @@
 		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 (ed.settings) {

+				ed.settings.aria_label = s.aria_label + ed.getLang('advanced.help_shortcut');

+			}

+

+			// TODO: ACC Should have an aria-describedby attribute which is user-configurable to describe what this field is actually for.

+			// Maybe actually inherit it from the original textara?

+			n = p = DOM.create('span', {role : 'application', 'aria-labelledby' : ed.id + '_voice', id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '')});

+			DOM.add(n, 'span', {'class': 'mceVoiceLabel', 'style': 'display:none;', id: ed.id + '_voice'}, s.aria_label);

 

 			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 = sc = DOM.add(n, 'table', {role : "presentation", id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0});

 			n = tb = DOM.add(n, 'tbody');

 

 			switch ((s.theme_advanced_layout_manager || '').toLowerCase()) {

@@ -451,7 +532,7 @@
 			n = o.targetNode;

 

 			// Add classes to first and last TRs

-			nl = DOM.stdMode ? sc.getElementsByTagName('tr') : sc.rows; // Quick fix for IE 8

+			nl = sc.rows;

 			DOM.addClass(nl[0], 'mceFirst');

 			DOM.addClass(nl[nl.length - 1], 'mceLast');

 

@@ -507,6 +588,23 @@
 			t.deltaHeight = o.deltaHeight;

 			o.targetNode = null;

 

+			ed.onKeyDown.add(function(ed, evt) {

+				var DOM_VK_F10 = 121, DOM_VK_F11 = 122;

+

+				if (evt.altKey) {

+		 			if (evt.keyCode === DOM_VK_F10) {

+						t.toolbarGroup.focus();

+						return Event.cancel(evt);

+					} else if (evt.keyCode === DOM_VK_F11) {

+						DOM.get(ed.id + '_path_row').focus();

+						return Event.cancel(evt);

+					}

+				}

+			});

+

+			// alt+0 is the UK recommended shortcut for accessing the list of access controls.

+			ed.addShortcut('alt+0', '', 'mceShortcuts', t);

+

 			return {

 				iframeContainer : ic,

 				editorContainer : ed.id + '_parent',

@@ -525,12 +623,12 @@
 		},

 

 		resizeBy : function(dw, dh) {

-			var e = DOM.get(this.editor.id + '_tbl');

+			var e = DOM.get(this.editor.id + '_ifr');

 

 			this.resizeTo(e.clientWidth + dw, e.clientHeight + dh);

 		},

 

-		resizeTo : function(w, h) {

+		resizeTo : function(w, h, store) {

 			var ed = this.editor, s = this.settings, e = DOM.get(ed.id + '_tbl'), ifr = DOM.get(ed.id + '_ifr');

 

 			// Boundery fix box

@@ -548,8 +646,18 @@
 				DOM.setStyle(ifr, 'width', w);

 

 				// Make sure that the size is never smaller than the over all ui

-				if (w < e.clientWidth)

+				if (w < e.clientWidth) {

+					w = e.clientWidth;

 					DOM.setStyle(ifr, 'width', e.clientWidth);

+				}

+			}

+

+			// Store away the size

+			if (store && s.theme_advanced_resizing_use_cookie) {

+				Cookie.setHash("TinyMCE_" + ed.id + "_size", {

+					cw : w,

+					ch : h

+				});

 			}

 		},

 

@@ -644,7 +752,7 @@
 			each(explode(s.theme_advanced_containers || ''), function(c, i) {

 				var v = s['theme_advanced_container_' + c] || '';

 

-				switch (v.toLowerCase()) {

+				switch (c.toLowerCase()) {

 					case 'mceeditor':

 						n = DOM.add(tb, 'tr');

 						n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});

@@ -712,17 +820,19 @@
 		},

 

 		_addToolbars : function(c, o) {

-			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a;

+			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a, toolbarGroup;

 

-			a = s.theme_advanced_toolbar_align.toLowerCase();

-			a = 'mce' + t._ufirst(a);

+			toolbarGroup = cf.createToolbarGroup('toolbargroup', {

+				'name': ed.getLang('advanced.toolbar'),

+				'tab_focus_toolbar':ed.getParam('theme_advanced_tab_focus_toolbar')

+			});

 

-			n = DOM.add(DOM.add(c, 'tr'), 'td', {'class' : 'mceToolbar ' + a});

+			t.toolbarGroup = toolbarGroup;

 

-			if (!ed.getParam('accessibility_focus'))

-				h.push(DOM.createHTML('a', {href : '#', onfocus : 'tinyMCE.get(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));

+			a = s.theme_advanced_toolbar_align.toLowerCase();

+			a = 'mce' + t._ufirst(a);

 

-			h.push(DOM.createHTML('a', {href : '#', accesskey : 'q', title : ed.getLang("advanced.toolbar_focus")}, '<!-- IE -->'));

+			n = DOM.add(DOM.add(c, 'tr', {role: 'presentation'}), 'td', {'class' : 'mceToolbar ' + a, "role":"presentation"});

 

 			// Create toolbar and add the controls

 			for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {

@@ -735,13 +845,11 @@
 					v = s['theme_advanced_buttons' + i + '_add_before'] + ',' + v;

 

 				t._addControls(v, tb);

-

-				//n.appendChild(n = tb.render());

-				h.push(tb.renderHTML());

+				toolbarGroup.add(tb);

 

 				o.deltaHeight -= s.theme_advanced_row_height;

 			}

-

+			h.push(toolbarGroup.renderHTML());

 			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(''));

 		},

@@ -750,9 +858,15 @@
 			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') + ': ' : '&#160;');

-			DOM.add(n, 'a', {href : '#', accesskey : 'x'});

+			n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'}); 

+			n = DOM.add(n, 'div', {id : ed.id + '_path_row', 'role': 'group', 'aria-labelledby': ed.id + '_path_voice'});

+			if (s.theme_advanced_path) {

+				DOM.add(n, 'span', {id: ed.id + '_path_voice'}, ed.translate('advanced.path'));

+				DOM.add(n, 'span', {}, ': ');

+			} else {

+				DOM.add(n, 'span', {}, '&#160;');

+			}

+			

 

 			if (s.theme_advanced_resizing) {

 				DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'mceResize'});

@@ -769,12 +883,18 @@
 				}

 

 				ed.onPostRender.add(function() {

+					Event.add(ed.id + '_resize', 'click', function(e) {

+						e.preventDefault();

+					});

+

 					Event.add(ed.id + '_resize', 'mousedown', function(e) {

 						var mouseMoveHandler1, mouseMoveHandler2,

 							mouseUpHandler1, mouseUpHandler2,

 							startX, startY, startWidth, startHeight, width, height, ifrElm;

 

 						function resizeOnMove(e) {

+							e.preventDefault();

+

 							width = startWidth + (e.screenX - startX);

 							height = startHeight + (e.screenY - startY);

 

@@ -788,13 +908,9 @@
 							Event.remove(DOM.doc, 'mouseup', mouseUpHandler1);

 							Event.remove(ed.getDoc(), 'mouseup', mouseUpHandler2);

 

-							// Store away the size

-							if (s.theme_advanced_resizing_use_cookie) {

-								Cookie.setHash("TinyMCE_" + ed.id + "_size", {

-									cw : width,

-									ch : height

-								});

-							}

+							width = startWidth + (e.screenX - startX);

+							height = startHeight + (e.screenY - startY);

+							t.resizeTo(width, height, true);

 						};

 

 						e.preventDefault();

@@ -819,8 +935,15 @@
 			n = tb = null;

 		},

 

+		_updateUndoStatus : function(ed) {

+			var cm = ed.controlManager;

+

+			cm.setDisabled('undo', !ed.undoManager.hasUndo() && !ed.typing);

+			cm.setDisabled('redo', !ed.undoManager.hasRedo());

+		},

+

 		_nodeChanged : function(ed, cm, n, co, ob) {

-			var t = this, p, de = 0, v, c, s = t.settings, cl, fz, fn, formatNames, matches;

+			var t = this, p, de = 0, v, c, s = t.settings, cl, fz, fn, fc, bc, formatNames, matches;

 

 			tinymce.each(t.stateControls, function(c) {

 				cm.setActive(c, ed.queryCommandState(t.controls[c][1]));

@@ -842,8 +965,7 @@
 			};

 

 			cm.setActive('visualaid', ed.hasVisual);

-			cm.setDisabled('undo', !ed.undoManager.hasUndo() && !ed.typing);

-			cm.setDisabled('redo', !ed.undoManager.hasRedo());

+			t._updateUndoStatus(ed);

 			cm.setDisabled('outdent', !ed.queryCommandState('Outdent'));

 

 			p = getParent('A');

@@ -860,12 +982,12 @@
 			}

 

 			if (c = cm.get('anchor')) {

-				c.setActive(!!p && p.name);

+				c.setActive(!co && !!p && p.name);

 			}

 

 			p = getParent('IMG');

 			if (c = cm.get('image'))

-				c.setActive(!!p && n.className.indexOf('mceItem') == -1);

+				c.setActive(!co && !!p && n.className.indexOf('mceItem') == -1);

 

 			if (c = cm.get('styleselect')) {

 				t._importClasses();

@@ -891,12 +1013,20 @@
 				if (n.nodeName === 'SPAN') {

 					if (!cl && n.className)

 						cl = n.className;

+				}

 

+				if (ed.dom.is(n, s.theme_advanced_font_selector)) {

 					if (!fz && n.style.fontSize)

 						fz = n.style.fontSize;

 

 					if (!fn && n.style.fontFamily)

 						fn = n.style.fontFamily.replace(/[\"\']+/g, '').replace(/^([^,]+).*/, '$1').toLowerCase();

+					

+					if (!fc && n.style.color)

+						fc = n.style.color;

+

+					if (!bc && n.style.backgroundColor)

+						bc = n.style.backgroundColor;

 				}

 

 				return false;

@@ -922,25 +1052,56 @@
 						return true;

 				});

 			}

+			

+			if (s.theme_advanced_show_current_color) {

+				function updateColor(controlId, color) {

+					if (c = cm.get(controlId)) {

+						if (!color)

+							color = c.settings.default_color;

+						if (color !== c.value) {

+							c.displayColor(color);

+						}

+					}

+				}

+				updateColor('forecolor', fc);

+				updateColor('backcolor', bc);

+			}

+

+			if (s.theme_advanced_show_current_color) {

+				function updateColor(controlId, color) {

+					if (c = cm.get(controlId)) {

+						if (!color)

+							color = c.settings.default_color;

+						if (color !== c.value) {

+							c.displayColor(color);

+						}

+					}

+				};

+

+				updateColor('forecolor', fc);

+				updateColor('backcolor', bc);

+			}

 

 			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'});

+

+				if (t.statusKeyboardNavigation) {

+					t.statusKeyboardNavigation.destroy();

+					t.statusKeyboardNavigation = null;

+				}

+

 				DOM.setHTML(p, '');

 

 				getParent(function(n) {

 					var na = n.nodeName.toLowerCase(), u, pi, ti = '';

 

-					/*if (n.getAttribute('_mce_bogus'))

+					if (n.getAttribute('data-mce-bogus'))

 						return;

-*/

+

 					// Ignore non element and hidden elements

 					if (n.nodeType != 1 || n.nodeName === 'BR' || (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;

@@ -1015,14 +1176,25 @@
 					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);

+					pi = DOM.create('a', {'href' : "javascript:;", role: 'button', onmousedown : "return false;", title : ti, 'class' : 'mcePath_' + (de++)}, na);

 

 					if (p.hasChildNodes()) {

-						p.insertBefore(DOM.doc.createTextNode(' \u00bb '), p.firstChild);

+						p.insertBefore(DOM.create('span', {'aria-hidden': 'true'}, '\u00a0\u00bb '), p.firstChild);

 						p.insertBefore(pi, p.firstChild);

 					} else

 						p.appendChild(pi);

 				}, ed.getBody());

+

+				if (DOM.select('a', p).length > 0) {

+					t.statusKeyboardNavigation = new tinymce.ui.KeyboardNavigation({

+						root: ed.id + "_path_row",

+						items: DOM.select('a', p),

+						excludeFromTabOrder: true,

+						onCancel: function() {

+							ed.focus();

+						}

+					}, DOM);

+				}

 			}

 		},

 

@@ -1036,7 +1208,7 @@
 			var ed = this.editor;

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/anchor.htm',

+				url : this.url + '/anchor.htm',

 				width : 320 + parseInt(ed.getLang('advanced.anchor_delta_width', 0)),

 				height : 90 + parseInt(ed.getLang('advanced.anchor_delta_height', 0)),

 				inline : true

@@ -1049,7 +1221,7 @@
 			var ed = this.editor;

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/charmap.htm',

+				url : this.url + '/charmap.htm',

 				width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),

 				height : 250 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),

 				inline : true

@@ -1062,7 +1234,7 @@
 			var ed = this.editor;

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/about.htm',

+				url : this.url + '/about.htm',

 				width : 480,

 				height : 380,

 				inline : true

@@ -1071,13 +1243,25 @@
 			});

 		},

 

+		_mceShortcuts : function() {

+			var ed = this.editor;

+			ed.windowManager.open({

+				url: this.url + '/shortcuts.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',

+				url : this.url + '/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,

@@ -1093,7 +1277,7 @@
 			var ed = this.editor;

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/source_editor.htm',

+				url : this.url + '/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,

@@ -1112,7 +1296,7 @@
 				return;

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/image.htm',

+				url : this.url + '/image.htm',

 				width : 355 + parseInt(ed.getLang('advanced.image_delta_width', 0)),

 				height : 275 + parseInt(ed.getLang('advanced.image_delta_height', 0)),

 				inline : true

@@ -1125,7 +1309,7 @@
 			var ed = this.editor;

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/link.htm',

+				url : this.url + '/link.htm',

 				width : 310 + parseInt(ed.getLang('advanced.link_delta_width', 0)),

 				height : 200 + parseInt(ed.getLang('advanced.link_delta_height', 0)),

 				inline : true

@@ -1173,4 +1357,4 @@
 	});

 

 	tinymce.ThemeManager.add('advanced', tinymce.themes.AdvancedTheme);

-}(tinymce));
\ No newline at end of file
+}(tinymce));

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm
index f30d67064..b8ba729f6 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm
@@ -17,57 +17,57 @@
 

 	<div class="panel_wrapper">

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

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

-          <tr>

-            <td class="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 class="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 class="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 class="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 class="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 class="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 class="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>

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

+				<tr>

+					<td class="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 class="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 class="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 class="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 class="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 class="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 class="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>

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif
index cb192e6ce..cb192e6ce 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif
new file mode 100644
index 000000000..410c7ad08
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/pagebreak.gif
index acdf4085f..acdf4085f 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/pagebreak.gif
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif
index 3b0499145..3b0499145 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/realmedia.gif
index fdfe0b9ac..fdfe0b9ac 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/realmedia.gif
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif
index 5f235dfc7..5f235dfc7 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/trans.gif
index 388486517..388486517 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/trans.gif
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif
new file mode 100644
index 000000000..357010407
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/windowsmedia.gif
index ab50f2d88..ab50f2d88 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/windowsmedia.gif
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js
index 5cee9ed86..5b3584576 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js
@@ -66,6 +66,7 @@ function insertHelpIFrame() {
 		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';

+		document.getElementById('help_tab').setAttribute("aria-hidden", "false");

 	}

 }

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
index 7fe781055..e528e4f42 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
@@ -19,6 +19,11 @@ var AnchorDialog = {
 	update : function() {

 		var ed = this.editor, elm, name = document.forms[0].anchorName.value;

 

+		if (!name || !/^[a-z][a-z0-9\-\_:\.]*$/i.test(name)) {

+			tinyMCEPopup.alert('advanced_dlg.anchor_invalid');

+			return;

+		}

+

 		tinyMCEPopup.restoreSelection();

 

 		if (this.action != 'update')

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
index 8c5aea172..1cead6dfe 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
@@ -173,7 +173,7 @@ var charmap = [
 	['&yacute;',  '&#253;',  true, 'y - acute'],

 	['&thorn;',   '&#254;',  true, 'thorn'],

 	['&yuml;',    '&#255;',  true, 'y - diaeresis'],

-    ['&Alpha;',   '&#913;',  true, 'Alpha'],

+	['&Alpha;',   '&#913;',  true, 'Alpha'],

 	['&Beta;',    '&#914;',  true, 'Beta'],

 	['&Gamma;',   '&#915;',  true, 'Gamma'],

 	['&Delta;',   '&#916;',  true, 'Delta'],

@@ -258,8 +258,8 @@ var charmap = [
 	['&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'],

+	['&loz;',     '&#9674;', true, 'lozenge'],

+	['&spades;',  '&#9824;', true, 'black spade suit'],

 	['&clubs;',   '&#9827;', true, 'black club suit'],

 	['&hearts;',  '&#9829;', true, 'black heart suit'],

 	['&diams;',   '&#9830;', true, 'black diamond suit'],

@@ -275,19 +275,38 @@ var charmap = [
 

 tinyMCEPopup.onInit.add(function() {

 	tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML());

+	addKeyboardNavigation();

 });

 

+function addKeyboardNavigation(){

+	var tableElm, cells, settings;

+

+	cells = tinyMCEPopup.dom.select(".charmaplink", "charmapgroup");

+

+	settings ={

+		root: "charmapgroup",

+		items: cells

+	};

+

+	tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', settings, tinyMCEPopup.dom);

+}

+

 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 html = '<div id="charmapgroup" aria-labelledby="charmap_label" tabindex="0" role="listbox">'+

+	'<table role="presentation" border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + 

+	'"><tr height="' + tdHeight + '">';

 	var cols=-1;

 

 	for (i=0; i<charmap.length; i++) {

+		var previewCharFn;

+

 		if (charmap[i][2]==true) {

 			cols++;

+			previewCharFn = 'previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');';

 			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] + '">'

+				+ '<a class="charmaplink" role="button" onmouseover="'+previewCharFn+'" onfocus="'+previewCharFn+'" 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)

@@ -301,7 +320,8 @@ function renderCharMapHTML() {
 			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';

 	}

 

-	html += '</tr></table>';

+	html += '</tr></table></div>';

+	html = html.replace(/<tr height="20"><\/tr>/g, '');

 

 	return html;

 }

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
index fd9700f22..7decac5b4 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
@@ -1,6 +1,6 @@
 tinyMCEPopup.requireLangPack();

 

-var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;

+var detail = 50, strhex = "0123456789ABCDEF", i, isMouseDown = false, isMouseOver = false;

 

 var colors = [

 	"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",

@@ -33,37 +33,41 @@ var colors = [
 ];

 

 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'

+	'#F0F8FF':'Alice Blue','#FAEBD7':'Antique White','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',

+	'#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'Blanched Almond','#0000FF':'Blue','#8A2BE2':'Blue Violet','#A52A2A':'Brown',

+	'#DEB887':'Burly Wood','#5F9EA0':'Cadet Blue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'Cornflower Blue',

+	'#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'Dark Blue','#008B8B':'Dark Cyan','#B8860B':'Dark Golden Rod',

+	'#A9A9A9':'Dark Gray','#A9A9A9':'Dark Grey','#006400':'Dark Green','#BDB76B':'Dark Khaki','#8B008B':'Dark Magenta','#556B2F':'Dark Olive Green',

+	'#FF8C00':'Darkorange','#9932CC':'Dark Orchid','#8B0000':'Dark Red','#E9967A':'Dark Salmon','#8FBC8F':'Dark Sea Green','#483D8B':'Dark Slate Blue',

+	'#2F4F4F':'Dark Slate Gray','#2F4F4F':'Dark Slate Grey','#00CED1':'Dark Turquoise','#9400D3':'Dark Violet','#FF1493':'Deep Pink','#00BFFF':'Deep Sky Blue',

+	'#696969':'Dim Gray','#696969':'Dim Grey','#1E90FF':'Dodger Blue','#B22222':'Fire Brick','#FFFAF0':'Floral White','#228B22':'Forest Green',

+	'#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'Ghost White','#FFD700':'Gold','#DAA520':'Golden Rod','#808080':'Gray','#808080':'Grey',

+	'#008000':'Green','#ADFF2F':'Green Yellow','#F0FFF0':'Honey Dew','#FF69B4':'Hot Pink','#CD5C5C':'Indian Red','#4B0082':'Indigo','#FFFFF0':'Ivory',

+	'#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'Lavender Blush','#7CFC00':'Lawn Green','#FFFACD':'Lemon Chiffon','#ADD8E6':'Light Blue',

+	'#F08080':'Light Coral','#E0FFFF':'Light Cyan','#FAFAD2':'Light Golden Rod Yellow','#D3D3D3':'Light Gray','#D3D3D3':'Light Grey','#90EE90':'Light Green',

+	'#FFB6C1':'Light Pink','#FFA07A':'Light Salmon','#20B2AA':'Light Sea Green','#87CEFA':'Light Sky Blue','#778899':'Light Slate Gray','#778899':'Light Slate Grey',

+	'#B0C4DE':'Light Steel Blue','#FFFFE0':'Light Yellow','#00FF00':'Lime','#32CD32':'Lime Green','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',

+	'#66CDAA':'Medium Aqua Marine','#0000CD':'Medium Blue','#BA55D3':'Medium Orchid','#9370D8':'Medium Purple','#3CB371':'Medium Sea Green','#7B68EE':'Medium Slate Blue',

+	'#00FA9A':'Medium Spring Green','#48D1CC':'Medium Turquoise','#C71585':'Medium Violet Red','#191970':'Midnight Blue','#F5FFFA':'Mint Cream','#FFE4E1':'Misty Rose','#FFE4B5':'Moccasin',

+	'#FFDEAD':'Navajo White','#000080':'Navy','#FDF5E6':'Old Lace','#808000':'Olive','#6B8E23':'Olive Drab','#FFA500':'Orange','#FF4500':'Orange Red','#DA70D6':'Orchid',

+	'#EEE8AA':'Pale Golden Rod','#98FB98':'Pale Green','#AFEEEE':'Pale Turquoise','#D87093':'Pale Violet Red','#FFEFD5':'Papaya Whip','#FFDAB9':'Peach Puff',

+	'#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'Powder Blue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'Rosy Brown','#4169E1':'Royal Blue',

+	'#8B4513':'Saddle Brown','#FA8072':'Salmon','#F4A460':'Sandy Brown','#2E8B57':'Sea Green','#FFF5EE':'Sea Shell','#A0522D':'Sienna','#C0C0C0':'Silver',

+	'#87CEEB':'Sky Blue','#6A5ACD':'Slate Blue','#708090':'Slate Gray','#708090':'Slate Grey','#FFFAFA':'Snow','#00FF7F':'Spring Green',

+	'#4682B4':'Steel Blue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',

+	'#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'White Smoke','#FFFF00':'Yellow','#9ACD32':'Yellow Green'

 };

 

+var namedLookup = {};

+

 function init() {

-	var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color'));

+	var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color')), key, value;

 

 	tinyMCEPopup.resizeToInnerSize();

 

 	generatePicker();

+	generateWebColors();

+	generateNamedColors();

 

 	if (inputColor) {

 		changeFinalColor(inputColor);

@@ -73,6 +77,45 @@ function init() {
 		if (col)

 			updateLight(col.r, col.g, col.b);

 	}

+	

+	for (key in named) {

+		value = named[key];

+		namedLookup[value.replace(/\s+/, '').toLowerCase()] = key.replace(/#/, '').toLowerCase();

+	}

+}

+

+function toHexColor(color) {

+	var matches, red, green, blue, toInt = parseInt;

+

+	function hex(value) {

+		value = parseInt(value).toString(16);

+

+		return value.length > 1 ? value : '0' + value; // Padd with leading zero

+	};

+

+	color = color.replace(/[\s#]+/g, '').toLowerCase();

+	color = namedLookup[color] || color;

+	matches = /^rgb\((\d{1,3}),(\d{1,3}),(\d{1,3})\)|([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})|([a-f0-9])([a-f0-9])([a-f0-9])$/.exec(color);

+

+	if (matches) {

+		if (matches[1]) {

+			red = toInt(matches[1]);

+			green = toInt(matches[2]);

+			blue = toInt(matches[3]);

+		} else if (matches[4]) {

+			red = toInt(matches[4], 16);

+			green = toInt(matches[5], 16);

+			blue = toInt(matches[6], 16);

+		} else if (matches[7]) {

+			red = toInt(matches[7] + matches[7], 16);

+			green = toInt(matches[8] + matches[8], 16);

+			blue = toInt(matches[9] + matches[9], 16);

+		}

+

+		return '#' + hex(red) + hex(green) + hex(blue);

+	}

+

+	return '';

 }

 

 function insertAction() {

@@ -81,7 +124,7 @@ function insertAction() {
 	tinyMCEPopup.restoreSelection();

 

 	if (f)

-		f(color);

+		f(toHexColor(color));

 

 	tinyMCEPopup.close();

 }

@@ -91,7 +134,7 @@ function showColor(color, name) {
 		document.getElementById("colorname").innerHTML = name;

 

 	document.getElementById("preview").style.backgroundColor = color;

-	document.getElementById("color").value = color.toLowerCase();

+	document.getElementById("color").value = color.toUpperCase();

 }

 

 function convertRGBToHex(col) {

@@ -153,23 +196,40 @@ function generateWebColors() {
 	if (el.className == 'generated')

 		return;

 

-	h += '<table border="0" cellspacing="1" cellpadding="0">'

+	// TODO: VoiceOver doesn't seem to support legend as a label referenced by labelledby.

+	h += '<div role="listbox" aria-labelledby="webcolors_title" tabindex="0"><table role="presentation" 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>';

+			+ '<a href="javascript:insertAction();" role="option" tabindex="-1" aria-labelledby="web_colors_' + i + '" onfocus="showColor(\'' + colors[i] + '\');" onmouseover="showColor(\'' + colors[i] + '\');" style="display:block;width:10px;height:10px;overflow:hidden;">';

+		if (tinyMCEPopup.editor.forcedHighContrastMode) {

+			h += '<canvas class="mceColorSwatch" height="10" width="10" data-color="' + colors[i] + '"></canvas>';

+		}

+		h += '<span class="mceVoiceLabel" style="display:none;" id="web_colors_' + i + '">' + colors[i].toUpperCase() + '</span>';

+		h += '</a></td>';

 		if ((i+1) % 18 == 0)

 			h += '</tr><tr>';

 	}

 

-	h += '</table>';

+	h += '</table></div>';

 

 	el.innerHTML = h;

 	el.className = 'generated';

+

+	paintCanvas(el);

+	enableKeyboardNavigation(el.firstChild);

 }

 

+function paintCanvas(el) {

+	tinyMCEPopup.getWin().tinymce.each(tinyMCEPopup.dom.select('canvas.mceColorSwatch', el), function(canvas) {

+		var context;

+		if (canvas.getContext && (context = canvas.getContext("2d"))) {

+			context.fillStyle = canvas.getAttribute('data-color');

+			context.fillRect(0, 0, 10, 10);

+		}

+	});

+}

 function generateNamedColors() {

 	var el = document.getElementById('namedcolors'), h = '', n, v, i = 0;

 

@@ -178,11 +238,27 @@ function generateNamedColors() {
 

 	for (n in named) {

 		v = named[n];

-		h += '<a href="javascript:insertAction();" onmouseover="showColor(\'' + n +  '\',\'' + v + '\');" style="background-color: ' + n + '"><!-- IE --></a>'

+		h += '<a href="javascript:insertAction();" role="option" tabindex="-1" aria-labelledby="named_colors_' + i + '" onfocus="showColor(\'' + n + '\',\'' + v + '\');" onmouseover="showColor(\'' + n + '\',\'' + v + '\');" style="background-color: ' + n + '">';

+		if (tinyMCEPopup.editor.forcedHighContrastMode) {

+			h += '<canvas class="mceColorSwatch" height="10" width="10" data-color="' + colors[i] + '"></canvas>';

+		}

+		h += '<span class="mceVoiceLabel" style="display:none;" id="named_colors_' + i + '">' + v + '</span>';

+		h += '</a>';

+		i++;

 	}

 

 	el.innerHTML = h;

 	el.className = 'generated';

+

+	paintCanvas(el);

+	enableKeyboardNavigation(el);

+}

+

+function enableKeyboardNavigation(el) {

+	tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {

+		root: el,

+		items: tinyMCEPopup.dom.select('a', el)

+	}, tinyMCEPopup.dom);

 }

 

 function dechex(n) {

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
index 6423d9080..257477282 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
@@ -77,7 +77,7 @@ var ImageDialog = {
 			args.style = this.styleVal;

 

 		tinymce.extend(args, {

-			src : f.src.value,

+			src : f.src.value.replace(/ /g, '%20'),

 			alt : f.alt.value,

 			width : f.width.value,

 			height : f.height.value

@@ -87,6 +87,8 @@ var ImageDialog = {
 

 		if (el && el.nodeName == 'IMG') {

 			ed.dom.setAttribs(el, args);

+			tinyMCEPopup.editor.execCommand('mceRepaint');

+			tinyMCEPopup.editor.focus();

 		} else {

 			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});

 			ed.dom.setAttribs('__mce_tmp', args);

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
index f67a5bc82..53ff409e7 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
@@ -31,7 +31,7 @@ var LinkDialog = {
 	},

 

 	update : function() {

-		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b;

+		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b, href = f.href.value.replace(/ /g, '%20');

 

 		tinyMCEPopup.restoreSelection();

 		e = ed.dom.getParent(ed.selection.getNode(), 'A');

@@ -39,7 +39,6 @@ var LinkDialog = {
 		// 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);

@@ -49,19 +48,17 @@ var LinkDialog = {
 			}

 		}

 

-		tinyMCEPopup.execCommand("mceBeginUndoLevel");

-

 		// Create new anchor elements

 		if (e == null) {

 			ed.getDoc().execCommand("unlink", false, null);

-			tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});

+			tinyMCEPopup.execCommand("mceInsertLink", 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,

+						href : href,

 						title : f.linktitle.value,

 						target : f.target_list ? getSelectValue(f, "target_list") : null,

 						'class' : f.class_list ? getSelectValue(f, "class_list") : null

@@ -70,7 +67,7 @@ var LinkDialog = {
 			});

 		} else {

 			ed.dom.setAttribs(e, {

-				href : f.href.value,

+				href : href,

 				title : f.linktitle.value,

 				target : f.target_list ? getSelectValue(f, "target_list") : null,

 				'class' : f.class_list ? getSelectValue(f, "class_list") : null

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
index 279328614..84546ad52 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
@@ -44,19 +44,13 @@ function toggleWordWrap(elm) {
 		setWrap('off');

 }

 

-var wHeight=0, wWidth=0, owHeight=0, owWidth=0;

-

 function resizeInputs() {

-	var el = document.getElementById('htmlSource');

+	var vp = tinyMCEPopup.dom.getViewPort(window), el;

 

-	if (!tinymce.isIE) {

-		 wHeight = self.innerHeight - 65;

-		 wWidth = self.innerWidth - 16;

-	} else {

-		 wHeight = document.body.clientHeight - 70;

-		 wWidth = document.body.clientWidth - 16;

-	}

+	el = document.getElementById('htmlSource');

 

-	el.style.height = Math.abs(wHeight) + 'px';

-	el.style.width  = Math.abs(wWidth) + 'px';

+	if (el) {

+		el.style.width = (vp.w - 20) + 'px';

+		el.style.height = (vp.h - 65) + 'px';

+	}

 }

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
index 69694b1f9..fbf29893f 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
@@ -58,5 +58,11 @@ clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you
 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
+more_colors:"More colors",

+

+// Accessibility Strings

+shortcuts_desc:'Accessibility Help',

+help_shortcut:'. Press ALT F10 for toolbar. Press ALT 0 for help.',

+rich_text_area:"Rich Text Area",

+toolbar:"Toolbar"

+});

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
index 9d124d7db..0a459beb5 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
@@ -10,6 +10,7 @@ about_version:"Version",
 about_loaded:"Loaded plugins",

 anchor_title:"Insert/edit anchor",

 anchor_name:"Anchor name",

+anchor_invalid:"Please specify a valid anchor name.",

 code_title:"HTML Source Editor",

 code_wordwrap:"Word wrap",

 colorpicker_title:"Select a color",

@@ -45,7 +46,9 @@ 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"

+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 be an external link. Do you want to add the required http:// prefix?",

+link_list:"Link list",

+accessibility_help:"Accessibility Help",

+accessibility_usage_title:"General Usage"

 });
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm
index 7565b9ae8..5d9dea9b8 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm
@@ -18,34 +18,33 @@
 

 	<div class="panel_wrapper">

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

-

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

-          <tr>

-            <td class="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 class="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>

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

+				<tr>

+					<td class="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 class="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>

 

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm
new file mode 100644
index 000000000..20ec2f5a3
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

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

+	<head>

+		<title>{#advanced_dlg.accessibility_help}</title>

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

+		<script type="text/javascript">tinyMCEPopup.requireLangPack();</script>

+	</head>

+	<body id="content">

+		<h1>{#advanced_dlg.accessibility_usage_title}</h1>

+		<h2>Toolbars</h2>

+		<p>Press ALT-F10 to move focus to the toolbars. Navigate through the buttons using the arrow keys.

+		Press enter to activate a button and return focus to the editor.

+		Press escape to return focus to the editor without performing any actions.</p>

+		

+		<h2>Status Bar</h2>

+		<p>To access the editor status bar, press ALT-F11. Use the left and right arrow keys to navigate between elements in the path.

+		Press enter or space to select an element. Press escape to return focus to the editor without changing the selection.</p>

+		

+		<h2>Context Menu</h2>

+		<p>Press shift-F10 to activate the context menu. Use the up and down arrow keys to move between menu items. To open sub-menus press the right arrow key.

+		To close submenus press the left arrow key.  Press escape to close the context menu.</p>

+		

+		<h1>Keyboard Shortcuts</h1>

+		<table>

+			<thead>

+				<tr>

+					<th>Keystroke</th>

+					<th>Function</th>

+				</tr>

+			</thead>

+			<tbody>

+				<tr>

+					<td>Control-B</td><td>Bold</td>

+				</tr>

+				<tr>

+					<td>Control-I</td><td>Italic</td>

+				</tr>

+				<tr>

+					<td>Control-Z</td><td>Undo</td>

+				</tr>

+				<tr>

+					<td>Control-Y</td><td>Redo</td>

+				</tr>

+			</tbody>

+		</table>

+	</body>

+</html>

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
index 36f38aba2..03634668e 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
@@ -1,6 +1,7 @@
 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;}

+body.mceBrowserDefaults {background:transparent; color:inherit; font-size:inherit; font-family:inherit;}

 h1 {font-size: 2em}

 h2 {font-size: 1.5em}

 h3 {font-size: 1.17em}

@@ -9,6 +10,7 @@ h5 {font-size: .83em}
 h6 {font-size: .75em}

 .mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}

 a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(img/items.gif) no-repeat 0 0;}

+span.mceItemNbsp {background: #DDD}

 td.mceSelected, th.mceSelected {background-color:#3399ff !important}

 img {border:0;}

 table {cursor:default}

@@ -33,3 +35,13 @@ scrollbar-track-color:#F5F5F5;
 

 img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}

 font[face=mceinline] {font-family:inherit !important}

+

+.mceItemMedia {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)}

+.mceItemVideo {background-image:url(../../img/video.gif)}

+.mceItemIframe {background-image:url(../../img/iframe.gif)}

+.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/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
index 0049c7b3d..556b51071 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
@@ -4,8 +4,8 @@
 .defaultSkin table td {vertical-align:middle}

 

 /* Containers */

-.defaultSkin table {direction:ltr; background:#F0F0EE}

-.defaultSkin iframe {display:block; background:#FFF}

+.defaultSkin table {direction:ltr;background:transparent}

+.defaultSkin iframe {display:block;}

 .defaultSkin .mceToolbar {height:26px}

 .defaultSkin .mceLeft {text-align:left}

 .defaultSkin .mceRight {text-align:right}

@@ -20,9 +20,9 @@
 .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 td.mceToolbar {background:#F0F0EE; 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 {background:#F0F0EE; 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; outline:0}

 .defaultSkin .mceStatusbar a:hover {text-decoration:underline}

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
new file mode 100644
index 000000000..c2e30c7a2
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
@@ -0,0 +1,23 @@
+body, td, pre { margin:8px;}

+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 {display:inline-block; width:11px !important; height:11px  !important; background:url(../default/img/items.gif) no-repeat 0 0;}

+span.mceItemNbsp {background: #DDD}

+td.mceSelected, th.mceSelected {background-color:#3399ff !important}

+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 {border-bottom:1px dashed #CCC; cursor:help}

+

+img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}

+font[face=mceinline] {font-family:inherit !important}

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
new file mode 100644
index 000000000..b2ed097cd
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
@@ -0,0 +1,105 @@
+/* Generic */

+body {

+font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;

+background:#F0F0EE;
+color: black;

+padding:0;

+margin:8px 8px 0 8px;

+}

+

+html {background:#F0F0EE; color:#000;}

+td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}

+textarea {resize:none;outline:none;}

+a:link, a:visited {color:black;background-color:transparent;}

+a:hover {color:#2B6FB6;background-color:transparent;}

+.nowrap {white-space: nowrap}

+

+/* 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;background-color:transparent;}

+input.invalid {border:1px solid #EE0000;background-color:transparent;}

+input {background:#FFF; border:1px solid #CCC;color:black;}

+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 {

+font-weight:bold;

+width:94px; height:23px;

+cursor:pointer;

+padding-bottom:2px;

+float:left;

+}

+

+#cancel {float:right}

+

+/* Browse */

+a.pickcolor, a.browse {text-decoration:none}

+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; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter: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;}

+.tabs ul {margin:0; padding:0; list-style:none;}

+.tabs li {float:left; border: 1px solid black; border-bottom:0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block; cursor:pointer;}

+.tabs li.current {font-weight: bold; margin-right:2px;}

+.tabs span {float:left; display:block; padding:0px 10px 0 0;}

+.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; 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/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css
new file mode 100644
index 000000000..901446e2b
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css
@@ -0,0 +1,101 @@
+/* Reset */

+.highcontrastSkin table, .highcontrastSkin tbody, .highcontrastSkin a, .highcontrastSkin img, .highcontrastSkin tr, .highcontrastSkin div, .highcontrastSkin td, .highcontrastSkin iframe, .highcontrastSkin span, .highcontrastSkin *, .highcontrastSkin .mceText {border:0; margin:0; padding:0; vertical-align:baseline; border-collapse:separate;}

+.highcontrastSkin a:hover, .highcontrastSkin a:link, .highcontrastSkin a:visited, .highcontrastSkin a:active {text-decoration:none; font-weight:normal; cursor:default;}

+.highcontrastSkin table td {vertical-align:middle}

+

+.highcontrastSkin .mceIconOnly {display: block !important;}

+

+/* External */

+.highcontrastSkin .mceExternalToolbar {position:absolute; border:1px solid; border-bottom:0; display:none; background-color: white;}

+.highcontrastSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}

+.highcontrastSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px;}

+

+/* Layout */

+.highcontrastSkin table.mceLayout {border: 1px solid;}

+.highcontrastSkin .mceIframeContainer {border-top:1px solid; border-bottom:1px solid}

+.highcontrastSkin .mceStatusbar a:hover {text-decoration:underline}

+.highcontrastSkin .mceStatusbar {display:block; line-height:1.5em; overflow:visible;}

+.highcontrastSkin .mceStatusbar div {float:left}

+.highcontrastSkin .mceStatusbar a.mceResize {display:block; float:right; width:20px; height:20px; cursor:se-resize; outline:0}

+

+.highcontrastSkin .mceToolbar td { display: inline-block; float: left;}

+.highcontrastSkin .mceToolbar tr { display: block;}

+.highcontrastSkin .mceToolbar table { display: block; }

+

+/* Button */

+

+.highcontrastSkin .mceButton { display:block; margin: 2px; padding: 5px 10px;border: 1px solid; border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; -ms-border-radius: 3px; height: 2em;}

+.highcontrastSkin .mceButton .mceVoiceLabel { height: 100%; vertical-align: center; line-height: 2em}

+.highcontrastSkin .mceButtonDisabled .mceVoiceLabel { opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60);}

+.highcontrastSkin .mceButtonActive, .highcontrastSkin .mceButton:focus, .highcontrastSkin .mceButton:active { border: 5px solid; padding: 1px 6px;-webkit-focus-ring-color:none;outline:none;}

+

+/* Separator */

+.highcontrastSkin .mceSeparator {display:block; width:16px; height:26px;}

+

+/* ListBox */

+.highcontrastSkin .mceListBox { display: block; margin:2px;-webkit-focus-ring-color:none;outline:none;}

+.highcontrastSkin .mceListBox .mceText {padding: 5px 6px;  line-height: 2em; width: 15ex; overflow: hidden;}

+.highcontrastSkin .mceListBoxDisabled .mceText { opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60);}

+.highcontrastSkin .mceListBox a.mceText { padding: 5px 10px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;}

+.highcontrastSkin .mceListBox a.mceOpen { padding: 5px 4px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-left: 0; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;}

+.highcontrastSkin .mceListBox:focus a.mceText, .highcontrastSkin .mceListBox:active a.mceText { border-width: 5px; padding: 1px 10px 1px 6px;}

+.highcontrastSkin .mceListBox:focus a.mceOpen, .highcontrastSkin .mceListBox:active a.mceOpen { border-width: 5px; padding: 1px 0px 1px 4px;}

+

+.highcontrastSkin .mceListBoxMenu {overflow-y:auto}

+

+/* SplitButton */

+.highcontrastSkin .mceSplitButtonDisabled .mceAction {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+

+.highcontrastSkin .mceSplitButton { border-collapse: collapse; margin: 2px; height: 2em; line-height: 2em;-webkit-focus-ring-color:none;outline:none;}

+.highcontrastSkin .mceSplitButton td { display: table-cell; float: none; margin: 0; padding: 0; height: 2em;}

+.highcontrastSkin .mceSplitButton tr { display: table-row; }

+.highcontrastSkin table.mceSplitButton  { display: table; }

+.highcontrastSkin .mceSplitButton a.mceAction { padding: 5px 10px; display: block; height: 2em; line-height: 2em; overflow: hidden; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;}

+.highcontrastSkin .mceSplitButton a.mceOpen { padding: 5px 4px;  display: block; height: 2em; line-height: 2em; border: 1px solid; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;}

+.highcontrastSkin .mceSplitButton .mceVoiceLabel { height: 2em; vertical-align: center; line-height: 2em; } 

+.highcontrastSkin .mceSplitButton:focus a.mceAction, .highcontrastSkin .mceSplitButton:active a.mceAction { border-width: 5px; border-right-width: 1px; padding: 1px 10px 1px 6px;-webkit-focus-ring-color:none;outline:none;}

+.highcontrastSkin .mceSplitButton:focus a.mceOpen, .highcontrastSkin .mceSplitButton:active a.mceOpen { border-width: 5px; border-left-width: 1px; padding: 1px 0px 1px 4px;-webkit-focus-ring-color:none;outline:none;}

+

+/* Menu */

+.highcontrastSkin .mceNoIcons span.mceIcon {width:0;}

+.highcontrastSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid; }

+.highcontrastSkin .mceMenu table {background:white; color: black}

+.highcontrastSkin .mceNoIcons a .mceText {padding-left:10px}

+.highcontrastSkin .mceMenu a, .highcontrastSkin .mceMenu span, .highcontrastSkin .mceMenu {display:block;background:white; color: black}

+.highcontrastSkin .mceMenu td {height:2em}

+.highcontrastSkin .mceMenu a {position:relative;padding:3px 0 4px 0; display: block;}

+.highcontrastSkin .mceMenu .mceText {position:relative; display:block; cursor:default; margin:0; padding:0 25px 0 25px;}

+.highcontrastSkin .mceMenu pre.mceText {font-family:Monospace}

+.highcontrastSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:26px;}

+.highcontrastSkin td.mceMenuItemSeparator {border-top:1px solid; height:1px}

+.highcontrastSkin .mceMenuItemTitle a {border:0; border-bottom:1px solid}

+.highcontrastSkin .mceMenuItemTitle span.mceText {font-weight:bold; padding-left:4px}

+.highcontrastSkin .mceNoIcons .mceMenuItemSelected span.mceText:before {content: "\2713\A0";}

+.highcontrastSkin .mceMenu span.mceMenuLine {display:none}

+.highcontrastSkin .mceMenuItemSub a .mceText:after {content: "\A0\25B8"}

+

+/* ColorSplitButton */

+.highcontrastSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid; color: #000}

+.highcontrastSkin .mceColorSplitMenu td {padding:2px}

+.highcontrastSkin .mceColorSplitMenu a {display:block; width:16px; height:16px; overflow:hidden; color:#000; margin: 0; padding: 0;}

+.highcontrastSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}

+.highcontrastSkin .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}

+.highcontrastSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid; background-color:#B6BDD2}

+.highcontrastSkin a.mceMoreColors:hover {border:1px solid #0A246A; color: #000;}

+.highcontrastSkin .mceColorPreview {display:none;}

+.highcontrastSkin .mce_forecolor span.mceAction, .highcontrastSkin .mce_backcolor span.mceAction {height:17px;overflow:hidden}

+

+/* Progress,Resize */

+.highcontrastSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}

+.highcontrastSkin .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}

+

+/* Formats */

+.highcontrastSkin .mce_p span.mceText {}

+.highcontrastSkin .mce_address span.mceText {font-style:italic}

+.highcontrastSkin .mce_pre span.mceText {font-family:monospace}

+.highcontrastSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}

+.highcontrastSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}

+.highcontrastSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}

+.highcontrastSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}

+.highcontrastSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}

+.highcontrastSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
index 3cea5ff1c..4ac4e4dfb 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
@@ -9,6 +9,7 @@ h5 {font-size: .83em}
 h6 {font-size: .75em}

 .mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}

 a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(../default/img/items.gif) no-repeat 0 0;}

+span.mceItemNbsp {background: #DDD}

 td.mceSelected, th.mceSelected {background-color:#3399ff !important}

 img {border:0;}

 table {cursor:default}

@@ -33,3 +34,13 @@ scrollbar-track-color:#F5F5F5;
 

 img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}

 font[face=mceinline] {font-family:inherit !important}

+

+.mceItemMedia {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)}

+.mceItemVideo {background-image:url(../../img/video.gif)}

+.mceItemIframe {background-image:url(../../img/iframe.gif)}

+.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/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
index e3af1396e..ec0877224 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
@@ -114,3 +114,4 @@ h3 {font-size:14px;}
 #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;}

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
index a6253976a..df596bf78 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
@@ -4,8 +4,8 @@
 .o2k7Skin table td {vertical-align:middle}

 

 /* Containers */

-.o2k7Skin table {background:#E5EFFD}

-.o2k7Skin iframe {display:block; background:#FFF}

+.o2k7Skin table {background:transparent}

+.o2k7Skin iframe {display:block;}

 .o2k7Skin .mceToolbar {height:26px}

 

 /* External */

@@ -19,7 +19,8 @@
 .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 td.mceToolbar{background:#E5EFFD}

+.o2k7Skin .mceStatusbar {background:#E5EFFD; 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; outline:0}

 .o2k7Skin .mceStatusbar a:hover {text-decoration:underline}

@@ -62,7 +63,7 @@
 .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, .o2k7Skin .mceSplitButton a, .o2k7Skin .mceSplitButton span {display:block; height:22px; direction:ltr}

 .o2k7Skin .mceSplitButton {background:url(img/button_bg.png)}

 .o2k7Skin .mceSplitButton a.mceAction {width:22px}

 .o2k7Skin .mceSplitButton span.mceAction {width:22px; background-image:url(../../img/icons.gif)}

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
index 153f0c38a..50c9b76a2 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
@@ -1,6 +1,6 @@
 /* Black */

 .o2k7SkinBlack .mceToolbar .mceToolbarStart span, .o2k7SkinBlack .mceToolbar .mceToolbarEnd span, .o2k7SkinBlack .mceButton, .o2k7SkinBlack .mceSplitButton, .o2k7SkinBlack .mceSeparator, .o2k7SkinBlack .mceSplitButton a.mceOpen, .o2k7SkinBlack .mceListBox a.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 td.mceToolbar, .o2k7SkinBlack td.mceStatusbar, .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, .o2k7SkinBlack .mceListBoxHover .mceText, .o2k7SkinBlack .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;}

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
index 7fe3b45e1..960a8e475 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
@@ -1,5 +1,5 @@
 /* Silver */

 .o2k7SkinSilver .mceToolbar .mceToolbarStart span, .o2k7SkinSilver .mceButton, .o2k7SkinSilver .mceSplitButton, .o2k7SkinSilver .mceSeparator, .o2k7SkinSilver .mceSplitButton a.mceOpen, .o2k7SkinSilver .mceListBox a.mceOpen {background-image:url(img/button_bg_silver.png)}

-.o2k7SkinSilver table, .o2k7SkinSilver .mceMenuItemTitle a {background:#eee}

+.o2k7SkinSilver td.mceToolbar, .o2k7SkinSilver td.mceStatusbar, .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/vendor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
index 5957bbd17..3c6d65808 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
@@ -6,7 +6,7 @@
 </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 style="float: left" class="title"><label for="htmlSource">{#advanced_dlg.code_title}</label></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>

@@ -17,8 +17,8 @@
 		<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">

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

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

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

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

 		</div>

 	</form>

 </body>

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
index ed89abc06..4b3209cc9 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.ThemeManager.requireLangPack("simple");tinymce.create("tinymce.themes.SimpleTheme",{init:function(c,d){var e=this,b=["Bold","Italic","Underline","Strikethrough","InsertUnorderedList","InsertOrderedList"],f=c.settings;e.editor=c;c.onInit.add(function(){c.onNodeChange.add(function(h,g){tinymce.each(b,function(i){g.get(i.toLowerCase()).setActive(h.queryCommandState(i))})});c.dom.loadCSS(d+"/skins/"+f.skin+"/content.css")});a.loadCSS((f.editor_css?c.documentBaseURI.toAbsolute(f.editor_css):"")||d+"/skins/"+f.skin+"/ui.css")},renderUI:function(h){var e=this,i=h.targetNode,b,c,d=e.editor,f=d.controlManager,g;i=a.insertAfter(a.create("span",{id:d.id+"_container","class":"mceEditor "+d.settings.skin+"SimpleSkin"}),i);i=g=a.add(i,"table",{cellPadding:0,cellSpacing:0,"class":"mceLayout"});i=c=a.add(i,"tbody");i=a.add(c,"tr");i=b=a.add(a.add(i,"td"),"div",{"class":"mceIframeContainer"});i=a.add(a.add(c,"tr",{"class":"last"}),"td",{"class":"mceToolbar mceLast",align:"center"});c=e.toolbar=f.createToolbar("tools1");c.add(f.createButton("bold",{title:"simple.bold_desc",cmd:"Bold"}));c.add(f.createButton("italic",{title:"simple.italic_desc",cmd:"Italic"}));c.add(f.createButton("underline",{title:"simple.underline_desc",cmd:"Underline"}));c.add(f.createButton("strikethrough",{title:"simple.striketrough_desc",cmd:"Strikethrough"}));c.add(f.createSeparator());c.add(f.createButton("undo",{title:"simple.undo_desc",cmd:"Undo"}));c.add(f.createButton("redo",{title:"simple.redo_desc",cmd:"Redo"}));c.add(f.createSeparator());c.add(f.createButton("cleanup",{title:"simple.cleanup_desc",cmd:"mceCleanup"}));c.add(f.createSeparator());c.add(f.createButton("insertunorderedlist",{title:"simple.bullist_desc",cmd:"InsertUnorderedList"}));c.add(f.createButton("insertorderedlist",{title:"simple.numlist_desc",cmd:"InsertOrderedList"}));c.renderTo(i);return{iframeContainer:b,editorContainer:d.id+"_container",sizeContainer:g,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
+(function(){var a=tinymce.DOM;tinymce.ThemeManager.requireLangPack("simple");tinymce.create("tinymce.themes.SimpleTheme",{init:function(c,d){var e=this,b=["Bold","Italic","Underline","Strikethrough","InsertUnorderedList","InsertOrderedList"],f=c.settings;e.editor=c;c.contentCSS.push(d+"/skins/"+f.skin+"/content.css");c.onInit.add(function(){c.onNodeChange.add(function(h,g){tinymce.each(b,function(i){g.get(i.toLowerCase()).setActive(h.queryCommandState(i))})})});a.loadCSS((f.editor_css?c.documentBaseURI.toAbsolute(f.editor_css):"")||d+"/skins/"+f.skin+"/ui.css")},renderUI:function(h){var e=this,i=h.targetNode,b,c,d=e.editor,f=d.controlManager,g;i=a.insertAfter(a.create("span",{id:d.id+"_container","class":"mceEditor "+d.settings.skin+"SimpleSkin"}),i);i=g=a.add(i,"table",{cellPadding:0,cellSpacing:0,"class":"mceLayout"});i=c=a.add(i,"tbody");i=a.add(c,"tr");i=b=a.add(a.add(i,"td"),"div",{"class":"mceIframeContainer"});i=a.add(a.add(c,"tr",{"class":"last"}),"td",{"class":"mceToolbar mceLast",align:"center"});c=e.toolbar=f.createToolbar("tools1");c.add(f.createButton("bold",{title:"simple.bold_desc",cmd:"Bold"}));c.add(f.createButton("italic",{title:"simple.italic_desc",cmd:"Italic"}));c.add(f.createButton("underline",{title:"simple.underline_desc",cmd:"Underline"}));c.add(f.createButton("strikethrough",{title:"simple.striketrough_desc",cmd:"Strikethrough"}));c.add(f.createSeparator());c.add(f.createButton("undo",{title:"simple.undo_desc",cmd:"Undo"}));c.add(f.createButton("redo",{title:"simple.redo_desc",cmd:"Redo"}));c.add(f.createSeparator());c.add(f.createButton("cleanup",{title:"simple.cleanup_desc",cmd:"mceCleanup"}));c.add(f.createSeparator());c.add(f.createButton("insertunorderedlist",{title:"simple.bullist_desc",cmd:"InsertUnorderedList"}));c.add(f.createButton("insertorderedlist",{title:"simple.numlist_desc",cmd:"InsertOrderedList"}));c.renderTo(i);return{iframeContainer:b,editorContainer:d.id+"_container",sizeContainer:g,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/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
index 4b862d49d..01ce87c58 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
@@ -19,6 +19,7 @@
 			var t = this, states = ['Bold', 'Italic', 'Underline', 'Strikethrough', 'InsertUnorderedList', 'InsertOrderedList'], s = ed.settings;

 

 			t.editor = ed;

+			ed.contentCSS.push(url + "/skins/" + s.skin + "/content.css");

 

 			ed.onInit.add(function() {

 				ed.onNodeChange.add(function(ed, cm) {

@@ -26,8 +27,6 @@
 						cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c));

 					});

 				});

-

-				ed.dom.loadCSS(url + "/skins/" + s.skin + "/content.css");

 			});

 

 			DOM.loadCSS((s.editor_css ? ed.documentBaseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js
index 963ad2fc1..40342b996 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js
@@ -1 +1 @@
-(function(c){var a=/^\s*|\s*$/g,d;var b={majorVersion:"3",minorVersion:"3.6",releaseDate:"2010-05-20",_init:function(){var r=this,o=document,m=navigator,f=m.userAgent,l,e,k,j,h,q;r.isOpera=c.opera&&opera.buildNumber;r.isWebKit=/WebKit/.test(f);r.isIE=!r.isWebKit&&!r.isOpera&&(/MSIE/gi).test(f)&&(/Explorer/gi).test(m.appName);r.isIE6=r.isIE&&/MSIE [56]/.test(f);r.isGecko=!r.isWebKit&&/Gecko/.test(f);r.isMac=f.indexOf("Mac")!=-1;r.isAir=/adobeair/i.test(f);r.isIDevice=/(iPad|iPhone)/.test(f);if(c.tinyMCEPreInit){r.suffix=tinyMCEPreInit.suffix;r.baseURL=tinyMCEPreInit.base;r.query=tinyMCEPreInit.query;return}r.suffix="";e=o.getElementsByTagName("base");for(l=0;l<e.length;l++){if(q=e[l].href){if(/^https?:\/\/[^\/]+$/.test(q)){q+="/"}j=q?q.match(/.*\//)[0]:""}}function g(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){r.suffix="_src"}if((h=i.src.indexOf("?"))!=-1){r.query=i.src.substring(h+1)}r.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(j&&r.baseURL.indexOf("://")==-1&&r.baseURL.indexOf("/")!==0){r.baseURL=j+r.baseURL}return r.baseURL}return null}e=o.getElementsByTagName("script");for(l=0;l<e.length;l++){if(g(e[l])){return}}k=o.getElementsByTagName("head")[0];if(k){e=k.getElementsByTagName("script");for(l=0;l<e.length;l++){if(g(e[l])){return}}}return},is:function(f,e){if(!e){return f!==d}if(e=="array"&&(f.hasOwnProperty&&f instanceof Array)){return true}return typeof(f)==e},each:function(h,e,g){var i,f;if(!h){return 0}g=g||h;if(h.length!==d){for(i=0,f=h.length;i<f;i++){if(e.call(g,h[i],i,h)===false){return 0}}}else{for(i in h){if(h.hasOwnProperty(i)){if(e.call(g,h[i],i,h)===false){return 0}}}}return 1},map:function(e,g){var h=[];b.each(e,function(f){h.push(g(f))});return h},grep:function(e,g){var h=[];b.each(e,function(f){if(!g||g(f)){h.push(f)}});return h},inArray:function(f,g){var h,e;if(f){for(h=0,e=f.length;h<e;h++){if(f[h]===g){return h}}}return -1},extend:function(k,j){var h,g,f=arguments;for(h=1,g=f.length;h<g;h++){j=f[h];b.each(j,function(e,i){if(e!==d){k[i]=e}})}return k},trim:function(e){return(e?""+e:"").replace(a,"")},create:function(m,e){var l=this,f,h,i,j,g,k=0;m=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(m);i=m[3].match(/(^|\.)(\w+)$/i)[2];h=l.createNS(m[3].replace(/\.\w+$/,""));if(h[i]){return}if(m[2]=="static"){h[i]=e;if(this.onCreate){this.onCreate(m[2],m[3],h[i])}return}if(!e[i]){e[i]=function(){};k=1}h[i]=e[i];l.extend(h[i].prototype,e);if(m[5]){f=l.resolve(m[5]).prototype;j=m[5].match(/\.(\w+)$/i)[1];g=h[i];if(k){h[i]=function(){return f[j].apply(this,arguments)}}else{h[i]=function(){this.parent=f[j];return g.apply(this,arguments)}}h[i].prototype[i]=h[i];l.each(f,function(o,p){h[i].prototype[p]=f[p]});l.each(e,function(o,p){if(f[p]){h[i].prototype[p]=function(){this.parent=f[p];return o.apply(this,arguments)}}else{if(p!=i){h[i].prototype[p]=o}}})}l.each(e["static"],function(o,p){h[i][p]=o});if(this.onCreate){this.onCreate(m[2],m[3],h[i].prototype)}},walk:function(h,g,i,e){e=e||this;if(h){if(i){h=h[i]}b.each(h,function(j,f){if(g.call(e,j,f,i)===false){return false}b.walk(j,g,i,e)})}},createNS:function(h,g){var f,e;g=g||c;h=h.split(".");for(f=0;f<h.length;f++){e=h[f];if(!g[e]){g[e]={}}g=g[e]}return g},resolve:function(h,g){var f,e;g=g||c;h=h.split(".");for(f=0,e=h.length;f<e;f++){g=g[h[f]];if(!g){break}}return g},addUnload:function(i,h){var g=this;i={func:i,scope:h||this};if(!g.unloads){function e(){var f=g.unloads,k,l;if(f){for(l in f){k=f[l];if(k&&k.func){k.func.call(k.scope,1)}}if(c.detachEvent){c.detachEvent("onbeforeunload",j);c.detachEvent("onunload",e)}else{if(c.removeEventListener){c.removeEventListener("unload",e,false)}}g.unloads=k=f=w=e=0;if(c.CollectGarbage){CollectGarbage()}}}function j(){var k=document;if(k.readyState=="interactive"){function f(){k.detachEvent("onstop",f);if(e){e()}k=0}if(k){k.attachEvent("onstop",f)}c.setTimeout(function(){if(k){k.detachEvent("onstop",f)}},0)}}if(c.attachEvent){c.attachEvent("onunload",e);c.attachEvent("onbeforeunload",j)}else{if(c.addEventListener){c.addEventListener("unload",e,false)}}g.unloads=[i]}else{g.unloads.push(i)}return i},removeUnload:function(h){var e=this.unloads,g=null;b.each(e,function(j,f){if(j&&j.func==h){e.splice(f,1);g=h;return false}});return g},explode:function(e,f){return e?b.map(e.split(f||","),b.trim):e},_addVer:function(f){var e;if(!this.query){return f}e=(f.indexOf("?")==-1?"?":"&")+this.query;if(f.indexOf("#")==-1){return f+e}return f.replace("#",e+"#")}};b._init();c.tinymce=c.tinyMCE=b})(window);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,h,d,c;e=tinymce.trim(e);g=f.settings=g||{};if(/^(mailto|tel|news|javascript|about|data):/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^\w*:?\/\//.test(e)){e=(g.base_uri.protocol||"http")+"://mce_host"+f.toAbsPath(g.base_uri.path,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();tinymce.create("static tinymce.util.JSON",{serialize:function(e){var c,a,d=tinymce.util.JSON.serialize,b;if(e==null){return"null"}b=typeof e;if(b=="string"){a="\bb\tt\nn\ff\rr\"\"''\\\\";return'"'+e.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g,function(g,f){c=a.indexOf(f);if(c+1){return"\\"+a.charAt(c+1)}g=f.charCodeAt().toString(16);return"\\u"+"0000".substring(g.length)+g})+'"'}if(b=="object"){if(e.hasOwnProperty&&e instanceof Array){for(c=0,a="[";c<e.length;c++){a+=(c>0?",":"")+d(e[c])}return a+"]"}a="{";for(c in e){a+=typeof e[c]!="function"?(a.length>1?',"':'"')+c+'":'+d(e[c]):""}return a+"}"}return""+e},parse:function(s){try{return eval("("+s+")")}catch(ex){}}});tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){e.call(f.error_scope||f.scope,h,g)};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(m){var k=m.each,j=m.is,i=m.isWebKit,d=m.isIE,a=/^(H[1-6R]|P|DIV|ADDRESS|PRE|FORM|T(ABLE|BODY|HEAD|FOOT|H|R|D)|LI|OL|UL|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|MENU|ISINDEX|SAMP)$/,e=g("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),f=g("src,href,style,coords,shape"),c={"&":"&amp;",'"':"&quot;","<":"&lt;",">":"&gt;"},n=/[<>&\"]/g,b=/^([a-z0-9],?)+$/i,h=/<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)(\s*\/?)>/g,l=/(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;function g(q){var p={},o;q=q.split(",");for(o=q.length;o>=0;o--){p[q[o]]=1}return p}m.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(u,q){var p=this,o;p.doc=u;p.win=window;p.files={};p.cssFlicker=false;p.counter=0;p.boxModel=!m.isIE||u.compatMode=="CSS1Compat";p.stdMode=u.documentMode===8;p.settings=q=m.extend({keep_values:false,hex_colors:1,process_html:1},q);if(m.isIE6){try{u.execCommand("BackgroundImageCache",false,true)}catch(r){p.cssFlicker=true}}if(q.valid_styles){p._styles={};k(q.valid_styles,function(t,s){p._styles[s]=m.explode(t)})}m.addUnload(p.destroy,p)},getRoot:function(){var o=this,p=o.settings;return(p&&o.get(p.root_element))||o.doc.body},getViewPort:function(p){var q,o;p=!p?this.win:p;q=p.document;o=this.boxModel?q.documentElement:q.body;return{x:p.pageXOffset||o.scrollLeft,y:p.pageYOffset||o.scrollTop,w:p.innerWidth||o.clientWidth,h:p.innerHeight||o.clientHeight}},getRect:function(s){var r,o=this,q;s=o.get(s);r=o.getPos(s);q=o.getSize(s);return{x:r.x,y:r.y,w:q.w,h:q.h}},getSize:function(r){var p=this,o,q;r=p.get(r);o=p.getStyle(r,"width");q=p.getStyle(r,"height");if(o.indexOf("px")===-1){o=0}if(q.indexOf("px")===-1){q=0}return{w:parseInt(o)||r.offsetWidth||r.clientWidth,h:parseInt(q)||r.offsetHeight||r.clientHeight}},getParent:function(q,p,o){return this.getParents(q,p,o,false)},getParents:function(z,v,s,y){var q=this,p,u=q.settings,x=[];z=q.get(z);y=y===undefined;if(u.strict_root){s=s||q.getRoot()}if(j(v,"string")){p=v;if(v==="*"){v=function(o){return o.nodeType==1}}else{v=function(o){return q.is(o,p)}}}while(z){if(z==s||!z.nodeType||z.nodeType===9){break}if(!v||v(z)){if(y){x.push(z)}else{return z}}z=z.parentNode}return y?x:null},get:function(o){var p;if(o&&this.doc&&typeof(o)=="string"){p=o;o=this.doc.getElementById(o);if(o&&o.id!==p){return this.doc.getElementsByName(p)[1]}}return o},getNext:function(p,o){return this._findSib(p,o,"nextSibling")},getPrev:function(p,o){return this._findSib(p,o,"previousSibling")},select:function(q,p){var o=this;return m.dom.Sizzle(q,o.get(p)||o.get(o.settings.root_element)||o.doc,[])},is:function(q,o){var p;if(q.length===undefined){if(o==="*"){return q.nodeType==1}if(b.test(o)){o=o.toLowerCase().split(/,/);q=q.nodeName.toLowerCase();for(p=o.length-1;p>=0;p--){if(o[p]==q){return true}}return false}}return m.dom.Sizzle.matches(o,q.nodeType?[q]:q).length>0},add:function(s,v,o,r,u){var q=this;return this.run(s,function(y){var x,t;x=j(v,"string")?q.doc.createElement(v):v;q.setAttribs(x,o);if(r){if(r.nodeType){x.appendChild(r)}else{q.setHTML(x,r)}}return !u?y.appendChild(x):x})},create:function(q,o,p){return this.add(this.doc.createElement(q),q,o,p,1)},createHTML:function(v,p,s){var u="",r=this,q;u+="<"+v;for(q in p){if(p.hasOwnProperty(q)){u+=" "+q+'="'+r.encode(p[q])+'"'}}if(m.is(s)){return u+">"+s+"</"+v+">"}return u+" />"},remove:function(o,p){return this.run(o,function(r){var q,s;q=r.parentNode;if(!q){return null}if(p){while(s=r.firstChild){if(!m.isIE||s.nodeType!==3||s.nodeValue){q.insertBefore(s,r)}else{r.removeChild(s)}}}return q.removeChild(r)})},setStyle:function(r,o,p){var q=this;return q.run(r,function(v){var u,t;u=v.style;o=o.replace(/-(\D)/g,function(x,s){return s.toUpperCase()});if(q.pixelStyles.test(o)&&(m.is(p,"number")||/^[\-0-9\.]+$/.test(p))){p+="px"}switch(o){case"opacity":if(d){u.filter=p===""?"":"alpha(opacity="+(p*100)+")";if(!r.currentStyle||!r.currentStyle.hasLayout){u.display="inline-block"}}u[o]=u["-moz-opacity"]=u["-khtml-opacity"]=p||"";break;case"float":d?u.styleFloat=p:u.cssFloat=p;break;default:u[o]=p||""}if(q.settings.update_styles){q.setAttrib(v,"_mce_style")}})},getStyle:function(r,o,q){r=this.get(r);if(!r){return false}if(this.doc.defaultView&&q){o=o.replace(/[A-Z]/g,function(s){return"-"+s});try{return this.doc.defaultView.getComputedStyle(r,null).getPropertyValue(o)}catch(p){return null}}o=o.replace(/-(\D)/g,function(t,s){return s.toUpperCase()});if(o=="float"){o=d?"styleFloat":"cssFloat"}if(r.currentStyle&&q){return r.currentStyle[o]}return r.style[o]},setStyles:function(u,v){var q=this,r=q.settings,p;p=r.update_styles;r.update_styles=0;k(v,function(o,s){q.setStyle(u,s,o)});r.update_styles=p;if(r.update_styles){q.setAttrib(u,r.cssText)}},setAttrib:function(q,r,o){var p=this;if(!q||!r){return}if(p.settings.strict){r=r.toLowerCase()}return this.run(q,function(u){var t=p.settings;switch(r){case"style":if(!j(o,"string")){k(o,function(s,x){p.setStyle(u,x,s)});return}if(t.keep_values){if(o&&!p._isRes(o)){u.setAttribute("_mce_style",o,2)}else{u.removeAttribute("_mce_style",2)}}u.style.cssText=o;break;case"class":u.className=o||"";break;case"src":case"href":if(t.keep_values){if(t.url_converter){o=t.url_converter.call(t.url_converter_scope||p,o,r,u)}p.setAttrib(u,"_mce_"+r,o,2)}break;case"shape":u.setAttribute("_mce_style",o);break}if(j(o)&&o!==null&&o.length!==0){u.setAttribute(r,""+o,2)}else{u.removeAttribute(r,2)}})},setAttribs:function(q,r){var p=this;return this.run(q,function(o){k(r,function(s,t){p.setAttrib(o,t,s)})})},getAttrib:function(r,s,q){var o,p=this;r=p.get(r);if(!r||r.nodeType!==1){return false}if(!j(q)){q=""}if(/^(src|href|style|coords|shape)$/.test(s)){o=r.getAttribute("_mce_"+s);if(o){return o}}if(d&&p.props[s]){o=r[p.props[s]];o=o&&o.nodeValue?o.nodeValue:o}if(!o){o=r.getAttribute(s,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(s)){if(r[p.props[s]]===true&&o===""){return s}return o?s:""}if(r.nodeName==="FORM"&&r.getAttributeNode(s)){return r.getAttributeNode(s).nodeValue}if(s==="style"){o=o||r.style.cssText;if(o){o=p.serializeStyle(p.parseStyle(o),r.nodeName);if(p.settings.keep_values&&!p._isRes(o)){r.setAttribute("_mce_style",o)}}}if(i&&s==="class"&&o){o=o.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(d){switch(s){case"rowspan":case"colspan":if(o===1){o=""}break;case"size":if(o==="+0"||o===20||o===0){o=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(o===0){o=""}break;case"hspace":if(o===-1){o=""}break;case"maxlength":case"tabindex":if(o===32768||o===2147483647||o==="32768"){o=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(o===65535){return s}return q;case"shape":o=o.toLowerCase();break;default:if(s.indexOf("on")===0&&o){o=(""+o).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1")}}}return(o!==undefined&&o!==null&&o!=="")?""+o:q},getPos:function(A,s){var p=this,o=0,z=0,u,v=p.doc,q;A=p.get(A);s=s||v.body;if(A){if(d&&!p.stdMode){A=A.getBoundingClientRect();u=p.boxModel?v.documentElement:v.body;o=p.getStyle(p.select("html")[0],"borderWidth");o=(o=="medium"||p.boxModel&&!p.isIE6)&&2||o;A.top+=p.win.self!=p.win.top?2:0;return{x:A.left+u.scrollLeft-o,y:A.top+u.scrollTop-o}}q=A;while(q&&q!=s&&q.nodeType){o+=q.offsetLeft||0;z+=q.offsetTop||0;q=q.offsetParent}q=A.parentNode;while(q&&q!=s&&q.nodeType){o-=q.scrollLeft||0;z-=q.scrollTop||0;q=q.parentNode}}return{x:o,y:z}},parseStyle:function(r){var u=this,v=u.settings,x={};if(!r){return x}function p(D,A,C){var z,B,o,y;z=x[D+"-top"+A];if(!z){return}B=x[D+"-right"+A];if(z!=B){return}o=x[D+"-bottom"+A];if(B!=o){return}y=x[D+"-left"+A];if(o!=y){return}x[C]=y;delete x[D+"-top"+A];delete x[D+"-right"+A];delete x[D+"-bottom"+A];delete x[D+"-left"+A]}function q(y,s,o,A){var z;z=x[s];if(!z){return}z=x[o];if(!z){return}z=x[A];if(!z){return}x[y]=x[s]+" "+x[o]+" "+x[A];delete x[s];delete x[o];delete x[A]}r=r.replace(/&(#?[a-z0-9]+);/g,"&$1_MCE_SEMI_");k(r.split(";"),function(s){var o,t=[];if(s){s=s.replace(/_MCE_SEMI_/g,";");s=s.replace(/url\([^\)]+\)/g,function(y){t.push(y);return"url("+t.length+")"});s=s.split(":");o=m.trim(s[1]);o=o.replace(/url\(([^\)]+)\)/g,function(z,y){return t[parseInt(y)-1]});o=o.replace(/rgb\([^\)]+\)/g,function(y){return u.toHex(y)});if(v.url_converter){o=o.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g,function(y,z){return"url("+v.url_converter.call(v.url_converter_scope||u,u.decode(z),"style",null)+")"})}x[m.trim(s[0]).toLowerCase()]=o}});p("border","","border");p("border","-width","border-width");p("border","-color","border-color");p("border","-style","border-style");p("padding","","padding");p("margin","","margin");q("border","border-width","border-style","border-color");if(d){if(x.border=="medium none"){x.border=""}}return x},serializeStyle:function(v,p){var q=this,r="";function u(s,o){if(o&&s){if(o.indexOf("-")===0){return}switch(o){case"font-weight":if(s==700){s="bold"}break;case"color":case"background-color":s=s.toLowerCase();break}r+=(r?" ":"")+o+": "+s+";"}}if(p&&q._styles){k(q._styles["*"],function(o){u(v[o],o)});k(q._styles[p.toLowerCase()],function(o){u(v[o],o)})}else{k(v,u)}return r},loadCSS:function(o){var q=this,r=q.doc,p;if(!o){o=""}p=q.select("head")[0];k(o.split(","),function(s){var t;if(q.files[s]){return}q.files[s]=true;t=q.create("link",{rel:"stylesheet",href:m._addVer(s)});if(d&&r.documentMode){t.onload=function(){r.recalc();t.onload=null}}p.appendChild(t)})},addClass:function(o,p){return this.run(o,function(q){var r;if(!p){return 0}if(this.hasClass(q,p)){return q.className}r=this.removeClass(q,p);return q.className=(r!=""?(r+" "):"")+p})},removeClass:function(q,r){var o=this,p;return o.run(q,function(t){var s;if(o.hasClass(t,r)){if(!p){p=new RegExp("(^|\\s+)"+r+"(\\s+|$)","g")}s=t.className.replace(p," ");s=m.trim(s!=" "?s:"");t.className=s;if(!s){t.removeAttribute("class");t.removeAttribute("className")}return s}return t.className})},hasClass:function(p,o){p=this.get(p);if(!p||!o){return false}return(" "+p.className+" ").indexOf(" "+o+" ")!==-1},show:function(o){return this.setStyle(o,"display","block")},hide:function(o){return this.setStyle(o,"display","none")},isHidden:function(o){o=this.get(o);return !o||o.style.display=="none"||this.getStyle(o,"display")=="none"},uniqueId:function(o){return(!o?"mce_":o)+(this.counter++)},setHTML:function(q,p){var o=this;return this.run(q,function(v){var r,t,s,z,u,r;p=o.processHTML(p);if(d){function y(){while(v.firstChild){v.firstChild.removeNode()}try{v.innerHTML="<br />"+p;v.removeChild(v.firstChild)}catch(x){r=o.create("div");r.innerHTML="<br />"+p;k(r.childNodes,function(B,A){if(A){v.appendChild(B)}})}}if(o.settings.fix_ie_paragraphs){p=p.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi,'<p$1 _mce_keep="true">&nbsp;</p>')}y();if(o.settings.fix_ie_paragraphs){s=v.getElementsByTagName("p");for(t=s.length-1,r=0;t>=0;t--){z=s[t];if(!z.hasChildNodes()){if(!z._mce_keep){r=1;break}z.removeAttribute("_mce_keep")}}}if(r){p=p.replace(/<p ([^>]+)>|<p>/ig,'<div $1 _mce_tmp="1">');p=p.replace(/<\/p>/gi,"</div>");y();if(o.settings.fix_ie_paragraphs){s=v.getElementsByTagName("DIV");for(t=s.length-1;t>=0;t--){z=s[t];if(z._mce_tmp){u=o.doc.createElement("p");z.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi,function(A,x){var B;if(x!=="_mce_tmp"){B=z.getAttribute(x);if(!B&&x==="class"){B=z.className}u.setAttribute(x,B)}});for(r=0;r<z.childNodes.length;r++){u.appendChild(z.childNodes[r].cloneNode(true))}z.swapNode(u)}}}}}else{v.innerHTML=p}return p})},processHTML:function(r){var p=this,q=p.settings,v=[];if(!q.process_html){return r}if(d){r=r.replace(/&apos;/g,"&#39;");r=r.replace(/\s+(disabled|checked|readonly|selected)\s*=\s*[\"\']?(false|0)[\"\']?/gi,"")}r=r.replace(/<a( )([^>]+)\/>|<a\/>/gi,"<a$1$2></a>");if(q.keep_values){if(/<script|noscript|style/i.test(r)){function o(t){t=t.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n");t=t.replace(/^[\r\n]*|[\r\n]*$/g,"");t=t.replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g,"");t=t.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g,"");return t}r=r.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/gi,function(s,x,t){if(!x){x=' type="text/javascript"'}x=x.replace(/src=\"([^\"]+)\"?/i,function(y,z){if(q.url_converter){z=p.encode(q.url_converter.call(q.url_converter_scope||p,p.decode(z),"src","script"))}return'_mce_src="'+z+'"'});if(m.trim(t)){v.push(o(t));t="<!--\nMCE_SCRIPT:"+(v.length-1)+"\n// -->"}return"<mce:script"+x+">"+t+"</mce:script>"});r=r.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/gi,function(s,x,t){if(t){v.push(o(t));t="<!--\nMCE_SCRIPT:"+(v.length-1)+"\n-->"}return"<mce:style"+x+">"+t+"</mce:style><style "+x+' _mce_bogus="1">'+t+"</style>"});r=r.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g,function(s,x,t){return"<mce:noscript"+x+"><!--"+p.encode(t).replace(/--/g,"&#45;&#45;")+"--></mce:noscript>"})}r=r.replace(/<!\[CDATA\[([\s\S]+)\]\]>/g,"<!--[CDATA[$1]]-->");function u(s){return s.replace(h,function(y,z,x,t){return"<"+z+x.replace(l,function(B,A,E,D,C){var F;A=A.toLowerCase();E=E||D||C||"";if(e[A]){if(E==="false"||E==="0"){return}return A+'="'+A+'"'}if(f[A]&&x.indexOf("_mce_"+A)==-1){F=p.decode(E);if(q.url_converter&&(A=="src"||A=="href")){F=q.url_converter.call(q.url_converter_scope||p,F,A,z)}if(A=="style"){F=p.serializeStyle(p.parseStyle(F),A)}return A+'="'+E+'" _mce_'+A+'="'+p.encode(F)+'"'}return B})+t+">"})}r=u(r);r=r.replace(/MCE_SCRIPT:([0-9]+)/g,function(t,s){return v[s]})}return r},getOuterHTML:function(o){var p;o=this.get(o);if(!o){return null}if(o.outerHTML!==undefined){return o.outerHTML}p=(o.ownerDocument||this.doc).createElement("body");p.appendChild(o.cloneNode(true));return p.innerHTML},setOuterHTML:function(r,p,s){var o=this;function q(u,t,x){var y,v;v=x.createElement("body");v.innerHTML=t;y=v.lastChild;while(y){o.insertAfter(y.cloneNode(true),u);y=y.previousSibling}o.remove(u)}return this.run(r,function(u){u=o.get(u);if(u.nodeType==1){s=s||u.ownerDocument||o.doc;if(d){try{if(d&&u.nodeType==1){u.outerHTML=p}else{q(u,p,s)}}catch(t){q(u,p,s)}}else{q(u,p,s)}}})},decode:function(p){var q,r,o;if(/&[\w#]+;/.test(p)){q=this.doc.createElement("div");q.innerHTML=p;r=q.firstChild;o="";if(r){do{o+=r.nodeValue}while(r=r.nextSibling)}return o||p}return p},encode:function(o){return(""+o).replace(n,function(p){return c[p]})},insertAfter:function(o,p){p=this.get(p);return this.run(o,function(r){var q,s;q=p.parentNode;s=p.nextSibling;if(s){q.insertBefore(r,s)}else{q.appendChild(r)}return r})},isBlock:function(o){if(o.nodeType&&o.nodeType!==1){return false}o=o.nodeName||o;return a.test(o)},replace:function(s,r,p){var q=this;if(j(r,"array")){s=s.cloneNode(true)}return q.run(r,function(t){if(p){k(m.grep(t.childNodes),function(o){s.appendChild(o)})}return t.parentNode.replaceChild(s,t)})},rename:function(r,o){var q=this,p;if(r.nodeName!=o.toUpperCase()){p=q.create(o);k(q.getAttribs(r),function(s){q.setAttrib(p,s.nodeName,q.getAttrib(r,s.nodeName))});q.replace(p,r,1)}return p||r},findCommonAncestor:function(q,o){var r=q,p;while(r){p=o;while(p&&r!=p){p=p.parentNode}if(r==p){break}r=r.parentNode}if(!r&&q.ownerDocument){return q.ownerDocument.documentElement}return r},toHex:function(o){var q=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(o);function p(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}if(q){o="#"+p(q[1])+p(q[2])+p(q[3]);return o}return o},getClasses:function(){var s=this,o=[],r,u={},v=s.settings.class_filter,q;if(s.classes){return s.classes}function x(t){k(t.imports,function(y){x(y)});k(t.cssRules||t.rules,function(y){switch(y.type||1){case 1:if(y.selectorText){k(y.selectorText.split(","),function(z){z=z.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(z)||!/\.[\w\-]+$/.test(z)){return}q=z;z=z.replace(/.*\.([a-z0-9_\-]+).*/i,"$1");if(v&&!(z=v(z,q))){return}if(!u[z]){o.push({"class":z});u[z]=1}})}break;case 3:x(y.styleSheet);break}})}try{k(s.doc.styleSheets,x)}catch(p){}if(o.length>0){s.classes=o}return o},run:function(u,r,q){var p=this,v;if(p.doc&&typeof(u)==="string"){u=p.get(u)}if(!u){return false}q=q||this;if(!u.nodeType&&(u.length||u.length===0)){v=[];k(u,function(s,o){if(s){if(typeof(s)=="string"){s=p.doc.getElementById(s)}v.push(r.call(q,s,o))}});return v}return r.call(q,u)},getAttribs:function(q){var p;q=this.get(q);if(!q){return[]}if(d){p=[];if(q.nodeName=="OBJECT"){return q.attributes}if(q.nodeName==="OPTION"&&this.getAttrib(q,"selected")){p.push({specified:1,nodeName:"selected"})}q.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(o){p.push({specified:1,nodeName:o})});return p}return q.attributes},destroy:function(p){var o=this;if(o.events){o.events.destroy()}o.win=o.doc=o.root=o.events=null;if(!p){m.removeUnload(o.destroy)}},createRng:function(){var o=this.doc;return o.createRange?o.createRange():new m.dom.Range(this)},nodeIndex:function(s,t){var o=0,q,r,p;if(s){for(q=s.nodeType,s=s.previousSibling,r=s;s;s=s.previousSibling){p=s.nodeType;if(t&&p==3){if(p==q||!s.nodeValue.length){continue}}o++;q=p}}return o},split:function(u,s,y){var z=this,o=z.createRng(),v,q,x;function p(A){var t,r=A.childNodes;if(A.nodeType==1&&A.getAttribute("_mce_type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){p(r[t])}if(A.nodeType!=9){if(A.nodeType==3&&A.nodeValue.length>0){return}if(A.nodeType==1){r=A.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("_mce_type")=="bookmark"){A.parentNode.insertBefore(r[0],A)}if(r.length||/^(br|hr|input|img)$/i.test(A.nodeName)){return}}z.remove(A)}return A}if(u&&s){o.setStart(u.parentNode,z.nodeIndex(u));o.setEnd(s.parentNode,z.nodeIndex(s));v=o.extractContents();o=z.createRng();o.setStart(s.parentNode,z.nodeIndex(s)+1);o.setEnd(u.parentNode,z.nodeIndex(u)+1);q=o.extractContents();x=u.parentNode;x.insertBefore(p(v),u);if(y){x.replaceChild(y,s)}else{x.insertBefore(s,u)}x.insertBefore(p(q),u);z.remove(u);return y||s}},bind:function(s,o,r,q){var p=this;if(!p.events){p.events=new m.dom.EventUtils()}return p.events.add(s,o,r,q||this)},unbind:function(r,o,q){var p=this;if(!p.events){p.events=new m.dom.EventUtils()}return p.events.remove(r,o,q)},_findSib:function(r,o,p){var q=this,s=o;if(r){if(j(s,"string")){s=function(t){return q.is(t,o)}}for(r=r[p];r;r=r[p]){if(s(r)){return r}}}return null},_isRes:function(o){return/^(top|left|bottom|right|width|height)/i.test(o)||/;\s*(top|left|bottom|right|width|height)/i.test(o)}});m.DOM=new m.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(W,X){var Z=N[h],Y=N[U],V=N[P],t=N[z];if(W===0){return G(Z,Y,Z,Y)}if(W===1){return G(Z,Y,V,t)}if(W===2){return G(V,t,V,t)}if(W===3){return G(V,t,Z,Y)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z<Y){return -1}return 1}aa=V;while(aa&&aa.parentNode!=X){aa=aa.parentNode}if(aa){W=0;t=X.firstChild;while(t!=aa&&W<Z){W++;t=t.nextSibling}if(Z<=W){return -1}return 1}aa=X;while(aa&&aa.parentNode!=V){aa=aa.parentNode}if(aa){W=0;t=V.firstChild;while(t!=aa&&W<Y){W++;t=t.nextSibling}if(W<Y){return -1}return 1}ab=c.findCommonAncestor(X,V);ad=X;while(ad&&ad.parentNode!=ab){ad=ad.parentNode}if(!ad){ad=ab}ac=V;while(ac&&ac.parentNode!=ab){ac=ac.parentNode}if(!ac){ac=ab}if(ad==ac){return 0}t=ab.firstChild;while(t){if(t==ad){return -1}if(t==ac){return 1}t=t.nextSibling}}function B(V,Y,X){var t,W;if(V){N[h]=Y;N[U]=X}else{N[P]=Y;N[z]=X}t=N[P];while(t.parentNode){t=t.parentNode}W=N[h];while(W.parentNode){W=W.parentNode}if(W==t){if(G(N[h],N[U],N[P],N[z])>0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(g){var i=this,j="\uFEFF",e,h,d=g.dom,c=true,f=false;function b(){var n=g.getRng(),k=d.createRng(),m,o;m=n.item?n.item(0):n.parentElement();if(m.ownerDocument!=d.doc){return k}if(n.item||!m.hasChildNodes()){k.setStart(m.parentNode,d.nodeIndex(m));k.setEnd(k.startContainer,k.startOffset+1);return k}o=g.isCollapsed();function l(s){var u,q,t,p,A=0,x,y,z,r,v;r=n.duplicate();r.collapse(s);u=d.create("a");z=r.parentElement();z.appendChild(u);r.moveToElementText(u);v=n.compareEndPoints(s?"StartToStart":"EndToEnd",r);if(v>0){k[s?"setStartAfter":"setEndAfter"](z);d.remove(u);return}p=tinymce.grep(z.childNodes);x=p.length-1;while(A<=x){y=Math.floor((A+x)/2);z.insertBefore(u,p[y]);r.moveToElementText(u);v=n.compareEndPoints(s?"StartToStart":"EndToEnd",r);if(v>0){A=y+1}else{if(v<0){x=y-1}else{found=true;break}}}q=v>0||y==0?u.nextSibling:u.previousSibling;if(q.nodeType==1){d.remove(u);t=d.nodeIndex(q);q=q.parentNode;if(!s||y>0){t++}}else{if(v>0||y==0){r.setEndPoint(s?"StartToStart":"EndToEnd",n);t=r.text.length}else{r.setEndPoint(s?"StartToStart":"EndToEnd",n);t=q.nodeValue.length-r.text.length}d.remove(u)}k[s?"setStart":"setEnd"](q,t)}l(true);if(!o){l()}return k}this.addRange=function(l){var t,A,z=g.dom.doc,r=z.body,u,n,y,o,s,k,p,q,x,m;this.destroy();y=l.startContainer;o=l.startOffset;s=l.endContainer;k=l.endOffset;t=r.createTextRange();if(y==z||s==z){t=r.createTextRange();t.collapse();t.select();return}if(y.nodeType==1&&y.hasChildNodes()){q=y.childNodes.length-1;if(o>q){x=1;y=y.childNodes[q]}else{y=y.childNodes[o]}if(y.nodeType==3){o=0}}if(s.nodeType==1&&s.hasChildNodes()){q=s.childNodes.length-1;if(k==0){m=1;s=s.childNodes[0]}else{s=s.childNodes[Math.min(q,k-1)];if(s.nodeType==3){k=s.nodeValue.length}}}if(y==s&&y.nodeType==1){if(/^(IMG|TABLE)$/.test(y.nodeName)&&o!=k){t=r.createControlRange();t.addElement(y)}else{t=r.createTextRange();if(!y.hasChildNodes()&&y.canHaveHTML){y.innerHTML=j}t.moveToElementText(y);if(y.innerHTML==j){t.collapse(c);y.removeChild(y.firstChild)}}if(o==k){t.collapse(k<=l.endContainer.childNodes.length-1)}t.select();t.scrollIntoView();return}t=r.createTextRange();p=z.createElement("span");p.innerHTML=" ";if(y.nodeType==3){if(x){d.insertAfter(p,y)}else{y.parentNode.insertBefore(p,y)}t.moveToElementText(p);p.parentNode.removeChild(p);t.move("character",o)}else{t.moveToElementText(y);if(x){t.collapse(f)}}if(y==s&&y.nodeType==3){try{t.moveEnd("character",k-o);t.select();t.scrollIntoView()}catch(v){}return}A=r.createTextRange();if(s.nodeType==3){s.parentNode.insertBefore(p,s);A.moveToElementText(p);p.parentNode.removeChild(p);A.move("character",k);t.setEndPoint("EndToStart",A)}else{A.moveToElementText(s);A.collapse(!!m);t.setEndPoint("EndToEnd",A)}t.select();t.scrollIntoView()};this.getRangeAt=function(){if(!e||!tinymce.dom.RangeUtils.compareRanges(h,g.getRng())){e=b();h=g.getRng()}try{e.startContainer.nextSibling}catch(k){e=b();h=null}return e};this.destroy=function(){h=e=null};if(g.dom.boxModel){(function(){var q=d.doc,l=q.body,n,o;q.documentElement.unselectable=c;function p(r,u){var s=l.createTextRange();try{s.moveToPoint(r,u)}catch(t){s=null}return s}function m(s){var r;if(s.button){r=p(s.x,s.y);if(r){if(r.compareEndPoints("StartToStart",o)>0){r.setEndPoint("StartToStart",o)}else{r.setEndPoint("EndToEnd",o)}r.select()}}else{k()}}function k(){d.unbind(q,"mouseup",k);d.unbind(q,"mousemove",m);n=0}d.bind(q,"mousedown",function(r){if(r.target.nodeName==="HTML"){if(n){k()}n=1;o=p(r.x,r.y);if(o){d.bind(q,"mouseup",k);d.bind(q,"mousemove",m);o.select()}}})})()}}tinymce.dom.TridentSelection=a})();(function(){var p=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,i=0,d=Object.prototype.toString,n=false;var b=function(E,t,B,v){B=B||[];var e=t=t||document;if(t.nodeType!==1&&t.nodeType!==9){return[]}if(!E||typeof E!=="string"){return B}var C=[],D,z,H,G,A,s,r=true,x=o(t);p.lastIndex=0;while((D=p.exec(E))!==null){C.push(D[1]);if(D[2]){s=RegExp.rightContext;break}}if(C.length>1&&j.exec(E)){if(C.length===2&&f.relative[C[0]]){z=g(C[0]+C[1],t)}else{z=f.relative[C[0]]?[t]:b(C.shift(),t);while(C.length){E=C.shift();if(f.relative[E]){E+=C.shift()}z=g(E,z)}}}else{if(!v&&C.length>1&&t.nodeType===9&&!x&&f.match.ID.test(C[0])&&!f.match.ID.test(C[C.length-1])){var I=b.find(C.shift(),t,x);t=I.expr?b.filter(I.expr,I.set)[0]:I.set[0]}if(t){var I=v?{expr:C.pop(),set:a(v)}:b.find(C.pop(),C.length===1&&(C[0]==="~"||C[0]==="+")&&t.parentNode?t.parentNode:t,x);z=I.expr?b.filter(I.expr,I.set):I.set;if(C.length>0){H=a(z)}else{r=false}while(C.length){var u=C.pop(),y=u;if(!f.relative[u]){u=""}else{y=C.pop()}if(y==null){y=t}f.relative[u](H,y,x)}}else{H=C=[]}}if(!H){H=z}if(!H){throw"Syntax error, unrecognized expression: "+(u||E)}if(d.call(H)==="[object Array]"){if(!r){B.push.apply(B,H)}else{if(t&&t.nodeType===1){for(var F=0;H[F]!=null;F++){if(H[F]&&(H[F]===true||H[F].nodeType===1&&h(t,H[F]))){B.push(z[F])}}}else{for(var F=0;H[F]!=null;F++){if(H[F]&&H[F].nodeType===1){B.push(z[F])}}}}}else{a(H,B)}if(s){b(s,e,B,v);b.uniqueSort(B)}return B};b.uniqueSort=function(r){if(c){n=false;r.sort(c);if(n){for(var e=1;e<r.length;e++){if(r[e]===r[e-1]){r.splice(e--,1)}}}}};b.matches=function(e,r){return b(e,null,null,r)};b.find=function(y,e,z){var x,u;if(!y){return[]}for(var t=0,s=f.order.length;t<s;t++){var v=f.order[t],u;if((u=f.match[v].exec(y))){var r=RegExp.leftContext;if(r.substr(r.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");x=f.find[v](u,e,z);if(x!=null){y=y.replace(f.match[v],"");break}}}}if(!x){x=e.getElementsByTagName("*")}return{set:x,expr:y}};b.filter=function(B,A,E,t){var s=B,G=[],y=A,v,e,x=A&&A[0]&&o(A[0]);while(B&&A.length){for(var z in f.filter){if((v=f.match[z].exec(B))!=null){var r=f.filter[z],F,D;e=false;if(y==G){G=[]}if(f.preFilter[z]){v=f.preFilter[z](v,y,E,G,t,x);if(!v){e=F=true}else{if(v===true){continue}}}if(v){for(var u=0;(D=y[u])!=null;u++){if(D){F=r(D,v,u,y);var C=t^!!F;if(E&&F!=null){if(C){e=true}else{y[u]=false}}else{if(C){G.push(D);e=true}}}}}if(F!==undefined){if(!E){y=G}B=B.replace(f.match[z],"");if(!e){return[]}break}}}if(B==s){if(e==null){throw"Syntax error, unrecognized expression: "+B}else{break}}s=B}return y};var f=b.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(y,e,x){var u=typeof e==="string",z=u&&!/\W/.test(e),v=u&&!z;if(z&&!x){e=e.toUpperCase()}for(var t=0,s=y.length,r;t<s;t++){if((r=y[t])){while((r=r.previousSibling)&&r.nodeType!==1){}y[t]=v||r&&r.nodeName===e?r||false:r===e}}if(v){b.filter(e,y,true)}},">":function(x,r,y){var u=typeof r==="string";if(u&&!/\W/.test(r)){r=y?r:r.toUpperCase();for(var s=0,e=x.length;s<e;s++){var v=x[s];if(v){var t=v.parentNode;x[s]=t.nodeName===r?t:false}}}else{for(var s=0,e=x.length;s<e;s++){var v=x[s];if(v){x[s]=u?v.parentNode:v.parentNode===r}}if(u){b.filter(r,x,true)}}},"":function(t,r,v){var s=i++,e=q;if(!r.match(/\W/)){var u=r=v?r:r.toUpperCase();e=m}e("parentNode",r,s,t,u,v)},"~":function(t,r,v){var s=i++,e=q;if(typeof r==="string"&&!r.match(/\W/)){var u=r=v?r:r.toUpperCase();e=m}e("previousSibling",r,s,t,u,v)}},find:{ID:function(r,s,t){if(typeof s.getElementById!=="undefined"&&!t){var e=s.getElementById(r[1]);return e?[e]:[]}},NAME:function(s,v,x){if(typeof v.getElementsByName!=="undefined"){var r=[],u=v.getElementsByName(s[1]);for(var t=0,e=u.length;t<e;t++){if(u[t].getAttribute("name")===s[1]){r.push(u[t])}}return r.length===0?null:r}},TAG:function(e,r){return r.getElementsByTagName(e[1])}},preFilter:{CLASS:function(t,r,s,e,x,y){t=" "+t[1].replace(/\\/g,"")+" ";if(y){return t}for(var u=0,v;(v=r[u])!=null;u++){if(v){if(x^(v.className&&(" "+v.className+" ").indexOf(t)>=0)){if(!s){e.push(v)}}else{if(s){r[u]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(r,e){for(var s=0;e[s]===false;s++){}return e[s]&&o(e[s])?r[1]:r[1].toUpperCase()},CHILD:function(e){if(e[1]=="nth"){var r=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]=="even"&&"2n"||e[2]=="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(r[1]+(r[2]||1))-0;e[3]=r[3]-0}e[0]=i++;return e},ATTR:function(u,r,s,e,v,x){var t=u[1].replace(/\\/g,"");if(!x&&f.attrMap[t]){u[1]=f.attrMap[t]}if(u[2]==="~="){u[4]=" "+u[4]+" "}return u},PSEUDO:function(u,r,s,e,v){if(u[1]==="not"){if(u[3].match(p).length>1||/^\w/.test(u[3])){u[3]=b(u[3],null,null,r)}else{var t=b.filter(u[3],r,s,true^v);if(!s){e.push.apply(e,t)}return false}}else{if(f.match.POS.test(u[0])||f.match.CHILD.test(u[0])){return true}}return u},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(s,r,e){return !!b(e[3],s).length},header:function(e){return/h\d/i.test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toUpperCase()==="BUTTON"},input:function(e){return/input|select|textarea|button/i.test(e.nodeName)}},setFilters:{first:function(r,e){return e===0},last:function(s,r,e,t){return r===t.length-1},even:function(r,e){return e%2===0},odd:function(r,e){return e%2===1},lt:function(s,r,e){return r<e[3]-0},gt:function(s,r,e){return r>e[3]-0},nth:function(s,r,e){return e[3]-0==r},eq:function(s,r,e){return e[3]-0==r}},filter:{PSEUDO:function(x,s,t,y){var r=s[1],u=f.filters[r];if(u){return u(x,t,s,y)}else{if(r==="contains"){return(x.textContent||x.innerText||"").indexOf(s[3])>=0}else{if(r==="not"){var v=s[3];for(var t=0,e=v.length;t<e;t++){if(v[t]===x){return false}}return true}}}},CHILD:function(e,t){var x=t[1],r=e;switch(x){case"only":case"first":while(r=r.previousSibling){if(r.nodeType===1){return false}}if(x=="first"){return true}r=e;case"last":while(r=r.nextSibling){if(r.nodeType===1){return false}}return true;case"nth":var s=t[2],A=t[3];if(s==1&&A==0){return true}var v=t[0],z=e.parentNode;if(z&&(z.sizcache!==v||!e.nodeIndex)){var u=0;for(r=z.firstChild;r;r=r.nextSibling){if(r.nodeType===1){r.nodeIndex=++u}}z.sizcache=v}var y=e.nodeIndex-A;if(s==0){return y==0}else{return(y%s==0&&y/s>=0)}}},ID:function(r,e){return r.nodeType===1&&r.getAttribute("id")===e},TAG:function(r,e){return(e==="*"&&r.nodeType===1)||r.nodeName===e},CLASS:function(r,e){return(" "+(r.className||r.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(v,t){var s=t[1],e=f.attrHandle[s]?f.attrHandle[s](v):v[s]!=null?v[s]:v.getAttribute(s),x=e+"",u=t[2],r=t[4];return e==null?u==="!=":u==="="?x===r:u==="*="?x.indexOf(r)>=0:u==="~="?(" "+x+" ").indexOf(r)>=0:!r?x&&e!==false:u==="!="?x!=r:u==="^="?x.indexOf(r)===0:u==="$="?x.substr(x.length-r.length)===r:u==="|="?x===r||x.substr(0,r.length+1)===r+"-":false},POS:function(u,r,s,v){var e=r[2],t=f.setFilters[e];if(t){return t(u,s,r,v)}}}};var j=f.match.POS;for(var l in f.match){f.match[l]=new RegExp(f.match[l].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var a=function(r,e){r=Array.prototype.slice.call(r);if(e){e.push.apply(e,r);return e}return r};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(k){a=function(u,t){var r=t||[];if(d.call(u)==="[object Array]"){Array.prototype.push.apply(r,u)}else{if(typeof u.length==="number"){for(var s=0,e=u.length;s<e;s++){r.push(u[s])}}else{for(var s=0;u[s];s++){r.push(u[s])}}}return r}}var c;if(document.documentElement.compareDocumentPosition){c=function(r,e){var s=r.compareDocumentPosition(e)&4?-1:r===e?0:1;if(s===0){n=true}return s}}else{if("sourceIndex" in document.documentElement){c=function(r,e){var s=r.sourceIndex-e.sourceIndex;if(s===0){n=true}return s}}else{if(document.createRange){c=function(t,r){var s=t.ownerDocument.createRange(),e=r.ownerDocument.createRange();s.setStart(t,0);s.setEnd(t,0);e.setStart(r,0);e.setEnd(r,0);var u=s.compareBoundaryPoints(Range.START_TO_END,e);if(u===0){n=true}return u}}}}(function(){var r=document.createElement("div"),s="script"+(new Date).getTime();r.innerHTML="<a name='"+s+"'/>";var e=document.documentElement;e.insertBefore(r,e.firstChild);if(!!document.getElementById(s)){f.find.ID=function(u,v,x){if(typeof v.getElementById!=="undefined"&&!x){var t=v.getElementById(u[1]);return t?t.id===u[1]||typeof t.getAttributeNode!=="undefined"&&t.getAttributeNode("id").nodeValue===u[1]?[t]:undefined:[]}};f.filter.ID=function(v,t){var u=typeof v.getAttributeNode!=="undefined"&&v.getAttributeNode("id");return v.nodeType===1&&u&&u.nodeValue===t}}e.removeChild(r)})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){f.find.TAG=function(r,v){var u=v.getElementsByTagName(r[1]);if(r[1]==="*"){var t=[];for(var s=0;u[s];s++){if(u[s].nodeType===1){t.push(u[s])}}u=t}return u}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){f.attrHandle.href=function(r){return r.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var e=b,s=document.createElement("div");s.innerHTML="<p class='TEST'></p>";if(s.querySelectorAll&&s.querySelectorAll(".TEST").length===0){return}b=function(x,v,t,u){v=v||document;if(!u&&v.nodeType===9&&!o(v)){try{return a(v.querySelectorAll(x),t)}catch(y){}}return e(x,v,t,u)};for(var r in e){b[r]=e[r]}})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}f.order.splice(1,0,"CLASS");f.find.CLASS=function(r,s,t){if(typeof s.getElementsByClassName!=="undefined"&&!t){return s.getElementsByClassName(r[1])}}})()}function m(r,x,v,B,y,A){var z=r=="previousSibling"&&!A;for(var t=0,s=B.length;t<s;t++){var e=B[t];if(e){if(z&&e.nodeType===1){e.sizcache=v;e.sizset=t}e=e[r];var u=false;while(e){if(e.sizcache===v){u=B[e.sizset];break}if(e.nodeType===1&&!A){e.sizcache=v;e.sizset=t}if(e.nodeName===x){u=e;break}e=e[r]}B[t]=u}}}function q(r,x,v,B,y,A){var z=r=="previousSibling"&&!A;for(var t=0,s=B.length;t<s;t++){var e=B[t];if(e){if(z&&e.nodeType===1){e.sizcache=v;e.sizset=t}e=e[r];var u=false;while(e){if(e.sizcache===v){u=B[e.sizset];break}if(e.nodeType===1){if(!A){e.sizcache=v;e.sizset=t}if(typeof x!=="string"){if(e===x){u=true;break}}else{if(b.filter(x,[e]).length>0){u=e;break}}}e=e[r]}B[t]=u}}}var h=document.compareDocumentPosition?function(r,e){return r.compareDocumentPosition(e)&16}:function(r,e){return r!==e&&(r.contains?r.contains(e):true)};var o=function(e){return e.nodeType===9&&e.documentElement.nodeName!=="HTML"||!!e.ownerDocument&&e.ownerDocument.documentElement.nodeName!=="HTML"};var g=function(e,y){var t=[],u="",v,s=y.nodeType?[y]:y;while((v=f.match.PSEUDO.exec(e))){u+=v[0];e=e.replace(f.match.PSEUDO,"")}e=f.relative[e]?e+"*":e;for(var x=0,r=s.length;x<r;x++){b(e,s[x],t)}return b.filter(u,t)};window.tinymce.dom.Sizzle=b})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}c.addUnload(f.destroy,f)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML=h.item?h.item(0).outerHTML:h.htmlText}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(i,g){var f=this,j=f.getRng(),l,k=f.win.document;g=g||{format:"html"};g.set=true;i=g.content=f.dom.processHTML(i);f.onBeforeSetContent.dispatch(f,g);i=g.content;if(j.insertNode){i+='<span id="__caret">_</span>';if(j.startContainer==k&&j.endContainer==k){k.body.innerHTML=i}else{j.deleteContents();if(k.body.childNodes.length==0){k.body.innerHTML=i}else{j.insertNode(j.createContextualFragment(i))}}l=f.dom.get("__caret");j=k.createRange();j.setStartBefore(l);j.setEndBefore(l);f.setRng(j);f.dom.remove("__caret")}else{if(j.item){k.execCommand("Delete",false,null);j=f.getRng()}j.pasteHTML(i)}f.onSetContent.dispatch(f,g)},getStart:function(){var f=this,g=f.getRng(),h;if(g.duplicate||g.item){if(g.item){return g.item(0)}g=g.duplicate();g.collapse(1);h=g.parentElement();if(h&&h.nodeName=="BODY"){return h.firstChild||h}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(q,r){var u=this,m=u.dom,g,j,i,n,h,o,p,l="\uFEFF",s;function f(v,x){var t=0;d(m.select(v),function(z,y){if(z==x){t=y}});return t}if(q==2){function k(){var v=u.getRng(true),t=m.getRoot(),x={};function y(B,G){var A=B[G?"startContainer":"endContainer"],F=B[G?"startOffset":"endOffset"],z=[],C,E,D=0;if(A.nodeType==3){if(r){for(C=A.previousSibling;C&&C.nodeType==3;C=C.previousSibling){F+=C.nodeValue.length}}z.push(F)}else{E=A.childNodes;if(F>=E.length&&E.length){D=1;F=Math.max(0,E.length-1)}z.push(u.dom.nodeIndex(E[F],r)+D)}for(;A&&A!=t;A=A.parentNode){z.push(u.dom.nodeIndex(A,r))}return z}x.start=y(v,true);if(!u.isCollapsed()){x.end=y(v)}return x}return k()}if(q){return{rng:u.getRng()}}g=u.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();s="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();g.collapse();g.pasteHTML('<span _mce_type="bookmark" id="'+i+'_start" style="'+s+'">'+l+"</span>");if(!n){j.collapse(false);j.pasteHTML('<span _mce_type="bookmark" id="'+i+'_end" style="'+s+'">'+l+"</span>")}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=u.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{_mce_type:"bookmark",id:i+"_end",style:s},l))}g.collapse(true);g.insertNode(m.create("span",{_mce_type:"bookmark",id:i+"_start",style:s},l))}u.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(m){var q=this,l=q.dom,i,h,f,p,j,r,n,o;if(q.tridentSel){q.tridentSel.destroy()}if(m){if(m.start){f=l.createRng();p=l.getRoot();function g(x){var s=m[x?"start":"end"],t,u,v;if(s){for(u=p,t=s.length-1;t>=1;t--){u=u.childNodes[s[t]]}if(x){f.setStart(u,s[0])}else{f.setEnd(u,s[0])}}}g(true);g();q.setRng(f)}else{if(m.id){function k(z){var t=l.get(m.id+"_"+z),y,s,v,x,u=m.keep;if(t){y=t.parentNode;if(z=="start"){if(!u){s=l.nodeIndex(t)}else{y=t;s=1}j=r=y;n=o=s}else{if(!u){s=l.nodeIndex(t)}else{y=t;s=1}r=y;o=s}if(!u){x=t.previousSibling;v=t.nextSibling;d(c.grep(t.childNodes),function(A){if(A.nodeType==3){A.nodeValue=A.nodeValue.replace(/\uFEFF/g,"")}});while(t=l.get(m.id+"_"+z)){l.remove(t,1)}if(x&&v&&x.nodeType==v.nodeType&&x.nodeType==3){s=x.nodeValue.length;x.appendData(v.nodeValue);l.remove(v);if(z=="start"){j=r=x;n=o=s}else{r=x;o=s}}}}}k("start");k("end");f=l.createRng();f.setStart(j,n);f.setEnd(r,o);q.setRng(f)}else{if(m.name){q.select(l.select(m.name)[m.index])}else{if(m.rng){q.setRng(m.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g);return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var g=this,h=g.getRng(),i;if(h.item){i=h.item(0);h=this.win.document.body.createTextRange();h.moveToElementText(i)}h.collapse(!!f);g.setRng(h)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(j){var g=this,h,i;if(j&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():g.win.document.createRange())}}catch(f){}if(!i){i=g.win.document.createRange?g.win.document.createRange():g.win.document.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;h.removeAllRanges();h.addRange(i);g.selectedRange=h.getRangeAt(0)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var g=this,f=g.getRng(),h=g.getSel(),i;if(f.setStart){if(!f){return g.dom.getRoot()}i=f.commonAncestorContainer;if(!f.collapsed){if(f.startContainer==f.endContainer){if(f.startOffset-f.endOffset<2){if(f.startContainer.hasChildNodes()){i=f.startContainer.childNodes[f.startOffset]}}}if(c.isWebKit&&h.anchorNode&&h.anchorNode.nodeType==1){return h.anchorNode.childNodes[h.anchorOffset]}}if(i&&i.nodeType==3){return i.parentNode}return i}return f.item?f.item(0):f.parentElement()},getSelectedBlocks:function(g,f){var i=this,j=i.dom,m,h,l,k=[];m=j.getParent(g||i.getStart(),j.isBlock);h=j.getParent(f||i.getEnd(),j.isBlock);if(m){k.push(m)}if(m&&h&&m!=h){l=m;while((l=l.nextSibling)&&l!=h){if(j.isBlock(l)){k.push(l)}}}if(h&&m!=h){k.push(h)}return k},destroy:function(g){var f=this;f.win=null;if(f.tridentSel){f.tridentSel.destroy()}if(!g){c.removeUnload(f.destroy)}}})})(tinymce);(function(a){a.create("tinymce.dom.XMLWriter",{node:null,XMLWriter:function(c){function b(){var e=document.implementation;if(!e||!e.createDocument){try{return new ActiveXObject("MSXML2.DOMDocument")}catch(d){}try{return new ActiveXObject("Microsoft.XmlDom")}catch(d){}}else{return e.createDocument("","",null)}}this.doc=b();this.valid=a.isOpera||a.isWebKit;this.reset()},reset:function(){var b=this,c=b.doc;if(c.firstChild){c.removeChild(c.firstChild)}b.node=c.appendChild(c.createElement("html"))},writeStartElement:function(c){var b=this;b.node=b.node.appendChild(b.doc.createElement(c))},writeAttribute:function(c,b){if(this.valid){b=b.replace(/>/g,"%MCGT%")}this.node.setAttribute(c,b)},writeEndElement:function(){this.node=this.node.parentNode},writeFullEndElement:function(){var b=this,c=b.node;c.appendChild(b.doc.createTextNode(""));b.node=c.parentNode},writeText:function(b){if(this.valid){b=b.replace(/>/g,"%MCGT%")}this.node.appendChild(this.doc.createTextNode(b))},writeCDATA:function(b){this.node.appendChild(this.doc.createCDATASection(b))},writeComment:function(b){if(a.isIE){b=b.replace(/^\-|\-$/g," ")}this.node.appendChild(this.doc.createComment(b.replace(/\-\-/g," ")))},getContent:function(){var b;b=this.doc.xml||new XMLSerializer().serializeToString(this.doc);b=b.replace(/<\?[^?]+\?>|<html>|<\/html>|<html\/>|<!DOCTYPE[^>]+>/g,"");b=b.replace(/ ?\/>/g," />");if(this.valid){b=b.replace(/\%MCGT%/g,"&gt;")}return b}})})(tinymce);(function(a){a.create("tinymce.dom.StringWriter",{str:null,tags:null,count:0,settings:null,indent:null,StringWriter:function(b){this.settings=a.extend({indent_char:" ",indentation:0},b);this.reset()},reset:function(){this.indent="";this.str="";this.tags=[];this.count=0},writeStartElement:function(b){this._writeAttributesEnd();this.writeRaw("<"+b);this.tags.push(b);this.inAttr=true;this.count++;this.elementCount=this.count},writeAttribute:function(d,b){var c=this;c.writeRaw(" "+c.encode(d)+'="'+c.encode(b)+'"')},writeEndElement:function(){var b;if(this.tags.length>0){b=this.tags.pop();if(this._writeAttributesEnd(1)){this.writeRaw("</"+b+">")}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(b){this._writeAttributesEnd();this.writeRaw(this.encode(b));this.count++},writeCDATA:function(b){this._writeAttributesEnd();this.writeRaw("<![CDATA["+b+"]]>");this.count++},writeComment:function(b){this._writeAttributesEnd();this.writeRaw("<!-- "+b+"-->");this.count++},writeRaw:function(b){this.str+=b},encode:function(b){return b.replace(/[<>&"]/g,function(c){switch(c){case"<":return"&lt;";case">":return"&gt;";case"&":return"&amp;";case'"':return"&quot;"}return c})},getContent:function(){return this.str},_writeAttributesEnd:function(b){if(!this.inAttr){return}this.inAttr=false;if(b&&this.elementCount==this.count){this.writeRaw(" />");return false}this.writeRaw(">");return true}})})(tinymce);(function(e){var g=e.extend,f=e.each,b=e.util.Dispatcher,d=e.isIE,a=e.isGecko;function c(h){return h.replace(/([?+*])/g,".$1")}e.create("tinymce.dom.Serializer",{Serializer:function(j){var i=this;i.key=0;i.onPreProcess=new b(i);i.onPostProcess=new b(i);try{i.writer=new e.dom.XMLWriter()}catch(h){i.writer=new e.dom.StringWriter()}i.settings=j=g({dom:e.DOM,valid_nodes:0,node_filter:0,attr_filter:0,invalid_attrs:/^(_mce_|_moz_|sizset|sizcache)/,closed:/^(br|hr|input|meta|img|link|param|area)$/,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,invalid_elements:0,fix_table_elements:1,fix_list_elements:true,fix_content_duplication:true,convert_fonts_to_spans:false,font_size_classes:0,apply_source_formatting:0,indent_mode:"simple",indent_char:"\t",indent_levels:1,remove_linebreaks:1,remove_redundant_brs:1,element_format:"xhtml"},j);i.dom=j.dom;i.schema=j.schema;if(j.entity_encoding=="named"&&!j.entities){j.entity_encoding="raw"}if(j.remove_redundant_brs){i.onPostProcess.add(function(k,l){l.content=l.content.replace(/(<br \/>\s*)+<\/(p|h[1-6]|div|li)>/gi,function(n,m,o){if(/^<br \/>\s*<\//.test(n)){return"</"+o+">"}return n})})}if(j.element_format=="html"){i.onPostProcess.add(function(k,l){l.content=l.content.replace(/<([^>]+) \/>/g,"<$1>")})}if(j.fix_list_elements){i.onPreProcess.add(function(v,s){var l,z,y=["ol","ul"],u,t,q,k=/^(OL|UL)$/,A;function m(r,x){var o=x.split(","),p;while((r=r.previousSibling)!=null){for(p=0;p<o.length;p++){if(r.nodeName==o[p]){return r}}}return null}for(z=0;z<y.length;z++){l=i.dom.select(y[z],s.node);for(u=0;u<l.length;u++){t=l[u];q=t.parentNode;if(k.test(q.nodeName)){A=m(t,"LI");if(!A){A=i.dom.create("li");A.innerHTML="&nbsp;";A.appendChild(t);q.insertBefore(A,q.firstChild)}else{A.appendChild(t)}}}}})}if(j.fix_table_elements){i.onPreProcess.add(function(k,l){if(!e.isOpera||opera.buildNumber()>=1767){f(i.dom.select("p table",l.node).reverse(),function(p){var o=i.dom.getParent(p.parentNode,"table,p");if(o.nodeName!="TABLE"){try{i.dom.split(o,p)}catch(m){}}})}})}},setEntities:function(o){var n=this,j,m,h={},k;if(n.entityLookup){return}j=o.split(",");for(m=0;m<j.length;m+=2){k=j[m];if(k==34||k==38||k==60||k==62){continue}h[String.fromCharCode(j[m])]=j[m+1];k=parseInt(j[m]).toString(16)}n.entityLookup=h},setRules:function(i){var h=this;h._setup();h.rules={};h.wildRules=[];h.validElements={};return h.addRules(i)},addRules:function(i){var h=this,j;if(!i){return}h._setup();f(i.split(","),function(m){var q=m.split(/\[|\]/),l=q[0].split("/"),r,k,o,n=[];if(j){k=e.extend([],j.attribs)}if(q.length>1){f(q[1].split("|"),function(u){var p={},t;k=k||[];u=u.replace(/::/g,"~");u=/^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(u);u[2]=u[2].replace(/~/g,":");if(u[1]=="!"){r=r||[];r.push(u[2])}if(u[1]=="-"){for(t=0;t<k.length;t++){if(k[t].name==u[2]){k.splice(t,1);return}}}switch(u[3]){case"=":p.defaultVal=u[4]||"";break;case":":p.forcedVal=u[4];break;case"<":p.validVals=u[4].split("?");break}if(/[*.?]/.test(u[2])){o=o||[];p.nameRE=new RegExp("^"+c(u[2])+"$");o.push(p)}else{p.name=u[2];k.push(p)}n.push(u[2])})}f(l,function(v,u){var y=v.charAt(0),t=1,p={};if(j){if(j.noEmpty){p.noEmpty=j.noEmpty}if(j.fullEnd){p.fullEnd=j.fullEnd}if(j.padd){p.padd=j.padd}}switch(y){case"-":p.noEmpty=true;break;case"+":p.fullEnd=true;break;case"#":p.padd=true;break;default:t=0}l[u]=v=v.substring(t);h.validElements[v]=1;if(/[*.?]/.test(l[0])){p.nameRE=new RegExp("^"+c(l[0])+"$");h.wildRules=h.wildRules||{};h.wildRules.push(p)}else{p.name=l[0];if(l[0]=="@"){j=p}h.rules[v]=p}p.attribs=k;if(r){p.requiredAttribs=r}if(o){v="";f(n,function(s){if(v){v+="|"}v+="("+c(s)+")"});p.validAttribsRE=new RegExp("^"+v.toLowerCase()+"$");p.wildAttribs=o}})});i="";f(h.validElements,function(m,l){if(i){i+="|"}if(l!="@"){i+=l}});h.validElementsRE=new RegExp("^("+c(i.toLowerCase())+")$")},findRule:function(m){var j=this,l=j.rules,h,k;j._setup();k=l[m];if(k){return k}l=j.wildRules;for(h=0;h<l.length;h++){if(l[h].nameRE.test(m)){return l[h]}}return null},findAttribRule:function(h,l){var j,k=h.wildAttribs;for(j=0;j<k.length;j++){if(k[j].nameRE.test(l)){return k[j]}}return null},serialize:function(r,q){var m,k=this,p,i,j,l;k._setup();q=q||{};q.format=q.format||"html";k.processObj=q;if(d){l=[];f(r.getElementsByTagName("option"),function(o){var h=k.dom.getAttrib(o,"selected");l.push(h?h:null)})}r=r.cloneNode(true);if(d){f(r.getElementsByTagName("option"),function(o,h){k.dom.setAttrib(o,"selected",l[h])})}j=r.ownerDocument.implementation;if(j.createHTMLDocument&&(e.isOpera&&opera.buildNumber()>=1767)){p=j.createHTMLDocument("");f(r.nodeName=="BODY"?r.childNodes:[r],function(h){p.body.appendChild(p.importNode(h,true))});if(r.nodeName!="BODY"){r=p.body.firstChild}else{r=p.body}i=k.dom.doc;k.dom.doc=p}k.key=""+(parseInt(k.key)+1);if(!q.no_events){q.node=r;k.onPreProcess.dispatch(k,q)}k.writer.reset();k._info=q;k._serializeNode(r,q.getInner);q.content=k.writer.getContent();if(i){k.dom.doc=i}if(!q.no_events){k.onPostProcess.dispatch(k,q)}k._postProcess(q);q.node=null;return e.trim(q.content)},_postProcess:function(n){var i=this,k=i.settings,j=n.content,m=[],l;if(n.format=="html"){l=i._protect({content:j,patterns:[{pattern:/(<script[^>]*>)(.*?)(<\/script>)/g},{pattern:/(<noscript[^>]*>)(.*?)(<\/noscript>)/g},{pattern:/(<style[^>]*>)(.*?)(<\/style>)/g},{pattern:/(<pre[^>]*>)(.*?)(<\/pre>)/g,encode:1},{pattern:/(<!--\[CDATA\[)(.*?)(\]\]-->)/g}]});j=l.content;if(k.entity_encoding!=="raw"){j=i._encode(j)}if(!n.set){j=j.replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g,k.entity_encoding=="numeric"?"<p$1>&#160;</p>":"<p$1>&nbsp;</p>");if(k.remove_linebreaks){j=j.replace(/\r?\n|\r/g," ");j=j.replace(/(<[^>]+>)\s+/g,"$1 ");j=j.replace(/\s+(<\/[^>]+>)/g," $1");j=j.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>");j=j.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>");j=j.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(k.apply_source_formatting&&k.indent_mode=="simple"){j=j.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g,"\n<$1$2$3>\n");j=j.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g,"\n<$1$2>");j=j.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g,"</$1>\n");j=j.replace(/\n\n/g,"\n")}}j=i._unprotect(j,l);j=j.replace(/<!--\[CDATA\[([\s\S]+)\]\]-->/g,"<![CDATA[$1]]>");if(k.entity_encoding=="raw"){j=j.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g,"<p$1>\u00a0</p>")}j=j.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g,function(h,p,o){return"<noscript"+p+">"+i.dom.decode(o.replace(/<!--|-->/g,""))+"</noscript>"})}n.content=j},_serializeNode:function(D,I){var z=this,A=z.settings,x=z.writer,q,j,u,F,E,H,B,h,y,k,r,C,p,m,G,o;if(!A.node_filter||A.node_filter(D)){switch(D.nodeType){case 1:if(D.hasAttribute?D.hasAttribute("_mce_bogus"):D.getAttribute("_mce_bogus")){return}p=G=false;q=D.hasChildNodes();k=D.getAttribute("_mce_name")||D.nodeName.toLowerCase();o=D.getAttribute("_mce_type");if(o){if(!z._info.cleanup){p=true;return}else{G=1}}if(d){if(D.scopeName!=="HTML"&&D.scopeName!=="html"){k=D.scopeName+":"+k}}if(k.indexOf("mce:")===0){k=k.substring(4)}if(!G){if(!z.validElementsRE||!z.validElementsRE.test(k)||(z.invalidElementsRE&&z.invalidElementsRE.test(k))||I){p=true;break}}if(d){if(A.fix_content_duplication){if(D._mce_serialized==z.key){return}D._mce_serialized=z.key}if(k.charAt(0)=="/"){k=k.substring(1)}}else{if(a){if(D.nodeName==="BR"&&D.getAttribute("type")=="_moz"){return}}}if(A.validate_children){if(z.elementName&&!z.schema.isValid(z.elementName,k)){p=true;break}z.elementName=k}r=z.findRule(k);if(!r){p=true;break}k=r.name||k;m=A.closed.test(k);if((!q&&r.noEmpty)||(d&&!k)){p=true;break}if(r.requiredAttribs){H=r.requiredAttribs;for(F=H.length-1;F>=0;F--){if(this.dom.getAttrib(D,H[F])!==""){break}}if(F==-1){p=true;break}}x.writeStartElement(k);if(r.attribs){for(F=0,B=r.attribs,E=B.length;F<E;F++){H=B[F];y=z._getAttrib(D,H);if(y!==null){x.writeAttribute(H.name,y)}}}if(r.validAttribsRE){B=z.dom.getAttribs(D);for(F=B.length-1;F>-1;F--){h=B[F];if(h.specified){H=h.nodeName.toLowerCase();if(A.invalid_attrs.test(H)||!r.validAttribsRE.test(H)){continue}C=z.findAttribRule(r,H);y=z._getAttrib(D,C,H);if(y!==null){x.writeAttribute(H,y)}}}}if(o&&G){x.writeAttribute("_mce_type",o)}if(k==="script"&&e.trim(D.innerHTML)){x.writeText("// ");x.writeCDATA(D.innerHTML.replace(/<!--|-->|<\[CDATA\[|\]\]>/g,""));q=false;break}if(r.padd){if(q&&(u=D.firstChild)&&u.nodeType===1&&D.childNodes.length===1){if(u.hasAttribute?u.hasAttribute("_mce_bogus"):u.getAttribute("_mce_bogus")){x.writeText("\u00a0")}}else{if(!q){x.writeText("\u00a0")}}}break;case 3:if(A.validate_children&&z.elementName&&!z.schema.isValid(z.elementName,"#text")){return}return x.writeText(D.nodeValue);case 4:return x.writeCDATA(D.nodeValue);case 8:return x.writeComment(D.nodeValue)}}else{if(D.nodeType==1){q=D.hasChildNodes()}}if(q&&!m){u=D.firstChild;while(u){z._serializeNode(u);z.elementName=k;u=u.nextSibling}}if(!p){if(!m){x.writeFullEndElement()}else{x.writeEndElement()}}},_protect:function(j){var i=this;j.items=j.items||[];function h(l){return l.replace(/[\r\n\\]/g,function(m){if(m==="\n"){return"\\n"}else{if(m==="\\"){return"\\\\"}}return"\\r"})}function k(l){return l.replace(/\\[\\rn]/g,function(m){if(m==="\\n"){return"\n"}else{if(m==="\\\\"){return"\\"}}return"\r"})}f(j.patterns,function(l){j.content=k(h(j.content).replace(l.pattern,function(n,o,m,p){m=k(m);if(l.encode){m=i._encode(m)}j.items.push(m);return o+"<!--mce:"+(j.items.length-1)+"-->"+p}))});return j},_unprotect:function(i,j){i=i.replace(/\<!--mce:([0-9]+)--\>/g,function(k,h){return j.items[parseInt(h)]});j.items=[];return i},_encode:function(m){var j=this,k=j.settings,i;if(k.entity_encoding!=="raw"){if(k.entity_encoding.indexOf("named")!=-1){j.setEntities(k.entities);i=j.entityLookup;m=m.replace(/[\u007E-\uFFFF]/g,function(h){var l;if(l=i[h]){h="&"+l+";"}return h})}if(k.entity_encoding.indexOf("numeric")!=-1){m=m.replace(/[\u007E-\uFFFF]/g,function(h){return"&#"+h.charCodeAt(0)+";"})}}return m},_setup:function(){var h=this,i=this.settings;if(h.done){return}h.done=1;h.setRules(i.valid_elements);h.addRules(i.extended_valid_elements);if(i.invalid_elements){h.invalidElementsRE=new RegExp("^("+c(i.invalid_elements.replace(/,/g,"|").toLowerCase())+")$")}if(i.attrib_value_filter){h.attribValueFilter=i.attribValueFilter}},_getAttrib:function(m,j,h){var l,k;h=h||j.name;if(j.forcedVal&&(k=j.forcedVal)){if(k==="{$uid}"){return this.dom.uniqueId()}return k}k=this.dom.getAttrib(m,h);switch(h){case"rowspan":case"colspan":if(k=="1"){k=""}break}if(this.attribValueFilter){k=this.attribValueFilter(h,k,m)}if(j.validVals){for(l=j.validVals.length-1;l>=0;l--){if(k==j.validVals[l]){break}}if(l==-1){return null}}if(k===""&&typeof(j.defaultVal)!="undefined"){k=j.defaultVal;if(k==="{$uid}"){return this.dom.uniqueId()}return k}else{if(h=="class"&&this.processObj.get){k=k.replace(/\s?mceItem\w+\s?/g,"")}}if(k===""){return null}return k}})})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,u){var v=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}u()}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(x){var t=q.create("script",{type:"text/javascript"});t.text=x;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()}});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});s.onload=p;s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}};(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","lastSibling",e))}};(function(){var a={};function b(f,e){var d;function c(g){return g.replace(/[A-Z]+/g,function(h){return c(f[h])})}for(d in f){if(f.hasOwnProperty(d)){f[d]=c(f[d])}}c(e).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]/g,function(l,g,j){var h,k={};j=j.split(/\|/);for(h=j.length-1;h>=0;h--){k[j[h]]=1}a[g]=k})}b({Z:"#|H|K|N|O|P",Y:"#|X|form|R|Q",X:"p|T|div|U|W|isindex|fieldset|table",W:"pre|hr|blockquote|address|center|noframes",U:"ul|ol|dl|menu|dir",ZC:"#|p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"#|X|S|Q",S:"R|P",ZA:"#|a|G|J|M|O|P",R:"#|a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe"},"script[]style[]object[#|param|X|form|a|H|K|N|O|Q]param[]p[S]a[Z]br[]span[S]bdo[S]applet[#|param|X|form|a|H|K|N|O|Q]h1[S]img[]map[X|form|Q|area]h2[S]iframe[#|X|form|a|H|K|N|O|Q]h3[S]tt[S]i[S]b[S]u[S]s[S]strike[S]big[S]small[S]font[S]basefont[]em[S]strong[S]dfn[S]code[S]q[S]samp[S]kbd[S]var[S]cite[S]abbr[S]acronym[S]sub[S]sup[S]input[]select[optgroup|option]optgroup[option]option[]textarea[]label[S]button[#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[S]ins[#|X|form|a|H|K|N|O|Q]h5[S]del[#|X|form|a|H|K|N|O|Q]h6[S]div[#|X|form|a|H|K|N|O|Q]ul[li]li[#|X|form|a|H|K|N|O|Q]ol[li]dl[dt|dd]dt[S]dd[#|X|form|a|H|K|N|O|Q]menu[li]dir[li]pre[ZA]hr[]blockquote[#|X|form|a|H|K|N|O|Q]address[S|p]center[#|X|form|a|H|K|N|O|Q]noframes[#|X|form|a|H|K|N|O|Q]isindex[]fieldset[#|legend|X|form|a|H|K|N|O|Q]legend[S]table[caption|col|colgroup|thead|tfoot|tbody|tr]caption[S]col[]colgroup[col]thead[tr]tr[th|td]th[#|X|form|a|H|K|N|O|Q]form[#|X|a|H|K|N|O|Q]noscript[#|X|form|a|H|K|N|O|Q]td[#|X|form|a|H|K|N|O|Q]tfoot[tr]tbody[tr]area[]base[]body[#|X|form|a|H|K|N|O|Q]");tinymce.dom.Schema=function(){var c=this,d=a;c.isValid=function(f,e){var g=d[f];return !!(g&&(!e||g[e]))}}})();(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,r){var h=d.startContainer,k=d.startOffset,s=d.endContainer,l=d.endOffset,i,f,n,g,q,p,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(t){r([t])});return}function o(v,u,t){var x=[];for(;v&&v!=t;v=v[u]){x.push(v)}return x}function m(u,t){do{if(u.parentNode==t){return u}u=u.parentNode}while(u)}function j(v,u,x){var t=x?"nextSibling":"previousSibling";for(g=v,q=g.parentNode;g&&g!=u;g=q){q=g.parentNode;p=o(g==v?g:g[t],t);if(p.length){if(!x){p.reverse()}r(p)}}}if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[k]}if(s.nodeType==1&&s.hasChildNodes()){s=s.childNodes[Math.min(k==l?l:l-1,s.childNodes.length-1)]}i=c.findCommonAncestor(h,s);if(h==s){return r([h])}for(g=h;g;g=g.parentNode){if(g==s){return j(h,i,true)}if(g==i){break}}for(g=s;g;g=g.parentNode){if(g==h){return j(s,i)}if(g==i){break}}f=m(h,i)||h;n=m(s,i)||s;j(h,f,true);p=o(f==h?f:f.nextSibling,"nextSibling",n==s?n.nextSibling:n);if(p.length){r(p)}j(s,n)}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(e,d){this.id=e;this.settings=d=d||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=d.scope||this;this.disabled=0;this.active=0},setDisabled:function(d){var f;if(d!=this.disabled){f=b.get(this.id);if(f&&this.settings.unavailable_prefix){if(d){this.prevTitle=f.title;f.title=this.settings.unavailable_prefix+": "+f.title}else{f.title=this.prevTitle}}this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(b,a){this.parent(b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator"},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return a.cancel(s)}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}z.onShowMenu.dispatch(z);if(A.keyboard_focus){a.add(o,"keydown",z._keyHandler,z);c.select("a","menu_"+z.id)[0].focus();z._focusIdx=0}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);a.remove(h,"mouseover",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000"});k=c.add(g,"div",{id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_keyHandler:function(j){var i=this,h=j.keyCode;function g(m){var k=i._focusIdx+m,l=c.select("a","menu_"+i.id)[k];if(l){i._focusIdx=k;l.focus()}}switch(h){case 38:g(-1);return;case 40:g(1);return;case 13:return;case 27:return this.hideMenu()}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,"td");i=p=c.add(i,"a",{href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(d,c){this.parent(d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" title="'+a.encode(e.title)+'">';if(e.image){d+='<img class="mceIcon" src="'+e.image+'" />'+c+"</a>"}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")+"</a>"}return d},postRender:function(){var c=this,d=c.settings;b.dom.Event.add(c.id,"click",function(f){if(!c.isDisabled()){return d.onclick.call(d.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(h,g){var f=this;f.parent(h,g);f.items=[];f.onChange=new a(f);f.onPostRender=new a(f);f.onAdd=new a(f);f.onRenderMenu=new d.util.Dispatcher(this);f.classPrefix="mceListBox"},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var g=this,h,i;if(f!=g.selectedIndex){h=c.get(g.id+"_text");i=g.items[f];if(i){g.selectedValue=i.value;g.selectedIndex=f;c.setHTML(h,c.encode(i.title));c.removeClass(h,"mceTitle")}else{c.setHTML(h,c.encode(g.settings.title));c.addClass(h,"mceTitle");g.selectedValue=g.selectedIndex=null}h=0}},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<table id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("a",{id:f.id+"_text",href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},"<span></span>")+"</td>";i+="</tr></tbody></table>";return i},showMenu:function(){var g=this,j,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}j=c.getPos(this.settings.menu_container);i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;if(g.oldID){f.items[g.oldID].setSelected(0)}e(g.items,function(k){if(k.value===g.selectedValue){f.items[k.id].setSelected(1);g.oldID=k.id}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(g.hideMenu,g);f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id+"_text","focus",function(h){if(!f._focused){f.keyDownHandler=b.add(f.id+"_text","keydown",function(l){var i=-1,j,k=l.keyCode;e(f.items,function(m,n){if(f.selectedValue==m.value){i=n}});if(k==38){j=f.items[i-1]}else{if(k==40){j=f.items[i+1]}else{if(k==13){j=f.selectedValue;f.selectedValue=null;f.settings.onselect(j);return b.cancel(l)}}}if(j){f.hideMenu();f.select(j.value)}})}f._focused=1});b.add(f.id+"_text","blur",function(){b.remove(f.id+"_text","keydown",f.keyDownHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox"},g);return g},postRender:function(){var g=this,h;g.rendered=true;function f(j){var i=g.items[j.target.selectedIndex-1];if(i&&(i=i.value)){g.onChange.dispatch(g,i);if(g.settings.onselect){g.settings.onselect(i)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(j){var i;b.remove(g.id,"change",h);i=b.add(g.id,"blur",function(){b.add(g.id,"change",f);b.remove(g.id,"blur",i)});if(j.keyCode==13||j.keyCode==32){f(j);return b.cancel(j)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(f,e){this.parent(f,e);this.onRenderMenu=new c.util.Dispatcher(this);e.menu_container=e.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(f.hideMenu,f);f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(f,e){this.parent(f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,"class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}i+="<td>"+b.createHTML("a",{id:f.id+"_action",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]});i+="<td>"+b.createHTML("a",{id:f.id+"_open",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";return b.createHTML("table",{id:f.id,"class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",onmousedown:"return false;",title:g.title},i)},postRender:function(){var e=this,f=e.settings;if(f.onclick){a.add(e.id+"_action","click",function(){if(!e.isDisabled()){f.onclick(e.value)}})}a.add(e.id+"_open","click",e.showMenu,e);a.add(e.id+"_open","focus",function(){e._focused=1});a.add(e.id+"_open","blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(h,g){var f=this;f.parent(h,g);f.settings=g=d.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"},f.settings);f.onShowMenu=new d.util.Dispatcher(f);f.onHideMenu=new d.util.Dispatcher(f);f.value=g.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.onHideMenu.dispatch(f);f.isMenuVisible=0},renderMenu:function(){var k=this,f,j=0,l=k.settings,p,h,o,g;g=c.add(l.menu_container,"div",{id:k.id+"_menu","class":l.menu_class+" "+l["class"],style:"position:absolute;left:0;top:-1000px;"});f=c.add(g,"div",{"class":l["class"]+" mceSplitButtonMenu"});c.add(f,"span",{"class":"mceMenuLine"});p=c.add(f,"table",{"class":"mceColorSplitMenu"});h=c.add(p,"tbody");j=0;e(b(l.colors,"array")?l.colors:l.colors.split(","),function(i){i=i.replace(/^#/,"");if(!j--){o=c.add(h,"tr");j=l.grid_width-1}p=c.add(o,"td");p=c.add(p,"a",{href:"javascript:;",style:{backgroundColor:"#"+i},_mce_color:"#"+i})});if(l.more_colors_func){p=c.add(h,"tr");p=c.add(p,"td",{colspan:l.grid_width,"class":"mceMoreColors"});p=c.add(p,"a",{id:k.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},l.more_colors_title);a.add(p,"click",function(i){l.more_colors_func.call(l.more_colors_scope||this);return a.cancel(i)})}c.addClass(f,"mceColorSplitMenu");a.add(k.id+"_menu","click",function(i){var m;i=i.target;if(i.nodeName=="A"&&(m=i.getAttribute("_mce_color"))){k.setColor(m)}return a.cancel(i)});return g},setColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g;f.hideMenu();f.settings.onselect(g)},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);tinymce.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var l=this,e="",g,j,b=tinymce.DOM,m=l.settings,d,a,f,k;k=l.controls;for(d=0;d<k.length;d++){j=k[d];a=k[d-1];f=k[d+1];if(d===0){g="mceToolbarStart";if(j.Button){g+=" mceToolbarStartButton"}else{if(j.SplitButton){g+=" mceToolbarStartSplitButton"}else{if(j.ListBox){g+=" mceToolbarStartListBox"}}}e+=b.createHTML("td",{"class":g},b.createHTML("span",null,"<!-- IE -->"))}if(a&&j.ListBox){if(a.Button||a.SplitButton){e+=b.createHTML("td",{"class":"mceToolbarEnd"},b.createHTML("span",null,"<!-- IE -->"))}}if(b.stdMode){e+='<td style="position: relative">'+j.renderHTML()+"</td>"}else{e+="<td>"+j.renderHTML()+"</td>"}if(f&&j.ListBox){if(f.Button||f.SplitButton){e+=b.createHTML("td",{"class":"mceToolbarStart"},b.createHTML("span",null,"<!-- IE -->"))}}}g="mceToolbarEnd";if(j.Button){g+=" mceToolbarEndButton"}else{if(j.SplitButton){g+=" mceToolbarEndSplitButton"}else{if(j.ListBox){g+=" mceToolbarEndListBox"}}}e+=b.createHTML("td",{"class":g},b.createHTML("span",null,"<!-- IE -->"));return b.createHTML("table",{id:l.id,"class":"mceToolbar"+(m["class"]?" "+m["class"]:""),cellpadding:"0",cellspacing:"0",align:l.settings.align||""},"<tbody><tr>"+e+"</tr></tbody>")}});(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{items:[],urls:{},lookup:{},onAdd:new a(this),get:function(d){return this.lookup[d]},requireLangPack:function(e){var d=b.settings;if(d&&d.language){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(e,d){this.items.push(d);this.lookup[e]=d;this.onAdd.dispatch(this,e,d);return d},load:function(h,e,d,g){var f=this;if(f.urls[h]){return}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}f.urls[h]=e.substring(0,e.lastIndexOf("/"));b.ScriptLoader.add(e,d,g)}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(m){var n=m.DOM,j=m.dom.Event,f=m.extend,k=m.util.Dispatcher,i=m.each,a=m.isGecko,b=m.isIE,e=m.isWebKit,d=m.is,h=m.ThemeManager,c=m.PluginManager,o=m.inArray,l=m.grep,g=m.explode;m.create("tinymce.Editor",{Editor:function(r,q){var p=this;p.id=p.editorId=r;p.execCommands={};p.queryStateCommands={};p.queryValueCommands={};p.isNotDirty=false;p.plugins={};i(["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(s){p[s]=new k(p)});p.settings=q=f({id:r,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:m.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:m.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,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,-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|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|tabindex|accesskey],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",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true},q);p.documentBaseURI=new m.util.URI(q.document_base_url||m.documentBaseURL,{base_uri:tinyMCE.baseURI});p.baseURI=m.baseURI;p.execCallback("setup",p)},render:function(r){var u=this,v=u.settings,x=u.id,p=m.ScriptLoader;if(!j.domLoaded){j.add(document,"init",function(){u.render()});return}tinyMCE.settings=v;if(!u.getElement()){return}if(m.isIDevice){return}if(!/TEXTAREA|INPUT/i.test(u.getElement().nodeName)&&v.hidden_input&&n.getParent(x,"form")){n.insertAfter(n.create("input",{type:"hidden",name:x}),x)}if(m.WindowManager){u.windowManager=new m.WindowManager(u)}if(v.encoding=="xml"){u.onGetContent.add(function(s,t){if(t.save){t.content=n.encode(t.content)}})}if(v.add_form_submit_trigger){u.onSubmit.addToTop(function(){if(u.initialized){u.save();u.isNotDirty=1}})}if(v.add_unload_trigger){u._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(u.initialized&&!u.destroyed&&!u.isHidden()){u.save({format:"raw",no_events:true})}})}m.addUnload(u.destroy,u);if(v.submit_patch){u.onBeforeRenderUI.add(function(){var s=u.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){u.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){m.triggerSave();u.isNotDirty=1;return u.formElement._mceOldSubmit(u.formElement)}}s=null})}function q(){if(v.language){p.add(m.baseURL+"/langs/"+v.language+".js")}if(v.theme&&v.theme.charAt(0)!="-"&&!h.urls[v.theme]){h.load(v.theme,"themes/"+v.theme+"/editor_template"+m.suffix+".js")}i(g(v.plugins),function(s){if(s&&s.charAt(0)!="-"&&!c.urls[s]){if(s=="safari"){return}c.load(s,"plugins/"+s+"/editor_plugin"+m.suffix+".js")}});p.loadQueue(function(){if(!u.removed){u.init()}})}q()},init:function(){var r,E=this,F=E.settings,B,y,A=E.getElement(),q,p,C,x,z,D;m.add(E);if(F.theme){F.theme=F.theme.replace(/-/,"");q=h.get(F.theme);E.theme=new q();if(E.theme.init&&F.init_theme){E.theme.init(E,h.urls[F.theme]||m.documentBaseURL.replace(/\/$/,""))}}i(g(F.plugins.replace(/\-/g,"")),function(G){var H=c.get(G),t=c.urls[G]||m.documentBaseURL.replace(/\/$/,""),s;if(H){s=new H(E,t);E.plugins[G]=s;if(s.init){s.init(E,t)}}});if(F.popup_css!==false){if(F.popup_css){F.popup_css=E.documentBaseURI.toAbsolute(F.popup_css)}else{F.popup_css=E.baseURI.toAbsolute("themes/"+F.theme+"/skins/"+F.skin+"/dialog.css")}}if(F.popup_css_add){F.popup_css+=","+E.documentBaseURI.toAbsolute(F.popup_css_add)}E.controlManager=new m.ControlManager(E);if(F.custom_undo_redo){E.onBeforeExecCommand.add(function(t,G,u,H,s){if(G!="Undo"&&G!="Redo"&&G!="mceRepaint"&&(!s||!s.skip_undo)){if(!E.undoManager.hasUndo()){E.undoManager.add()}}});E.onExecCommand.add(function(t,G,u,H,s){if(G!="Undo"&&G!="Redo"&&G!="mceRepaint"&&(!s||!s.skip_undo)){E.undoManager.add()}})}E.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){E.nodeChanged()}});if(a){function v(s,t){if(!t||!t.initial){E.execCommand("mceRepaint")}}E.onUndo.add(v);E.onRedo.add(v);E.onSetContent.add(v)}E.onBeforeRenderUI.dispatch(E,E.controlManager);if(F.render_ui){B=F.width||A.style.width||A.offsetWidth;y=F.height||A.style.height||A.offsetHeight;E.orgDisplay=A.style.display;D=/^[0-9\.]+(|px)$/i;if(D.test(""+B)){B=Math.max(parseInt(B)+(q.deltaWidth||0),100)}if(D.test(""+y)){y=Math.max(parseInt(y)+(q.deltaHeight||0),100)}q=E.theme.renderUI({targetNode:A,width:B,height:y,deltaWidth:F.delta_width,deltaHeight:F.delta_height});E.editorContainer=q.editorContainer}if(document.domain&&location.hostname!=document.domain){m.relaxedDomain=document.domain}n.setStyles(q.sizeContainer||q.editorContainer,{width:B,height:y});y=(q.iframeHeight||y)+(typeof(y)=="number"?(q.deltaHeight||0):"");if(y<100){y=100}E.iframeHTML=F.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(F.document_base_url!=m.documentBaseURL){E.iframeHTML+='<base href="'+E.documentBaseURI.getURI()+'" />'}E.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';if(m.relaxedDomain){E.iframeHTML+='<script type="text/javascript">document.domain = "'+m.relaxedDomain+'";<\/script>'}x=F.body_id||"tinymce";if(x.indexOf("=")!=-1){x=E.getParam("body_id","","hash");x=x[E.id]||x}z=F.body_class||"";if(z.indexOf("=")!=-1){z=E.getParam("body_class","","hash");z=z[E.id]||""}E.iframeHTML+='</head><body id="'+x+'" class="mceContentBody '+z+'"></body></html>';if(m.relaxedDomain){if(b||(m.isOpera&&parseFloat(opera.version())>=9.5)){C='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+E.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}else{if(m.isOpera){C='javascript:(function(){document.open();document.domain="'+document.domain+'";document.close();ed.setupIframe();})()'}}}r=n.add(q.iframeContainer,"iframe",{id:E.id+"_ifr",src:C||'javascript:""',frameBorder:"0",style:{width:"100%",height:y}});E.contentAreaContainer=q.iframeContainer;n.get(q.editorContainer).style.display=E.orgDisplay;n.get(E.id).style.display="none";if(!b||!m.relaxedDomain){E.setupIframe()}A=r=q=null},setupIframe:function(){var z=this,A=z.settings,r=n.get(z.id),u=z.getDoc(),q,x;if(!b||!m.relaxedDomain){u.open();u.write(z.iframeHTML);u.close()}if(!b){try{if(!A.readonly){u.designMode="On"}}catch(v){}}if(b){x=z.getBody();n.hide(x);if(!A.readonly){x.contentEditable=true}n.show(x)}z.dom=new m.dom.DOMUtils(z.getDoc(),{keep_values:true,url_converter:z.convertURL,url_converter_scope:z,hex_colors:A.force_hex_style_colors,class_filter:A.class_filter,update_styles:1,fix_ie_paragraphs:1,valid_styles:A.valid_styles});z.schema=new m.dom.Schema();z.serializer=new m.dom.Serializer(f(A,{valid_elements:A.verify_html===false?"*[*]":A.valid_elements,dom:z.dom,schema:z.schema}));z.selection=new m.dom.Selection(z.dom,z.getWin(),z.serializer);z.formatter=new m.Formatter(this);z.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"}},{selector:"img,table",styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"}},{selector:"img",styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"}},{selector:"img,table",styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"}}],bold:[{inline:"strong"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b"}],italic:[{inline:"em"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:true},{inline:"u"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"u"}],forecolor:{inline:"span",styles:{color:"%value"}},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"}},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){z.formatter.register(s,{block:s,remove:"all"})});z.formatter.register(z.settings.formats);z.undoManager=new m.UndoManager(z);z.undoManager.onAdd.add(function(t,s){if(!s.initial){return z.onChange.dispatch(z,s,t)}});z.undoManager.onUndo.add(function(t,s){return z.onUndo.dispatch(z,s,t)});z.undoManager.onRedo.add(function(t,s){return z.onRedo.dispatch(z,s,t)});z.forceBlocks=new m.ForceBlocks(z,{forced_root_block:A.forced_root_block});z.editorCommands=new m.EditorCommands(z);z.serializer.onPreProcess.add(function(s,t){return z.onPreProcess.dispatch(z,t,s)});z.serializer.onPostProcess.add(function(s,t){return z.onPostProcess.dispatch(z,t,s)});z.onPreInit.dispatch(z);if(!A.gecko_spellcheck){z.getBody().spellcheck=0}if(!A.readonly){z._addEvents()}z.controlManager.onPostRender.dispatch(z,z.controlManager);z.onPostRender.dispatch(z);if(A.directionality){z.getBody().dir=A.directionality}if(A.nowrap){z.getBody().style.whiteSpace="nowrap"}if(A.custom_elements){function y(s,t){i(g(A.custom_elements),function(B){var C;if(B.indexOf("~")===0){B=B.substring(1);C="span"}else{C="div"}t.content=t.content.replace(new RegExp("<("+B+")([^>]*)>","g"),"<"+C+' _mce_name="$1"$2>');t.content=t.content.replace(new RegExp("</("+B+")>","g"),"</"+C+">")})}z.onBeforeSetContent.add(y);z.onPostProcess.add(function(s,t){if(t.set){y(s,t)}})}if(A.handle_node_change_callback){z.onNodeChange.add(function(t,s,B){z.execCallback("handle_node_change_callback",z.id,B,-1,-1,true,z.selection.isCollapsed())})}if(A.save_callback){z.onSaveContent.add(function(s,B){var t=z.execCallback("save_callback",z.id,B.content,z.getBody());if(t){B.content=t}})}if(A.onchange_callback){z.onChange.add(function(t,s){z.execCallback("onchange_callback",z,s)})}if(A.convert_newlines_to_brs){z.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(A.fix_nesting&&b){z.onBeforeSetContent.add(function(s,t){t.content=z._fixNesting(t.content)})}if(A.preformatted){z.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(A.verify_css_classes){z.serializer.attribValueFilter=function(D,B){var C,t;if(D=="class"){if(!z.classesRE){t=z.dom.getClasses();if(t.length>0){C="";i(t,function(s){C+=(C?"|":"")+s["class"]});z.classesRE=new RegExp("("+C+")","gi")}}return !z.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(B)||z.classesRE.test(B)?B:""}return B}}if(A.cleanup_callback){z.onBeforeSetContent.add(function(s,t){t.content=z.execCallback("cleanup_callback","insert_to_editor",t.content,t)});z.onPreProcess.add(function(s,t){if(t.set){z.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){z.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});z.onPostProcess.add(function(s,t){if(t.set){t.content=z.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=z.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(A.save_callback){z.onGetContent.add(function(s,t){if(t.save){t.content=z.execCallback("save_callback",z.id,t.content,z.getBody())}})}if(A.handle_event_callback){z.onEvent.add(function(s,t,B){if(z.execCallback("handle_event_callback",t,s,B)===false){j.cancel(t)}})}z.onSetContent.add(function(){z.addVisual(z.getBody())});if(A.padd_empty_editor){z.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function p(s,t){i(s.dom.select("a"),function(C){var B=C.parentNode;if(s.dom.isBlock(B)&&B.lastChild===C){s.dom.add(B,"br",{_mce_bogus:1})}})}z.onExecCommand.add(function(s,t){if(t==="CreateLink"){p(s)}});z.onSetContent.add(z.selection.onSetContent.add(p));if(!A.readonly){try{u.designMode="Off";u.designMode="On"}catch(v){}}}setTimeout(function(){if(z.removed){return}z.load({initial:true,format:(A.cleanup_on_startup?"html":"raw")});z.startContent=z.getContent({format:"raw"});z.initialized=true;z.onInit.dispatch(z);z.execCallback("setupcontent_callback",z.id,z.getBody(),z.getDoc());z.execCallback("init_instance_callback",z);z.focus(true);z.nodeChanged({initial:1});if(A.content_css){m.each(g(A.content_css),function(s){z.dom.loadCSS(z.documentBaseURI.toAbsolute(s))})}if(A.auto_focus){setTimeout(function(){var s=m.get(A.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getWin().focus()},100)}},1);r=null},focus:function(s){var x,q=this,v=q.settings.content_editable,r,p,u=q.getDoc();if(!s){r=q.selection.getRng();if(r.item){p=r.item(0)}if(!v){q.getWin().focus()}if(p&&p.ownerDocument==u){r=u.body.createControlRange();r.addElement(p);r.select()}}if(m.activeEditor!=q){if((x=m.activeEditor)!=null){x.onDeactivate.dispatch(x,q)}q.onActivate.dispatch(q,x)}m._setActive(q)},execCallback:function(u){var p=this,r=p.settings[u],q;if(!r){return}if(p.callbackLookup&&(q=p.callbackLookup[u])){r=q.func;q=q.scope}if(d(r,"string")){q=r.replace(/\.\w+$/,"");q=q?m.resolve(q):0;r=m.resolve(r);p.callbackLookup=p.callbackLookup||{};p.callbackLookup[u]={func:r,scope:q}}return r.apply(q||p,Array.prototype.slice.call(arguments,1))},translate:function(p){var r=this.settings.language||"en",q=m.i18n;if(!p){return""}return q[r+"."+p]||p.replace(/{\#([^}]+)\}/g,function(t,s){return q[r+"."+s]||"{#"+s+"}"})},getLang:function(q,p){return m.i18n[(this.settings.language||"en")+"."+q]||(d(p)?p:"{#"+q+"}")},getParam:function(u,r,p){var s=m.trim,q=d(this.settings[u])?this.settings[u]:r,t;if(p==="hash"){t={};if(d(q,"string")){i(q.indexOf("=")>0?q.split(/[;,](?![^=;,]*(?:[;,]|$))/):q.split(","),function(x){x=x.split("=");if(x.length>1){t[s(x[0])]=s(x[1])}else{t[s(x[0])]=s(x)}})}else{t=q}return t}return q},nodeChanged:function(r){var p=this,q=p.selection,u=(b?q.getNode():q.getStart())||p.getBody();if(p.initialized){r=r||{};u=b&&u.ownerDocument!=p.getDoc()?p.getBody():u;r.parents=[];p.dom.getParent(u,function(s){if(s.nodeName=="BODY"){return true}r.parents.push(s)});p.onNodeChange.dispatch(p,r?r.controlManager||p.controlManager:p.controlManager,u,q.isCollapsed(),r)}},addButton:function(r,q){var p=this;p.buttons=p.buttons||{};p.buttons[r]=q},addCommand:function(r,q,p){this.execCommands[r]={func:q,scope:p||this}},addQueryStateHandler:function(r,q,p){this.queryStateCommands[r]={func:q,scope:p||this}},addQueryValueHandler:function(r,q,p){this.queryValueCommands[r]={func:q,scope:p||this}},addShortcut:function(r,u,p,s){var q=this,v;if(!q.settings.custom_shortcuts){return false}q.shortcuts=q.shortcuts||{};if(d(p,"string")){v=p;p=function(){q.execCommand(v,false,null)}}if(d(p,"object")){v=p;p=function(){q.execCommand(v[0],v[1],v[2])}}i(g(r),function(t){var x={func:p,scope:s||this,desc:u,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(y){switch(y){case"alt":case"ctrl":case"shift":x[y]=true;break;default:x.charCode=y.charCodeAt(0);x.keyCode=y.toUpperCase().charCodeAt(0)}});q.shortcuts[(x.ctrl?"ctrl":"")+","+(x.alt?"alt":"")+","+(x.shift?"shift":"")+","+x.keyCode]=x});return true},execCommand:function(x,v,z,p){var r=this,u=0,y,q;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(x)&&(!p||!p.skip_focus)){r.focus()}y={};r.onBeforeExecCommand.dispatch(r,x,v,z,y);if(y.terminate){return false}if(r.execCallback("execcommand_callback",r.id,r.selection.getNode(),x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(y=r.execCommands[x]){q=y.func.call(y.scope,v,z);if(q!==true){r.onExecCommand.dispatch(r,x,v,z,p);return q}}i(r.plugins,function(s){if(s.execCommand&&s.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);u=1;return false}});if(u){return true}if(r.theme&&r.theme.execCommand&&r.theme.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(m.GlobalCommands.execCommand(r,x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(r.editorCommands.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}r.getDoc().execCommand(x,v,z);r.onExecCommand.dispatch(r,x,v,z,p)},queryCommandState:function(u){var q=this,v,r;if(q._isHidden()){return}if(v=q.queryStateCommands[u]){r=v.func.call(v.scope);if(r!==true){return r}}v=q.editorCommands.queryCommandState(u);if(v!==-1){return v}try{return this.getDoc().queryCommandState(u)}catch(p){}},queryCommandValue:function(v){var q=this,u,r;if(q._isHidden()){return}if(u=q.queryValueCommands[v]){r=u.func.call(u.scope);if(r!==true){return r}}u=q.editorCommands.queryCommandValue(v);if(d(u)){return u}try{return this.getDoc().queryCommandValue(v)}catch(p){}},show:function(){var p=this;n.show(p.getContainer());n.hide(p.id);p.load()},hide:function(){var p=this,q=p.getDoc();if(b&&q){q.execCommand("SelectAll")}p.save();n.hide(p.getContainer());n.setStyle(p.id,"display",p.orgDisplay)},isHidden:function(){return !n.isHidden(this.id)},setProgressState:function(p,q,r){this.onSetProgressState.dispatch(this,p,q,r);return p},load:function(s){var p=this,r=p.getElement(),q;if(r){s=s||{};s.load=true;q=p.setContent(d(r.value)?r.value:r.innerHTML,s);s.element=r;if(!s.no_events){p.onLoadContent.dispatch(p,s)}s.element=r=null;return q}},save:function(u){var p=this,s=p.getElement(),q,r;if(!s||!p.initialized){return}u=u||{};u.save=true;if(!u.no_events){p.undoManager.typing=0;p.undoManager.add()}u.element=s;q=u.content=p.getContent(u);if(!u.no_events){p.onSaveContent.dispatch(p,u)}q=u.content;if(!/TEXTAREA|INPUT/i.test(s.nodeName)){s.innerHTML=q;if(r=n.getParent(p.id,"form")){i(r.elements,function(t){if(t.name==p.id){t.value=q;return false}})}}else{s.value=q}u.element=s=null;return q},setContent:function(q,r){var p=this;r=r||{};r.format=r.format||"html";r.set=true;r.content=q;if(!r.no_events){p.onBeforeSetContent.dispatch(p,r)}if(!m.isIE&&(q.length===0||/^\s+$/.test(q))){r.content=p.dom.setHTML(p.getBody(),'<br _mce_bogus="1" />');r.format="raw"}r.content=p.dom.setHTML(p.getBody(),m.trim(r.content));if(r.format!="raw"&&p.settings.cleanup){r.getInner=true;r.content=p.dom.setHTML(p.getBody(),p.serializer.serialize(p.getBody(),r))}if(!r.no_events){p.onSetContent.dispatch(p,r)}return r.content},getContent:function(r){var p=this,q;r=r||{};r.format=r.format||"html";r.get=true;if(!r.no_events){p.onBeforeGetContent.dispatch(p,r)}if(r.format!="raw"&&p.settings.cleanup){r.getInner=true;q=p.serializer.serialize(p.getBody(),r)}else{q=p.getBody().innerHTML}q=q.replace(/^\s*|\s*$/g,"");r.content=q;if(!r.no_events){p.onGetContent.dispatch(p,r)}return r.content},isDirty:function(){var p=this;return m.trim(p.startContent)!=m.trim(p.getContent({format:"raw",no_events:1}))&&!p.isNotDirty},getContainer:function(){var p=this;if(!p.container){p.container=n.get(p.editorContainer||p.id+"_parent")}return p.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return n.get(this.settings.content_element||this.id)},getWin:function(){var p=this,q;if(!p.contentWindow){q=n.get(p.id+"_ifr");if(q){p.contentWindow=q.contentWindow}}return p.contentWindow},getDoc:function(){var q=this,p;if(!q.contentDocument){p=q.getWin();if(p){q.contentDocument=p.document}}return q.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(p,x,v){var q=this,r=q.settings;if(r.urlconverter_callback){return q.execCallback("urlconverter_callback",p,v,true,x)}if(!r.convert_urls||(v&&v.nodeName=="LINK")||p.indexOf("file:")===0){return p}if(r.relative_urls){return q.documentBaseURI.toRelative(p)}p=q.documentBaseURI.toAbsolute(p,r.remove_script_host);return p},addVisual:function(r){var p=this,q=p.settings;r=r||p.getBody();if(!d(p.hasVisual)){p.hasVisual=q.visual}i(p.dom.select("table,a",r),function(t){var s;switch(t.nodeName){case"TABLE":s=p.dom.getAttrib(t,"border");if(!s||s=="0"){if(p.hasVisual){p.dom.addClass(t,q.visual_table_class)}else{p.dom.removeClass(t,q.visual_table_class)}}return;case"A":s=p.dom.getAttrib(t,"name");if(s){if(p.hasVisual){p.dom.addClass(t,"mceItemAnchor")}else{p.dom.removeClass(t,"mceItemAnchor")}}return}});p.onVisualAid.dispatch(p,r,p.hasVisual)},remove:function(){var p=this,q=p.getContainer();p.removed=1;p.hide();p.execCallback("remove_instance_callback",p);p.onRemove.dispatch(p);p.onExecCommand.listeners=[];m.remove(p);n.remove(q)},destroy:function(q){var p=this;if(p.destroyed){return}if(!q){m.removeUnload(p.destroy);tinyMCE.onBeforeUnload.remove(p._beforeUnload);if(p.theme&&p.theme.destroy){p.theme.destroy()}p.controlManager.destroy();p.selection.destroy();p.dom.destroy();if(!p.settings.content_editable){j.clear(p.getWin());j.clear(p.getDoc())}j.clear(p.getBody());j.clear(p.formElement)}if(p.formElement){p.formElement.submit=p.formElement._mceOldSubmit;p.formElement._mceOldSubmit=null}p.contentAreaContainer=p.formElement=p.container=p.settings.content_element=p.bodyElement=p.contentDocument=p.contentWindow=null;if(p.selection){p.selection=p.selection.win=p.selection.dom=p.selection.dom.doc=null}p.destroyed=1},_addEvents:function(){var v=this,u,y=v.settings,x={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function r(t,A){var s=t.type;if(v.removed){return}if(v.onEvent.dispatch(v,t,A)!==false){v[x[t.fakeType||t.type]].dispatch(v,t,A)}}i(x,function(t,s){switch(s){case"contextmenu":if(m.isOpera){v.dom.bind(v.getBody(),"mousedown",function(A){if(A.ctrlKey){A.fakeType="contextmenu";r(A)}})}else{v.dom.bind(v.getBody(),s,r)}break;case"paste":v.dom.bind(v.getBody(),s,function(A){r(A)});break;case"submit":case"reset":v.dom.bind(v.getElement().form||n.getParent(v.id,"form"),s,r);break;default:v.dom.bind(y.content_editable?v.getBody():v.getDoc(),s,r)}});v.dom.bind(y.content_editable?v.getBody():(a?v.getDoc():v.getWin()),"focus",function(s){v.focus(true)});if(m.isGecko){v.dom.bind(v.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("_mce_src"))){t.src=v.documentBaseURI.toAbsolute(s)}})}if(a){function p(){var B=this,D=B.getDoc(),C=B.settings;if(a&&!C.readonly){if(B._isHidden()){try{if(!C.content_editable){D.designMode="On"}}catch(A){}}try{D.execCommand("styleWithCSS",0,false)}catch(A){if(!B._isHidden()){try{D.execCommand("useCSS",0,true)}catch(A){}}}if(!C.table_inline_editing){try{D.execCommand("enableInlineTableEditing",false,false)}catch(A){}}if(!C.object_resizing){try{D.execCommand("enableObjectResizing",false,false)}catch(A){}}}}v.onBeforeExecCommand.add(p);v.onMouseDown.add(p)}if(m.isWebKit){v.onClick.add(function(s,t){t=t.target;if(t.nodeName=="IMG"||(t.nodeName=="A"&&v.dom.hasClass(t,"mceItemAnchor"))){v.selection.getSel().setBaseAndExtent(t,0,t,1)}})}v.onMouseUp.add(v.nodeChanged);v.onClick.add(v.nodeChanged);v.onKeyUp.add(function(s,t){var A=t.keyCode;if((A>=33&&A<=36)||(A>=37&&A<=40)||A==13||A==45||A==46||A==8||(m.isMac&&(A==91||A==93))||t.ctrlKey){v.nodeChanged()}});v.onReset.add(function(){v.setContent(v.startContent,{format:"raw"})});if(y.custom_shortcuts){if(y.custom_undo_redo_keyboard_shortcuts){v.addShortcut("ctrl+z",v.getLang("undo_desc"),"Undo");v.addShortcut("ctrl+y",v.getLang("redo_desc"),"Redo")}v.addShortcut("ctrl+b",v.getLang("bold_desc"),"Bold");v.addShortcut("ctrl+i",v.getLang("italic_desc"),"Italic");v.addShortcut("ctrl+u",v.getLang("underline_desc"),"Underline");for(u=1;u<=6;u++){v.addShortcut("ctrl+"+u,"",["FormatBlock",false,"h"+u])}v.addShortcut("ctrl+7","",["FormatBlock",false,"<p>"]);v.addShortcut("ctrl+8","",["FormatBlock",false,"<div>"]);v.addShortcut("ctrl+9","",["FormatBlock",false,"<address>"]);function z(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(v.shortcuts,function(A){if(m.isMac&&A.ctrl!=t.metaKey){return}else{if(!m.isMac&&A.ctrl!=t.ctrlKey){return}}if(A.alt!=t.altKey){return}if(A.shift!=t.shiftKey){return}if(t.keyCode==A.keyCode||(t.charCode&&t.charCode==A.charCode)){s=A;return false}});return s}v.onKeyUp.add(function(s,t){var A=z(t);if(A){return j.cancel(t)}});v.onKeyPress.add(function(s,t){var A=z(t);if(A){return j.cancel(t)}});v.onKeyDown.add(function(s,t){var A=z(t);if(A){A.func.call(A.scope);return j.cancel(t)}})}if(m.isIE){v.dom.bind(v.getDoc(),"controlselect",function(A){var t=v.resizeInfo,s;A=A.target;if(A.nodeName!=="IMG"){return}if(t){v.dom.unbind(t.node,t.ev,t.cb)}if(!v.dom.hasClass(A,"mceItemNoResize")){ev="resizeend";s=v.dom.bind(A,ev,function(C){var B;C=C.target;if(B=v.dom.getStyle(C,"width")){v.dom.setAttrib(C,"width",B.replace(/[^0-9%]+/g,""));v.dom.setStyle(C,"width","")}if(B=v.dom.getStyle(C,"height")){v.dom.setAttrib(C,"height",B.replace(/[^0-9%]+/g,""));v.dom.setStyle(C,"height","")}})}else{ev="resizestart";s=v.dom.bind(A,"resizestart",j.cancel,j)}t=v.resizeInfo={node:A,ev:ev,cb:s}});v.onKeyDown.add(function(s,t){switch(t.keyCode){case 8:if(v.selection.getRng().item){s.dom.remove(v.selection.getRng().item(0));return j.cancel(t)}}})}if(m.isOpera){v.onClick.add(function(s,t){j.prevent(t)})}if(y.custom_undo_redo){function q(){v.undoManager.typing=0;v.undoManager.add()}v.dom.bind(v.getDoc(),"focusout",function(s){if(!v.removed&&v.undoManager.typing){q()}});v.onKeyUp.add(function(s,t){if((t.keyCode>=33&&t.keyCode<=36)||(t.keyCode>=37&&t.keyCode<=40)||t.keyCode==13||t.keyCode==45||t.ctrlKey){q()}});v.onKeyDown.add(function(s,t){if((t.keyCode>=33&&t.keyCode<=36)||(t.keyCode>=37&&t.keyCode<=40)||t.keyCode==13||t.keyCode==45){if(v.undoManager.typing){q()}return}if(!v.undoManager.typing){v.undoManager.add();v.undoManager.typing=1}});v.onMouseDown.add(function(){if(v.undoManager.typing){q()}})}},_isHidden:function(){var p;if(!a){return 0}p=this.selection.getSel();return(!p||!p.rangeCount||p.rangeCount==0)},_fixNesting:function(q){var r=[],p;q=q.replace(/<(\/)?([^\s>]+)[^>]*?>/g,function(t,s,v){var u;if(s==="/"){if(!r.length){return""}if(v!==r[r.length-1].tag){for(p=r.length-1;p>=0;p--){if(r[p].tag===v){r[p].close=1;break}}return""}else{r.pop();if(r.length&&r[r.length-1].close){t=t+"</"+r[r.length-1].tag+">";r.pop()}}}else{if(/^(br|hr|input|meta|img|link|param)$/i.test(v)){return t}if(/\/>$/.test(t)){return t}r.push({tag:v})}return t});for(p=r.length-1;p>=0;p--){q+="</"+r[p].tag+">"}return q}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var l=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,o;function q(y,x,v){var u;y=y.toLowerCase();if(u=j.exec[y]){u(y,x,v);return a}return b}function m(v){var u;v=v.toLowerCase();if(u=j.state[v]){return u(v)}return -1}function h(v){var u;v=v.toLowerCase();if(u=j.value[v]){return u(v)}return b}function t(u,v){v=v||"exec";d(u,function(y,x){d(x.toLowerCase().split(","),function(z){j[v][z]=y})})}c.extend(this,{execCommand:q,queryCommandState:m,queryCommandValue:h,addCommands:t});function f(x,v,u){if(v===e){v=b}if(u===e){u=null}return n.getDoc().execCommand(x,v,u)}function s(u){return n.formatter.match(u)}function r(u,v){n.formatter.toggle(u,v?{value:v}:e)}function i(u){o=p.getBookmark(u)}function g(){p.moveToBookmark(o)}t({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(y){var x=n.getDoc(),u;try{f(y)}catch(v){u=a}if(u||!x.queryCommandSupported(y)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(z){if(z){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(u){if(p.isCollapsed()){p.select(p.getNode())}f(u);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(u){var v=u.substring(7);d("left,center,right,full".split(","),function(x){if(v!=x){n.formatter.remove("align"+x)}});r("align"+v)},"InsertUnorderedList,InsertOrderedList":function(x){var u,v;f(x);u=l.getParent(p.getNode(),"ol,ul");if(u){v=u.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(v.nodeName)){i();l.split(v,u);g()}}},"Bold,Italic,Underline,Strikethrough":function(u){r(u)},"ForeColor,HiliteColor,FontName":function(x,v,u){r(x,u)},FontSize:function(y,x,v){var u,z;if(v>=1&&v<=7){z=c.explode(k.font_size_style_values);u=c.explode(k.font_size_classes);if(u){v=u[v-1]||v}else{v=z[v-1]||v}}r(y,v)},RemoveFormat:function(u){n.formatter.remove(u)},mceBlockQuote:function(u){r("blockquote")},FormatBlock:function(x,v,u){return r(u)},mceCleanup:function(){i();n.setContent(n.getContent({cleanup:a}),{cleanup:a});g()},mceRemoveNode:function(y,x,v){var u=v||p.getNode();if(u!=n.getBody()){i();n.dom.remove(u,a);g()}},mceSelectNodeDepth:function(y,x,v){var u=0;l.getParent(p.getNode(),function(z){if(z.nodeType==1&&u++==v){p.select(z);return b}},n.getBody())},mceSelectNode:function(x,v,u){p.select(u)},mceInsertContent:function(x,v,u){p.setContent(u)},mceInsertRawHTML:function(x,v,u){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,u))},mceSetContent:function(x,v,u){n.setContent(u)},"Indent,Outdent":function(y){var v,u,x;v=k.indentation;u=/[a-z%]+$/i.exec(v);v=parseInt(v);if(!m("InsertUnorderedList")&&!m("InsertOrderedList")){d(p.getSelectedBlocks(),function(z){if(y=="outdent"){x=Math.max(0,parseInt(z.style.paddingLeft||0)-v);l.setStyle(z,"paddingLeft",x?x+u:"")}else{l.setStyle(z,"paddingLeft",(parseInt(z.style.paddingLeft||0)+v)+u)}})}else{f(y)}},mceRepaint:function(){var v;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(u){}}},mceToggleFormat:function(x,v,u){n.formatter.toggle(u)},InsertHorizontalRule:function(){p.setContent("<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(x,v,u){p.setContent(u.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(y,x,v){var u=l.getParent(p.getNode(),"a");if(c.is(v,"string")){v={href:v}}if(!u){f("CreateLink",b,"javascript:mctmp(0);");d(l.select("a[href=javascript:mctmp(0);]"),function(z){l.setAttribs(z,v)})}else{if(v.href){l.setAttribs(u,v)}else{n.dom.remove(u,a)}}},selectAll:function(){var v=l.getRoot();var u=l.createRng();u.setStart(v,0);u.setEnd(v,v.childNodes.length);n.selection.setRng(u)}});t({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(u){return s("align"+u.substring(7))},"Bold,Italic,Underline,Strikethrough":function(u){return s(u)},mceBlockQuote:function(){return s("blockquote")},Outdent:function(){var u;if(k.inline_styles){if((u=l.getParent(p.getStart(),l.isBlock))&&parseInt(u.style.paddingLeft)>0){return a}if((u=l.getParent(p.getEnd(),l.isBlock))&&parseInt(u.style.paddingLeft)>0){return a}}return m("InsertUnorderedList")||m("InsertOrderedList")||(!k.inline_styles&&!!l.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(u){return l.getParent(p.getNode(),u=="insertunorderedlist"?"UL":"OL")}},"state");t({"FontSize,FontName":function(x){var v=0,u;if(u=l.getParent(p.getNode(),"span")){if(x=="fontsize"){v=u.style.fontSize}else{v=u.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return v}},"value");if(k.custom_undo_redo){t({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(e){var c,d=0,g=[];function f(){return b.trim(e.getContent({format:"raw",no_events:1}))}return c={typing:0,onAdd:new a(c),onUndo:new a(c),onRedo:new a(c),add:function(l){var h,j=e.settings,k;l=l||{};l.content=f();k=g[d];if(k&&k.content==l.content){if(d>0||g.length==1){return null}}if(j.custom_undo_redo_levels){if(g.length>j.custom_undo_redo_levels){for(h=0;h<g.length-1;h++){g[h]=g[h+1]}g.length--;d=g.length}}l.bookmark=e.selection.getBookmark(2,true);if(d<g.length-1){if(d==0){g=[]}else{g.length=d+1}}g.push(l);d=g.length-1;c.onAdd.dispatch(c,l);e.isNotDirty=0;return l},undo:function(){var j,h;if(c.typing){c.add();c.typing=0}if(d>0){j=g[--d];e.setContent(j.content,{format:"raw"});e.selection.moveToBookmark(j.bookmark);c.onUndo.dispatch(c,j)}return j},redo:function(){var h;if(d<g.length-1){h=g[++d];e.setContent(h.content,{format:"raw"});e.selection.moveToBookmark(h.bookmark);c.onRedo.dispatch(c,h)}return h},clear:function(){g=[];d=c.typing=0},hasUndo:function(){return d>0||c.typing},hasRedo:function(){return d<g.length-1}}}})(tinymce);(function(l){var k=l.dom.Event,c=l.isIE,a=l.isGecko,b=l.isOpera,j=l.each,i=l.extend,d=true,h=false;function g(n,o){var m=o.ownerDocument.createRange();m.setStart(n.endContainer,n.endOffset);m.setEndAfter(o);return m.cloneContents().textContent.length==0}function f(m){m=m.innerHTML;m=m.replace(/<(img|hr|table|input|select|textarea)[ \>]/gi,"-");m=m.replace(/<[^>]+>/g,"");return m.replace(/[ \u00a0\t\r\n]+/g,"")==""}function e(o,q,m){var n,p;if(f(m)){n=q.getParent(m,"ul,ol");if(!q.getParent(n.parentNode,"ul,ol")){q.split(n,m);p=q.create("p",0,'<br _mce_bogus="1" />');q.replace(p,m);o.select(p,1)}return h}return d}l.create("tinymce.ForceBlocks",{ForceBlocks:function(n){var o=this,p=n.settings,q;o.editor=n;o.dom=n.dom;q=(p.forced_root_block||"p").toLowerCase();p.element=q.toUpperCase();n.onPreInit.add(o.setup,o);o.reOpera=new RegExp("(\\u00a0|&#160;|&nbsp;)</"+q+">","gi");o.rePadd=new RegExp("<p( )([^>]+)><\\/p>|<p( )([^>]+)\\/>|<p( )([^>]+)>\\s+<\\/p>|<p><\\/p>|<p\\/>|<p>\\s+<\\/p>".replace(/p/g,q),"gi");o.reNbsp2BR1=new RegExp("<p( )([^>]+)>[\\s\\u00a0]+<\\/p>|<p>[\\s\\u00a0]+<\\/p>".replace(/p/g,q),"gi");o.reNbsp2BR2=new RegExp("<%p()([^>]+)>(&nbsp;|&#160;)<\\/%p>|<%p>(&nbsp;|&#160;)<\\/%p>".replace(/%p/g,q),"gi");o.reBR2Nbsp=new RegExp("<p( )([^>]+)>\\s*<br \\/>\\s*<\\/p>|<p>\\s*<br \\/>\\s*<\\/p>".replace(/p/g,q),"gi");function m(r,s){if(b){s.content=s.content.replace(o.reOpera,"</"+q+">")}s.content=s.content.replace(o.rePadd,"<"+q+"$1$2$3$4$5$6>\u00a0</"+q+">");if(!c&&!b&&s.set){s.content=s.content.replace(o.reNbsp2BR1,"<"+q+"$1$2><br /></"+q+">");s.content=s.content.replace(o.reNbsp2BR2,"<"+q+"$1$2><br /></"+q+">")}else{s.content=s.content.replace(o.reBR2Nbsp,"<"+q+"$1$2>\u00a0</"+q+">")}}n.onBeforeSetContent.add(m);n.onPostProcess.add(m);if(p.forced_root_block){n.onInit.add(o.forceRoots,o);n.onSetContent.add(o.forceRoots,o);n.onBeforeGetContent.add(o.forceRoots,o)}},setup:function(){var n=this,m=n.editor,p=m.settings,r=m.dom,o=m.selection;if(p.forced_root_block){m.onBeforeExecCommand.add(n.forceRoots,n);m.onKeyUp.add(n.forceRoots,n);m.onPreProcess.add(n.forceRoots,n)}if(p.force_br_newlines){if(c){m.onKeyPress.add(function(s,t){var u;if(t.keyCode==13&&o.getNode().nodeName!="LI"){o.setContent('<br id="__" /> ',{format:"raw"});u=r.get("__");u.removeAttribute("id");o.select(u);o.collapse();return k.cancel(t)}})}}if(!c&&p.force_p_newlines){m.onKeyPress.add(function(s,t){if(t.keyCode==13&&!t.shiftKey&&!n.insertPara(t)){k.cancel(t)}});if(a){m.onKeyDown.add(function(s,t){if((t.keyCode==8||t.keyCode==46)&&!t.shiftKey){n.backspaceDelete(t,t.keyCode==8)}})}}if(l.isWebKit){function q(t){var s=o.getRng(),u,y=r.create("div",null," "),x,v=r.getViewPort(t.getWin()).h;s.insertNode(u=r.create("br"));s.setStartAfter(u);s.setEndAfter(u);o.setRng(s);if(o.getSel().focusNode==u.previousSibling){o.select(r.insertAfter(r.doc.createTextNode("\u00a0"),u));o.collapse(d)}r.insertAfter(y,u);x=r.getPos(y).y;r.remove(y);if(x>v){t.getWin().scrollTo(0,x)}}m.onKeyPress.add(function(s,t){if(t.keyCode==13&&(t.shiftKey||(p.force_br_newlines&&!r.getParent(o.getNode(),"h1,h2,h3,h4,h5,h6,ol,ul")))){q(s);k.cancel(t)}})}m.onPreProcess.add(function(s,t){j(r.select("p,h1,h2,h3,h4,h5,h6,div",t.node),function(u){if(f(u)){j(r.select("span,em,strong,b,i",t.node),function(v){if(!v.hasChildNodes()){v.appendChild(s.getDoc().createTextNode("\u00a0"));return h}})}})});if(c){if(p.element!="P"){m.onKeyPress.add(function(s,t){n.lastElm=o.getNode().nodeName});m.onKeyUp.add(function(t,u){var x,v=o.getNode(),s=t.getBody();if(s.childNodes.length===1&&v.nodeName=="P"){v=r.rename(v,p.element);o.select(v);o.collapse();t.nodeChanged()}else{if(u.keyCode==13&&!u.shiftKey&&n.lastElm!="P"){x=r.getParent(v,"p");if(x){r.rename(x,p.element);t.nodeChanged()}}}})}}},find:function(u,p,q){var o=this.editor,m=o.getDoc().createTreeWalker(u,4,null,h),r=-1;while(u=m.nextNode()){r++;if(p==0&&u==q){return r}if(p==1&&r==q){return u}}return -1},forceRoots:function(v,H){var y=this,v=y.editor,L=v.getBody(),I=v.getDoc(),O=v.selection,z=O.getSel(),A=O.getRng(),M=-2,u,F,m,o,J=-16777215;var K,p,N,E,B,q=L.childNodes,D,C,x;for(D=q.length-1;D>=0;D--){K=q[D];if(K.nodeType===1&&K.getAttribute("_mce_type")){p=null;continue}if(K.nodeType===3||(!y.dom.isBlock(K)&&K.nodeType!==8&&!/^(script|mce:script|style|mce:style)$/i.test(K.nodeName))){if(!p){if(K.nodeType!=3||/[^\s]/g.test(K.nodeValue)){if(M==-2&&A){if(!c){if(A.startContainer.nodeType==1&&(C=A.startContainer.childNodes[A.startOffset])&&C.nodeType==1){x=C.getAttribute("id");C.setAttribute("id","__mce")}else{if(v.dom.getParent(A.startContainer,function(n){return n===L})){F=A.startOffset;m=A.endOffset;M=y.find(L,0,A.startContainer);u=y.find(L,0,A.endContainer)}}}else{if(A.item){o=I.body.createTextRange();o.moveToElementText(A.item(0));A=o}o=I.body.createTextRange();o.moveToElementText(L);o.collapse(1);N=o.move("character",J)*-1;o=A.duplicate();o.collapse(1);E=o.move("character",J)*-1;o=A.duplicate();o.collapse(0);B=(o.move("character",J)*-1)-E;M=E-N;u=B}}p=v.dom.create(v.settings.forced_root_block);K.parentNode.replaceChild(p,K);p.appendChild(K)}}else{if(p.hasChildNodes()){p.insertBefore(K,p.firstChild)}else{p.appendChild(K)}}}else{p=null}}if(M!=-2){if(!c){p=L.getElementsByTagName(v.settings.element)[0];A=I.createRange();if(M!=-1){A.setStart(y.find(L,1,M),F)}else{A.setStart(p,0)}if(u!=-1){A.setEnd(y.find(L,1,u),m)}else{A.setEnd(p,0)}if(z){z.removeAllRanges();z.addRange(A)}}else{try{A=z.createRange();A.moveToElementText(L);A.collapse(1);A.moveStart("character",M);A.moveEnd("character",u);A.select()}catch(G){}}}else{if(!c&&(C=v.dom.get("__mce"))){if(x){C.setAttribute("id",x)}else{C.removeAttribute("id")}A=I.createRange();A.setStartBefore(C);A.setEndBefore(C);O.setRng(A)}}},getParentBlock:function(o){var m=this.dom;return m.getParent(o,m.isBlock)},insertPara:function(R){var F=this,v=F.editor,N=v.dom,S=v.getDoc(),W=v.settings,G=v.selection.getSel(),H=G.getRangeAt(0),V=S.body;var K,L,I,P,O,q,o,u,z,m,D,U,p,x,J,M=N.getViewPort(v.getWin()),C,E,B;K=S.createRange();K.setStart(G.anchorNode,G.anchorOffset);K.collapse(d);L=S.createRange();L.setStart(G.focusNode,G.focusOffset);L.collapse(d);I=K.compareBoundaryPoints(K.START_TO_END,L)<0;P=I?G.anchorNode:G.focusNode;O=I?G.anchorOffset:G.focusOffset;q=I?G.focusNode:G.anchorNode;o=I?G.focusOffset:G.anchorOffset;if(P===q&&/^(TD|TH)$/.test(P.nodeName)){if(P.firstChild.nodeName=="BR"){N.remove(P.firstChild)}if(P.childNodes.length==0){v.dom.add(P,W.element,null,"<br />");U=v.dom.add(P,W.element,null,"<br />")}else{J=P.innerHTML;P.innerHTML="";v.dom.add(P,W.element,null,J);U=v.dom.add(P,W.element,null,"<br />")}H=S.createRange();H.selectNodeContents(U);H.collapse(1);v.selection.setRng(H);return h}if(P==V&&q==V&&V.firstChild&&v.dom.isBlock(V.firstChild)){P=q=P.firstChild;O=o=0;K=S.createRange();K.setStart(P,0);L=S.createRange();L.setStart(q,0)}P=P.nodeName=="HTML"?S.body:P;P=P.nodeName=="BODY"?P.firstChild:P;q=q.nodeName=="HTML"?S.body:q;q=q.nodeName=="BODY"?q.firstChild:q;u=F.getParentBlock(P);z=F.getParentBlock(q);m=u?u.nodeName:W.element;if(J=F.dom.getParent(u,"li,pre")){if(J.nodeName=="LI"){return e(v.selection,F.dom,J)}return d}if(u&&(u.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(N.getStyle(u,"position",1)))){m=W.element;u=null}if(z&&(z.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(N.getStyle(u,"position",1)))){m=W.element;z=null}if(/(TD|TABLE|TH|CAPTION)/.test(m)||(u&&m=="DIV"&&/left|right/gi.test(N.getStyle(u,"float",1)))){m=W.element;u=z=null}D=(u&&u.nodeName==m)?u.cloneNode(0):v.dom.create(m);U=(z&&z.nodeName==m)?z.cloneNode(0):v.dom.create(m);U.removeAttribute("id");if(/^(H[1-6])$/.test(m)&&g(H,u)){U=v.dom.create(W.element)}J=p=P;do{if(J==V||J.nodeType==9||F.dom.isBlock(J)||/(TD|TABLE|TH|CAPTION)/.test(J.nodeName)){break}p=J}while((J=J.previousSibling?J.previousSibling:J.parentNode));J=x=q;do{if(J==V||J.nodeType==9||F.dom.isBlock(J)||/(TD|TABLE|TH|CAPTION)/.test(J.nodeName)){break}x=J}while((J=J.nextSibling?J.nextSibling:J.parentNode));if(p.nodeName==m){K.setStart(p,0)}else{K.setStartBefore(p)}K.setEnd(P,O);D.appendChild(K.cloneContents()||S.createTextNode(""));try{L.setEndAfter(x)}catch(Q){}L.setStart(q,o);U.appendChild(L.cloneContents()||S.createTextNode(""));H=S.createRange();if(!p.previousSibling&&p.parentNode.nodeName==m){H.setStartBefore(p.parentNode)}else{if(K.startContainer.nodeName==m&&K.startOffset==0){H.setStartBefore(K.startContainer)}else{H.setStart(K.startContainer,K.startOffset)}}if(!x.nextSibling&&x.parentNode.nodeName==m){H.setEndAfter(x.parentNode)}else{H.setEnd(L.endContainer,L.endOffset)}H.deleteContents();if(b){v.getWin().scrollTo(0,M.y)}if(D.firstChild&&D.firstChild.nodeName==m){D.innerHTML=D.firstChild.innerHTML}if(U.firstChild&&U.firstChild.nodeName==m){U.innerHTML=U.firstChild.innerHTML}if(f(D)){D.innerHTML="<br />"}function T(y,s){var r=[],Y,X,t;y.innerHTML="";if(W.keep_styles){X=s;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(X.nodeName)){Y=X.cloneNode(h);N.setAttrib(Y,"id","");r.push(Y)}}while(X=X.parentNode)}if(r.length>0){for(t=r.length-1,Y=y;t>=0;t--){Y=Y.appendChild(r[t])}r[0].innerHTML=b?"&nbsp;":"<br />";return r[0]}else{y.innerHTML=b?"&nbsp;":"<br />"}}if(f(U)){B=T(U,q)}if(b&&parseFloat(opera.version())<9.5){H.insertNode(D);H.insertNode(U)}else{H.insertNode(U);H.insertNode(D)}U.normalize();D.normalize();function A(r){return S.createTreeWalker(r,NodeFilter.SHOW_TEXT,null,h).nextNode()||r}H=S.createRange();H.selectNodeContents(a?A(B||U):B||U);H.collapse(1);G.removeAllRanges();G.addRange(H);C=v.dom.getPos(U).y;E=U.clientHeight;if(C<M.y||C+E>M.y+M.h){v.getWin().scrollTo(0,C<M.y?C:C-M.h+25)}return h},backspaceDelete:function(s,A){var C=this,q=C.editor,x=q.getBody(),p=q.dom,o,u=q.selection,m=u.getRng(),v=m.startContainer,o,y,z;if(v&&q.dom.isBlock(v)&&!/^(TD|TH)$/.test(v.nodeName)&&A){if(v.childNodes.length==0||(v.childNodes.length==1&&v.firstChild.nodeName=="BR")){o=v;while((o=o.previousSibling)&&!q.dom.isBlock(o)){}if(o){if(v!=x.firstChild){y=q.dom.doc.createTreeWalker(o,NodeFilter.SHOW_TEXT,null,h);while(z=y.nextNode()){o=z}m=q.getDoc().createRange();m.setStart(o,o.nodeValue?o.nodeValue.length:0);m.setEnd(o,o.nodeValue?o.nodeValue.length:0);u.setRng(m);q.dom.remove(v)}return k.cancel(s)}}}function B(n){var r;n=n.target;if(n&&n.parentNode&&n.nodeName=="BR"&&(o=C.getParentBlock(n))){r=n.previousSibling;k.remove(x,"DOMNodeInserted",B);if(r&&r.nodeType==3&&/\s+$/.test(r.nodeValue)){return}if(n.previousSibling||n.nextSibling){q.dom.remove(n)}}}k._add(x,"DOMNodeInserted",B);window.setTimeout(function(){k._remove(x,"DOMNodeInserted",B)},1)}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;if(g.settings.use_native_selects){k=new c.ui.NativeListBox(m,i)}else{f=l||h._cls.listbox||c.ui.ListBox;k=new f(m,i)}h.controls[m]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){g.bookmark=g.selection.getBookmark(1)});a.add(o,"focus",function(){g.selection.moveToBookmark(g.bookmark);g.bookmark=null})})}if(k.hideMenu){g.onMouseDown.add(k.hideMenu,k)}return h.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){function b(){var d={},c={},e={};function f(j,i,h,g){if(typeof(i)=="string"){i=[i]}a.each(i,function(k){j[k.toLowerCase()]={func:h,scope:g}})}a.extend(this,{add:function(i,h,g){f(d,i,h,g)},addQueryStateHandler:function(i,h,g){f(c,i,h,g)},addQueryValueHandler:function(i,h,g){f(e,i,h,g)},execCommand:function(h,k,j,i,g){if(k=d[k.toLowerCase()]){if(k.func.call(h||k.scope,j,i,g)!==false){return true}}},queryCommandValue:function(){if(cmd=e[cmd.toLowerCase()]){return cmd.func.call(scope||cmd.scope,ui,value,args)}},queryCommandState:function(){if(cmd=c[cmd.toLowerCase()]){return cmd.func.call(scope||cmd.scope,ui,value,args)}}})}a.GlobalCommands=new b()})(tinymce);(function(a){a.Formatter=function(T){var K={},M=a.each,c=T.dom,p=T.selection,s=a.dom.TreeWalker,I=new a.dom.RangeUtils(c),d=T.schema.isValid,E=c.isBlock,k=T.settings.forced_root_block,r=c.nodeIndex,D="\uFEFF",e=/^(src|href|style)$/,Q=false,A=true,o,N={apply:[],remove:[]};function y(U){return U instanceof Array}function l(V,U){return c.getParents(V,U,c.getRoot())}function b(U){return U.nodeType===1&&(U.face==="mceinline"||U.style.fontFamily==="mceinline")}function P(U){return U?K[U]:K}function j(U,V){if(U){if(typeof(U)!=="string"){M(U,function(X,W){j(W,X)})}else{V=V.length?V:[V];M(V,function(W){if(W.deep===o){W.deep=!W.selector}if(W.split===o){W.split=!W.selector||W.inline}if(W.remove===o&&W.selector&&!W.inline){W.remove="none"}if(W.selector&&W.inline){W.mixed=true;W.block_expand=true}if(typeof(W.classes)==="string"){W.classes=W.classes.split(/\s+/)}});K[U]=V}}}function R(W,ac,Y){var Z=P(W),ad=Z[0],ab,V,aa;function X(ag){var af=ag.startContainer,aj=ag.startOffset,ai,ah;if(af.nodeType==1||af.nodeValue===""){af=af.nodeType==1?af.childNodes[aj]:af;ai=new s(af,af.parentNode);for(ah=ai.current();ah;ah=ai.next()){if(ah.nodeType==3&&!E(ah.parentNode)&&!f(ah)){ag.setStart(ah,0);break}}}return ag}function U(ag,af){af=af||ad;if(ag){M(af.styles,function(ai,ah){c.setStyle(ag,ah,q(ai,ac))});M(af.attributes,function(ai,ah){c.setAttrib(ag,ah,q(ai,ac))});M(af.classes,function(ah){ah=q(ah,ac);if(!c.hasClass(ag,ah)){c.addClass(ag,ah)}})}}function ae(ag){var af=[],ai,ah;ai=ad.inline||ad.block;ah=c.create(ai);U(ah);I.walk(ag,function(aj){var ak;function al(am){var ap=am.nodeName.toLowerCase(),ao=am.parentNode.nodeName.toLowerCase(),an;if(g(ap,"br")){ak=0;if(ad.block){c.remove(am)}return}if(ad.wrapper&&v(am,W,ac)){ak=0;return}if(ad.block&&!ad.wrapper&&F(ap)){am=c.rename(am,ai);U(am);af.push(am);ak=0;return}if(ad.selector){M(Z,function(aq){if(c.is(am,aq.selector)&&!b(am)){U(am,aq);an=true}});if(!ad.inline||an){ak=0;return}}if(d(ai,ap)&&d(ao,ai)){if(!ak){ak=ah.cloneNode(Q);am.parentNode.insertBefore(ak,am);af.push(ak)}ak.appendChild(am)}else{ak=0;M(a.grep(am.childNodes),al);ak=0}}M(aj,al)});M(af,function(al){var aj;function am(ao){var an=0;M(ao.childNodes,function(ap){if(!f(ap)&&!G(ap)){an++}});return an}function ak(an){var ap,ao;M(an.childNodes,function(aq){if(aq.nodeType==1&&!G(aq)&&!b(aq)){ap=aq;return Q}});if(ap&&h(ap,ad)){ao=ap.cloneNode(Q);U(ao);c.replace(ao,an,A);c.remove(ap,1)}return ao||an}aj=am(al);if(aj===0){c.remove(al,1);return}if(ad.inline||ad.wrapper){if(!ad.exact&&aj===1){al=ak(al)}M(Z,function(an){M(c.select(an.inline,al),function(ao){S(an,ac,ao,an.exact?ao:null)})});if(v(al.parentNode,W,ac)){c.remove(al,1);al=0;return A}if(ad.merge_with_parents){c.getParent(al.parentNode,function(an){if(v(an,W,ac)){c.remove(al,1);al=0;return A}})}if(al){al=t(B(al),al);al=t(al,B(al,A))}}})}if(ad){if(Y){V=c.createRng();V.setStartBefore(Y);V.setEndAfter(Y);ae(V)}else{if(!p.isCollapsed()||!ad.inline){ab=p.getBookmark();ae(n(p.getRng(A),Z));p.moveToBookmark(ab);p.setRng(X(p.getRng(A)));T.nodeChanged()}else{O("apply",W,ac)}}}}function z(W,ae,Y){var Z=P(W),ag=Z[0],ad,ac,V;function X(al){var ak,aj,ai;ak=a.grep(al.childNodes);for(aj=0,ai=Z.length;aj<ai;aj++){if(S(Z[aj],ae,al,al)){break}}if(ag.deep){for(aj=0,ai=ak.length;aj<ai;aj++){X(ak[aj])}}}function aa(ai){var aj;M(l(ai.parentNode).reverse(),function(ak){var al;if(!aj&&ak.id!="_start"&&ak.id!="_end"){al=v(ak,W,ae);if(al&&al.split!==false){aj=ak}}});return aj}function U(al,ai,an,aq){var ar,ap,ao,ak,am,aj;if(al){aj=al.parentNode;for(ar=ai.parentNode;ar&&ar!=aj;ar=ar.parentNode){ap=ar.cloneNode(Q);for(am=0;am<Z.length;am++){if(S(Z[am],ae,ap,ap)){ap=0;break}}if(ap){if(ao){ap.appendChild(ao)}if(!ak){ak=ap}ao=ap}}if(aq&&(!ag.mixed||!E(al))){ai=c.split(al,ai)}if(ao){an.parentNode.insertBefore(ao,an);ak.appendChild(an)}}return ai}function af(ai){return U(aa(ai),ai,ai,true)}function ab(ak){var aj=c.get(ak?"_start":"_end"),ai=aj[ak?"firstChild":"lastChild"];if(G(ai)){ai=ai[ak?"firstChild":"lastChild"]}c.remove(aj,true);return ai}function ah(ai){var aj,ak;ai=n(ai,Z,A);if(ag.split){aj=H(ai,A);ak=H(ai);if(aj!=ak){aj=L(aj,"span",{id:"_start",_mce_type:"bookmark"});ak=L(ak,"span",{id:"_end",_mce_type:"bookmark"});af(aj);af(ak);aj=ab(A);ak=ab()}else{aj=ak=af(aj)}ai.startContainer=aj.parentNode;ai.startOffset=r(aj);ai.endContainer=ak.parentNode;ai.endOffset=r(ak)+1}I.walk(ai,function(al){M(al,function(am){X(am)})})}if(Y){V=c.createRng();V.setStartBefore(Y);V.setEndAfter(Y);ah(V);return}if(!p.isCollapsed()||!ag.inline){ad=p.getBookmark();ah(p.getRng(A));p.moveToBookmark(ad);T.nodeChanged()}else{O("remove",W,ae)}}function C(U,W,V){if(i(U,W,V)){z(U,W,V)}else{R(U,W,V)}}function v(V,U,aa,Y){var W=P(U),ab,Z,X;function ac(ag,ai,aj){var af,ah,ad=ai[aj],ae;if(ad){if(ad.length===o){for(af in ad){if(ad.hasOwnProperty(af)){if(aj==="attributes"){ah=c.getAttrib(ag,af)}else{ah=J(ag,af)}if(Y&&!ah&&!ai.exact){return}if((!Y||ai.exact)&&!g(ah,q(ad[af],aa))){return}}}}else{for(ae=0;ae<ad.length;ae++){if(aj==="attributes"?c.getAttrib(ag,ad[ae]):J(ag,ad[ae])){return ai}}}}return ai}if(W&&V){for(Z=0;Z<W.length;Z++){ab=W[Z];if(h(V,ab)&&ac(V,ab,"attributes")&&ac(V,ab,"styles")){if(X=ab.classes){for(Z=0;Z<X.length;Z++){if(!c.hasClass(V,X[Z])){return}}}return ab}}}}function i(W,Z,Y){var V,X;function U(aa){aa=c.getParent(aa,function(ab){return !!v(ab,W,Z,true)});return v(aa,W,Z)}if(Y){return U(Y)}if(p.isCollapsed()){for(X=N.apply.length-1;X>=0;X--){if(N.apply[X].name==W){return true}}for(X=N.remove.length-1;X>=0;X--){if(N.remove[X].name==W){return false}}return U(p.getNode())}Y=p.getNode();if(U(Y)){return A}V=p.getStart();if(V!=Y){if(U(V)){return A}}return Q}function u(ab,aa){var Y,Z=[],X={},W,V,U;if(p.isCollapsed()){for(V=0;V<ab.length;V++){for(W=N.remove.length-1;W>=0;W--){U=ab[V];if(N.remove[W].name==U){X[U]=true;break}}}for(W=N.apply.length-1;W>=0;W--){for(V=0;V<ab.length;V++){U=ab[V];if(!X[U]&&N.apply[W].name==U){X[U]=true;Z.push(U)}}}}Y=p.getStart();c.getParent(Y,function(ae){var ad,ac;for(ad=0;ad<ab.length;ad++){ac=ab[ad];if(!X[ac]&&v(ae,ac,aa)){X[ac]=true;Z.push(ac)}}});return Z}function x(Y){var aa=P(Y),X,W,Z,V,U;if(aa){X=p.getStart();W=l(X);for(V=aa.length-1;V>=0;V--){U=aa[V].selector;if(!U){return A}for(Z=W.length-1;Z>=0;Z--){if(c.is(W[Z],U)){return A}}}}return Q}a.extend(this,{get:P,register:j,apply:R,remove:z,toggle:C,match:i,matchAll:u,matchNode:v,canApply:x});function h(U,V){if(g(U,V.inline)){return A}if(g(U,V.block)){return A}if(V.selector){return c.is(U,V.selector)}}function g(V,U){V=V||"";U=U||"";V=""+(V.nodeName||V);U=""+(U.nodeName||U);return V.toLowerCase()==U.toLowerCase()}function J(V,U){var W=c.getStyle(V,U);if(U=="color"||U=="backgroundColor"){W=c.toHex(W)}if(U=="fontWeight"&&W==700){W="bold"}return""+W}function q(U,V){if(typeof(U)!="string"){U=U(V)}else{if(V){U=U.replace(/%(\w+)/g,function(X,W){return V[W]||X})}}return U}function f(U){return U&&U.nodeType===3&&/^\s*$/.test(U.nodeValue)}function L(W,V,U){var X=c.create(V,U);W.parentNode.insertBefore(X,W);X.appendChild(W);return X}function n(U,ac,X){var W=U.startContainer,Z=U.startOffset,af=U.endContainer,aa=U.endOffset,ae,ab;function ad(ai,aj,ag,ah){var ak,al;ah=ah||c.getRoot();for(;;){ak=ai.parentNode;if(ak==ah||(!ac[0].block_expand&&E(ak))){return ai}for(ae=ak[aj];ae&&ae!=ai;ae=ae[ag]){if(ae.nodeType==1&&!G(ae)){return ai}if(ae.nodeType==3&&!f(ae)){return ai}}ai=ai.parentNode}return ai}if(W.nodeType==1&&W.hasChildNodes()){ab=W.childNodes.length-1;W=W.childNodes[Z>ab?ab:Z];if(W.nodeType==3){Z=0}}if(af.nodeType==1&&af.hasChildNodes()){ab=af.childNodes.length-1;af=af.childNodes[aa>ab?ab:aa-1];if(af.nodeType==3){aa=af.nodeValue.length}}if(G(W.parentNode)){W=W.parentNode}if(G(W)){W=W.nextSibling||W}if(G(af.parentNode)){af=af.parentNode}if(G(af)){af=af.previousSibling||af}if(ac[0].inline||ac[0].block_expand){W=ad(W,"firstChild","nextSibling");af=ad(af,"lastChild","previousSibling")}if(ac[0].selector&&ac[0].expand!==Q&&!ac[0].inline){function Y(ah,ag){var ai,aj,ak;if(ah.nodeType==3&&ah.nodeValue.length==0&&ah[ag]){ah=ah[ag]}ai=l(ah);for(aj=0;aj<ai.length;aj++){for(ak=0;ak<ac.length;ak++){if(c.is(ai[aj],ac[ak].selector)){return ai[aj]}}}return ah}W=Y(W,"previousSibling");af=Y(af,"nextSibling")}if(ac[0].block||ac[0].selector){function V(ah,ag,aj){var ai;if(!ac[0].wrapper){ai=c.getParent(ah,ac[0].block)}if(!ai){ai=c.getParent(ah.nodeType==3?ah.parentNode:ah,E)}if(ai&&ac[0].wrapper){ai=l(ai,"ul,ol").reverse()[0]||ai}if(!ai){ai=ah;while(ai[ag]&&!E(ai[ag])){ai=ai[ag];if(g(ai,"br")){break}}}return ai||ah}W=V(W,"previousSibling");af=V(af,"nextSibling");if(ac[0].block){if(!E(W)){W=ad(W,"firstChild","nextSibling")}if(!E(af)){af=ad(af,"lastChild","previousSibling")}}}if(W.nodeType==1){Z=r(W);W=W.parentNode}if(af.nodeType==1){aa=r(af)+1;af=af.parentNode}return{startContainer:W,startOffset:Z,endContainer:af,endOffset:aa}}function S(aa,Z,X,U){var W,V,Y;if(!h(X,aa)){return Q}if(aa.remove!="all"){M(aa.styles,function(ac,ab){ac=q(ac,Z);if(typeof(ab)==="number"){ab=ac;U=0}if(!U||g(J(U,ab),ac)){c.setStyle(X,ab,"")}Y=1});if(Y&&c.getAttrib(X,"style")==""){X.removeAttribute("style");X.removeAttribute("_mce_style")}M(aa.attributes,function(ad,ab){var ac;ad=q(ad,Z);if(typeof(ab)==="number"){ab=ad;U=0}if(!U||g(c.getAttrib(U,ab),ad)){if(ab=="class"){ad=c.getAttrib(X,ab);if(ad){ac="";M(ad.split(/\s+/),function(ae){if(/mce\w+/.test(ae)){ac+=(ac?" ":"")+ae}});if(ac){c.setAttrib(X,ab,ac);return}}}if(ab=="class"){X.removeAttribute("className")}if(e.test(ab)){X.removeAttribute("_mce_"+ab)}X.removeAttribute(ab)}});M(aa.classes,function(ab){ab=q(ab,Z);if(!U||c.hasClass(U,ab)){c.removeClass(X,ab)}});V=c.getAttribs(X);for(W=0;W<V.length;W++){if(V[W].nodeName.indexOf("_")!==0){return Q}}}if(aa.remove!="none"){m(X,aa);return A}}function m(W,X){var U=W.parentNode,V;if(X.block){if(!k){function Y(aa,Z,ab){aa=B(aa,Z,ab);return !aa||(aa.nodeName=="BR"||E(aa))}if(E(W)&&!E(U)){if(!Y(W,Q)&&!Y(W.firstChild,A,1)){W.insertBefore(c.create("br"),W.firstChild)}if(!Y(W,A)&&!Y(W.lastChild,Q,1)){W.appendChild(c.create("br"))}}}else{if(U==c.getRoot()){if(!X.list_block||!g(W,X.list_block)){M(a.grep(W.childNodes),function(Z){if(d(k,Z.nodeName.toLowerCase())){if(!V){V=L(Z,k)}else{V.appendChild(Z)}}else{V=0}})}}}}if(X.selector&&X.inline&&!g(X.inline,W)){return}c.remove(W,1)}function B(V,U,W){if(V){U=U?"nextSibling":"previousSibling";for(V=W?V:V[U];V;V=V[U]){if(V.nodeType==1||!f(V)){return V}}}}function G(U){return U&&U.nodeType==1&&U.getAttribute("_mce_type")=="bookmark"}function t(Y,X){var U,W,V;function aa(ad,ac){if(ad.nodeName!=ac.nodeName){return Q}function ab(af){var ag={};M(c.getAttribs(af),function(ah){var ai=ah.nodeName.toLowerCase();if(ai.indexOf("_")!==0&&ai!=="style"){ag[ai]=c.getAttrib(af,ai)}});return ag}function ae(ai,ah){var ag,af;for(af in ai){if(ai.hasOwnProperty(af)){ag=ah[af];if(ag===o){return Q}if(ai[af]!=ag){return Q}delete ah[af]}}for(af in ah){if(ah.hasOwnProperty(af)){return Q}}return A}if(!ae(ab(ad),ab(ac))){return Q}if(!ae(c.parseStyle(c.getAttrib(ad,"style")),c.parseStyle(c.getAttrib(ac,"style")))){return Q}return A}if(Y&&X){function Z(ac,ab){for(W=ac;W;W=W[ab]){if(W.nodeType==3&&!f(W)){return ac}if(W.nodeType==1&&!G(W)){return W}}return ac}Y=Z(Y,"previousSibling");X=Z(X,"nextSibling");if(aa(Y,X)){for(W=Y.nextSibling;W&&W!=X;){V=W;W=W.nextSibling;Y.appendChild(V)}c.remove(X);M(a.grep(X.childNodes),function(ab){Y.appendChild(ab)});return Y}}return X}function F(U){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(U)}function H(V,Y){var U,X,W;U=V[Y?"startContainer":"endContainer"];X=V[Y?"startOffset":"endOffset"];if(U.nodeType==1){W=U.childNodes.length-1;if(!Y&&X){X--}U=U.childNodes[X>W?W:X]}return U}function O(Z,V,Y){var W,U=N[Z],aa=N[Z=="apply"?"remove":"apply"];function ab(){return N.apply.length||N.remove.length}function X(){N.apply=[];N.remove=[]}function ac(ad){M(N.apply.reverse(),function(ae){R(ae.name,ae.vars,ad)});M(N.remove.reverse(),function(ae){z(ae.name,ae.vars,ad)});c.remove(ad,1);X()}for(W=U.length-1;W>=0;W--){if(U[W].name==V){return}}U.push({name:V,vars:Y});for(W=aa.length-1;W>=0;W--){if(aa[W].name==V){aa.splice(W,1)}}if(ab()){T.getDoc().execCommand("FontName",false,"mceinline");N.lastRng=p.getRng();M(c.select("font,span"),function(ae){var ad;if(b(ae)){ad=p.getBookmark();ac(ae);p.moveToBookmark(ad);T.nodeChanged()}});if(!N.isListening&&ab()){N.isListening=true;M("onKeyDown,onKeyUp,onKeyPress,onMouseUp".split(","),function(ad){T[ad].addToTop(function(ae,af){if(ab()&&!a.dom.RangeUtils.compareRanges(N.lastRng,p.getRng())){M(c.select("font,span"),function(ah){var ai,ag;if(b(ah)){ai=ah.firstChild;ac(ah);ag=c.createRng();ag.setStart(ai,ai.nodeValue.length);ag.setEnd(ai,ai.nodeValue.length);p.setRng(ag);ae.nodeChanged()}});if(af.type=="keyup"||af.type=="mouseup"){X()}}})})}}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_style_values);function b(j,i){g.replace(g.create("span",{style:i}),j,1)}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});
\ No newline at end of file
+(function(d){var a=/^\s*|\s*$/g,e,c="B".replace(/A(.)|B/,"$1")==="$1";var b={majorVersion:"3",minorVersion:"4.2",releaseDate:"2011-04-07",_init:function(){var s=this,q=document,o=navigator,g=o.userAgent,m,f,l,k,j,r;s.isOpera=d.opera&&opera.buildNumber;s.isWebKit=/WebKit/.test(g);s.isIE=!s.isWebKit&&!s.isOpera&&(/MSIE/gi).test(g)&&(/Explorer/gi).test(o.appName);s.isIE6=s.isIE&&/MSIE [56]/.test(g);s.isGecko=!s.isWebKit&&/Gecko/.test(g);s.isMac=g.indexOf("Mac")!=-1;s.isAir=/adobeair/i.test(g);s.isIDevice=/(iPad|iPhone)/.test(g);if(d.tinyMCEPreInit){s.suffix=tinyMCEPreInit.suffix;s.baseURL=tinyMCEPreInit.base;s.query=tinyMCEPreInit.query;return}s.suffix="";f=q.getElementsByTagName("base");for(m=0;m<f.length;m++){if(r=f[m].href){if(/^https?:\/\/[^\/]+$/.test(r)){r+="/"}k=r?r.match(/.*\//)[0]:""}}function h(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){s.suffix="_src"}if((j=i.src.indexOf("?"))!=-1){s.query=i.src.substring(j+1)}s.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(k&&s.baseURL.indexOf("://")==-1&&s.baseURL.indexOf("/")!==0){s.baseURL=k+s.baseURL}return s.baseURL}return null}f=q.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}l=q.getElementsByTagName("head")[0];if(l){f=l.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}}return},is:function(g,f){if(!f){return g!==e}if(f=="array"&&(g.hasOwnProperty&&g instanceof Array)){return true}return typeof(g)==f},makeMap:function(f,j,h){var g;f=f||[];j=j||",";if(typeof(f)=="string"){f=f.split(j)}h=h||{};g=f.length;while(g--){h[f[g]]={}}return h},each:function(i,f,h){var j,g;if(!i){return 0}h=h||i;if(i.length!==e){for(j=0,g=i.length;j<g;j++){if(f.call(h,i[j],j,i)===false){return 0}}}else{for(j in i){if(i.hasOwnProperty(j)){if(f.call(h,i[j],j,i)===false){return 0}}}}return 1},map:function(g,h){var i=[];b.each(g,function(f){i.push(h(f))});return i},grep:function(g,h){var i=[];b.each(g,function(f){if(!h||h(f)){i.push(f)}});return i},inArray:function(g,h){var j,f;if(g){for(j=0,f=g.length;j<f;j++){if(g[j]===h){return j}}}return -1},extend:function(k,j){var h,g,f=arguments;for(h=1,g=f.length;h<g;h++){j=f[h];b.each(j,function(i,l){if(i!==e){k[l]=i}})}return k},trim:function(f){return(f?""+f:"").replace(a,"")},create:function(o,f,j){var n=this,g,i,k,l,h,m=0;o=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(o);k=o[3].match(/(^|\.)(\w+)$/i)[2];i=n.createNS(o[3].replace(/\.\w+$/,""),j);if(i[k]){return}if(o[2]=="static"){i[k]=f;if(this.onCreate){this.onCreate(o[2],o[3],i[k])}return}if(!f[k]){f[k]=function(){};m=1}i[k]=f[k];n.extend(i[k].prototype,f);if(o[5]){g=n.resolve(o[5]).prototype;l=o[5].match(/\.(\w+)$/i)[1];h=i[k];if(m){i[k]=function(){return g[l].apply(this,arguments)}}else{i[k]=function(){this.parent=g[l];return h.apply(this,arguments)}}i[k].prototype[k]=i[k];n.each(g,function(p,q){i[k].prototype[q]=g[q]});n.each(f,function(p,q){if(g[q]){i[k].prototype[q]=function(){this.parent=g[q];return p.apply(this,arguments)}}else{if(q!=k){i[k].prototype[q]=p}}})}n.each(f["static"],function(p,q){i[k][q]=p});if(this.onCreate){this.onCreate(o[2],o[3],i[k].prototype)}},walk:function(i,h,j,g){g=g||this;if(i){if(j){i=i[j]}b.each(i,function(k,f){if(h.call(g,k,f,j)===false){return false}b.walk(k,h,j,g)})}},createNS:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0;g<j.length;g++){f=j[g];if(!h[f]){h[f]={}}h=h[f]}return h},resolve:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0,f=j.length;g<f;g++){h=h[j[g]];if(!h){break}}return h},addUnload:function(j,i){var h=this;j={func:j,scope:i||this};if(!h.unloads){function g(){var f=h.unloads,l,m;if(f){for(m in f){l=f[m];if(l&&l.func){l.func.call(l.scope,1)}}if(d.detachEvent){d.detachEvent("onbeforeunload",k);d.detachEvent("onunload",g)}else{if(d.removeEventListener){d.removeEventListener("unload",g,false)}}h.unloads=l=f=w=g=0;if(d.CollectGarbage){CollectGarbage()}}}function k(){var l=document;if(l.readyState=="interactive"){function f(){l.detachEvent("onstop",f);if(g){g()}l=0}if(l){l.attachEvent("onstop",f)}d.setTimeout(function(){if(l){l.detachEvent("onstop",f)}},0)}}if(d.attachEvent){d.attachEvent("onunload",g);d.attachEvent("onbeforeunload",k)}else{if(d.addEventListener){d.addEventListener("unload",g,false)}}h.unloads=[j]}else{h.unloads.push(j)}return j},removeUnload:function(i){var g=this.unloads,h=null;b.each(g,function(j,f){if(j&&j.func==i){g.splice(f,1);h=i;return false}});return h},explode:function(f,g){return f?b.map(f.split(g||","),b.trim):f},_addVer:function(g){var f;if(!this.query){return g}f=(g.indexOf("?")==-1?"?":"&")+this.query;if(g.indexOf("#")==-1){return g+f}return g.replace("#",f+"#")},_replace:function(h,f,g){if(c){return g.replace(h,function(){var l=f,j=arguments,k;for(k=0;k<j.length-2;k++){if(j[k]===e){l=l.replace(new RegExp("\\$"+k,"g"),"")}else{l=l.replace(new RegExp("\\$"+k,"g"),j[k])}}return l})}return g.replace(h,f)}};b._init();d.tinymce=d.tinyMCE=b})(window);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,h,d,c;e=tinymce.trim(e);g=f.settings=g||{};if(/^(mailto|tel|news|javascript|about|data):/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^\w*:?\/\//.test(e)){e=(g.base_uri.protocol||"http")+"://mce_host"+f.toAbsPath(g.base_uri.path,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();(function(){function serialize(o,quote){var i,v,t;quote=quote||'"';if(o==null){return"null"}t=typeof o;if(t=="string"){v="\bb\tt\nn\ff\rr\"\"''\\\\";return quote+o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(a,b){if(quote==='"'&&a==="'"){return a}i=v.indexOf(b);if(i+1){return"\\"+v.charAt(i+1)}a=b.charCodeAt().toString(16);return"\\u"+"0000".substring(a.length)+a})+quote}if(t=="object"){if(o.hasOwnProperty&&o instanceof Array){for(i=0,v="[";i<o.length;i++){v+=(i>0?",":"")+serialize(o[i],quote)}return v+"]"}v="{";for(i in o){v+=typeof o[i]!="function"?(v.length>1?","+quote:quote)+i+quote+":"+serialize(o[i],quote):""}return v+"}"}return""+o}tinymce.util.JSON={serialize:serialize,parse:function(s){try{return eval("("+s+")")}catch(ex){}}}})();tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){if(e){e.call(f.error_scope||f.scope,h,g)}};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(j){var a,g,d,k=/[&\"\u007E-\uD7FF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,b=/[<>&\u007E-\uD7FF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,f=/[<>&\"\']/g,c=/&(#)?([\w]+);/g,i={128:"\u20AC",130:"\u201A",131:"\u0192",132:"\u201E",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02C6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017D",145:"\u2018",146:"\u2019",147:"\u201C",148:"\u201D",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02DC",153:"\u2122",154:"\u0161",155:"\u203A",156:"\u0153",158:"\u017E",159:"\u0178"};g={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"};d={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};function h(l){var m;m=document.createElement("div");m.innerHTML=l;return m.textContent||m.innerText||l}function e(m,p){var n,o,l,q={};if(m){m=m.split(",");p=p||10;for(n=0;n<m.length;n+=2){o=String.fromCharCode(parseInt(m[n],p));if(!g[o]){l="&"+m[n+1]+";";q[o]=l;q[l]=o}}return q}}a=e("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);j.html=j.html||{};j.html.Entities={encodeRaw:function(m,l){return m.replace(l?k:b,function(n){return g[n]||n})},encodeAllRaw:function(l){return(""+l).replace(f,function(m){return g[m]||m})},encodeNumeric:function(m,l){return m.replace(l?k:b,function(n){if(n.length>1){return"&#"+(((n.charCodeAt(0)-55296)*1024)+(n.charCodeAt(1)-56320)+65536)+";"}return g[n]||"&#"+n.charCodeAt(0)+";"})},encodeNamed:function(n,l,m){m=m||a;return n.replace(l?k:b,function(o){return g[o]||m[o]||o})},getEncodeFunc:function(l,o){var p=j.html.Entities;o=e(o)||a;function m(r,q){return r.replace(q?k:b,function(s){return g[s]||o[s]||"&#"+s.charCodeAt(0)+";"||s})}function n(r,q){return p.encodeNamed(r,q,o)}l=j.makeMap(l.replace(/\+/g,","));if(l.named&&l.numeric){return m}if(l.named){if(o){return n}return p.encodeNamed}if(l.numeric){return p.encodeNumeric}return p.encodeRaw},decode:function(l){return l.replace(c,function(n,m,o){if(m){o=parseInt(o);if(o>65535){o-=65536;return String.fromCharCode(55296+(o>>10),56320+(o&1023))}else{return i[o]||String.fromCharCode(o)}}return d[n]||a[n]||h(n)})}}})(tinymce);tinymce.html.Styles=function(d,f){var k=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,h=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,b=/\s*([^:]+):\s*([^;]+);?/g,l=/\s+$/,m=/rgb/,e,g,a={},j;d=d||{};j="\\\" \\' \\; \\: ; : _".split(" ");for(g=0;g<j.length;g++){a[j[g]]="_"+g;a["_"+g]=j[g]}function c(n,q,p,i){function o(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}return"#"+o(q)+o(p)+o(i)}return{toHex:function(i){return i.replace(k,c)},parse:function(r){var y={},p,n,v,q,u=d.url_converter,x=d.url_converter_scope||this;function o(C,F){var E,B,A,D;E=y[C+"-top"+F];if(!E){return}B=y[C+"-right"+F];if(E!=B){return}A=y[C+"-bottom"+F];if(B!=A){return}D=y[C+"-left"+F];if(A!=D){return}y[C+F]=D;delete y[C+"-top"+F];delete y[C+"-right"+F];delete y[C+"-bottom"+F];delete y[C+"-left"+F]}function t(B){var C=y[B],A;if(!C||C.indexOf(" ")<0){return}C=C.split(" ");A=C.length;while(A--){if(C[A]!==C[0]){return false}}y[B]=C[0];return true}function z(C,B,A,D){if(!t(B)){return}if(!t(A)){return}if(!t(D)){return}y[C]=y[B]+" "+y[A]+" "+y[D];delete y[B];delete y[A];delete y[D]}function s(A){q=true;return a[A]}function i(B,A){if(q){B=B.replace(/_[0-9]/g,function(C){return a[C]})}if(!A){B=B.replace(/\\([\'\";:])/g,"$1")}return B}if(r){r=r.replace(/\\[\"\';:_]/g,s).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(A){return A.replace(/[;:]/g,s)});while(p=b.exec(r)){n=p[1].replace(l,"").toLowerCase();v=p[2].replace(l,"");if(n&&v.length>0){if(n==="font-weight"&&v==="700"){v="bold"}else{if(n==="color"||n==="background-color"){v=v.toLowerCase()}}v=v.replace(k,c);v=v.replace(h,function(B,A,E,D,F,C){F=F||C;if(F){F=i(F);return"'"+F.replace(/\'/g,"\\'")+"'"}A=i(A||E||D);if(u){A=u.call(x,A,"style")}return"url('"+A.replace(/\'/g,"\\'")+"')"});y[n]=q?i(v,true):v}b.lastIndex=p.index+p[0].length}o("border","");o("border","-width");o("border","-color");o("border","-style");o("padding","");o("margin","");z("border","border-width","border-style","border-color");if(y.border==="medium none"){delete y.border}}return y},serialize:function(p,r){var o="",n,q;function i(t){var x,u,s,t,v;x=f.styles[t];if(x){for(u=0,s=x.length;u<s;u++){t=x[u];v=p[t];if(v!==e&&v.length>0){o+=(o.length>0?" ":"")+t+": "+v+";"}}}}if(r&&f&&f.styles){i("*");i(n)}else{for(n in p){q=p[n];if(q!==e&&q.length>0){o+=(o.length>0?" ":"")+n+": "+q+";"}}}return o}}};(function(l){var g={},i,k,f,d,b,e,c=l.makeMap,j=l.each;function h(n,m){return n.split(m||",")}function a(q,p){var n,o={};function m(r){return r.replace(/[A-Z]+/g,function(s){return m(q[s])})}for(n in q){if(q.hasOwnProperty(n)){q[n]=m(q[n])}}m(p).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g,function(u,s,r,t){r=h(r,"|");o[s]={attributes:c(r),attributesOrder:r,children:c(t,"|",{"#comment":{}})}});return o}k="h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,noscript,menu,isindex,samp,header,footer,article,section,hgroup";k=c(k,",",c(k.toUpperCase()));g=a({Z:"H|K|N|O|P",Y:"X|form|R|Q",ZG:"E|span|width|align|char|charoff|valign",X:"p|T|div|U|W|isindex|fieldset|table",ZF:"E|align|char|charoff|valign",W:"pre|hr|blockquote|address|center|noframes",ZE:"abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height",ZD:"[E][S]",U:"ul|ol|dl|menu|dir",ZC:"p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"X|S|Q",S:"R|P",ZA:"a|G|J|M|O|P",R:"a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe",E:"A|B|C",D:"accesskey|tabindex|onfocus|onblur",C:"onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"lang|xml:lang|dir",A:"id|class|style|title"},"script[id|charset|type|language|src|defer|xml:space][]style[B|id|type|media|title|xml:space][]object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]param[id|name|value|valuetype|type][]p[E|align][#|S]a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]br[A|clear][]span[E][#|S]bdo[A|C|B][#|S]applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]h1[E|align][#|S]img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]map[B|C|A|name][X|form|Q|area]h2[E|align][#|S]iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]h3[E|align][#|S]tt[E][#|S]i[E][#|S]b[E][#|S]u[E][#|S]s[E][#|S]strike[E][#|S]big[E][#|S]small[E][#|S]font[A|B|size|color|face][#|S]basefont[id|size|color|face][]em[E][#|S]strong[E][#|S]dfn[E][#|S]code[E][#|S]q[E|cite][#|S]samp[E][#|S]kbd[E][#|S]var[E][#|S]cite[E][#|S]abbr[E][#|S]acronym[E][#|S]sub[E][#|S]sup[E][#|S]input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]optgroup[E|disabled|label][option]option[E|selected|disabled|label|value][]textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]label[E|for|accesskey|onfocus|onblur][#|S]button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[E|align][#|S]ins[E|cite|datetime][#|Y]h5[E|align][#|S]del[E|cite|datetime][#|Y]h6[E|align][#|S]div[E|align][#|Y]ul[E|type|compact][li]li[E|type|value][#|Y]ol[E|type|compact|start][li]dl[E|compact][dt|dd]dt[E][#|S]dd[E][#|Y]menu[E|compact][li]dir[E|compact][li]pre[E|width|xml:space][#|ZA]hr[E|align|noshade|size|width][]blockquote[E|cite][#|Y]address[E][#|S|p]center[E][#|Y]noframes[E][#|Y]isindex[A|B|prompt][]fieldset[E][#|legend|Y]legend[E|accesskey|align][#|S]table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]caption[E|align][#|S]col[ZG][]colgroup[ZG][col]thead[ZF][tr]tr[ZF|bgcolor][th|td]th[E|ZE][#|Y]form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]noscript[E][#|Y]td[E|ZE][#|Y]tfoot[ZF][tr]tbody[ZF][tr]area[E|D|shape|coords|href|nohref|alt|target][]base[id|href|target][]body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]");i=c("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected,preload,autoplay,loop,controls");f=c("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,source");d=l.extend(c("td,th,iframe,video,object"),f);b=c("pre,script,style");e=c("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");l.html.Schema=function(p){var x=this,m={},n={},u=[],o;p=p||{};if(p.verify_html===false){p.valid_elements="*[*]"}if(p.valid_styles){o={};j(p.valid_styles,function(z,y){o[y]=l.explode(z)})}function v(y){return new RegExp("^"+y.replace(/([?+*])/g,".$1")+"$")}function r(F){var E,A,T,P,U,z,C,O,R,K,S,W,I,D,Q,y,M,B,V,X,J,N,H=/^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,L=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,G=/[*?+]/;if(F){F=h(F);if(m["@"]){M=m["@"].attributes;B=m["@"].attributesOrder}for(E=0,A=F.length;E<A;E++){z=H.exec(F[E]);if(z){Q=z[1];K=z[2];y=z[3];R=z[4];I={};D=[];C={attributes:I,attributesOrder:D};if(Q==="#"){C.paddEmpty=true}if(Q==="-"){C.removeEmpty=true}if(M){for(X in M){I[X]=M[X]}D.push.apply(D,B)}if(R){R=h(R,"|");for(T=0,P=R.length;T<P;T++){z=L.exec(R[T]);if(z){O={};W=z[1];S=z[2].replace(/::/g,":");Q=z[3];N=z[4];if(W==="!"){C.attributesRequired=C.attributesRequired||[];C.attributesRequired.push(S);O.required=true}if(W==="-"){delete I[S];D.splice(l.inArray(D,S),1);continue}if(Q){if(Q==="="){C.attributesDefault=C.attributesDefault||[];C.attributesDefault.push({name:S,value:N});O.defaultValue=N}if(Q===":"){C.attributesForced=C.attributesForced||[];C.attributesForced.push({name:S,value:N});O.forcedValue=N}if(Q==="<"){O.validValues=c(N,"?")}}if(G.test(S)){C.attributePatterns=C.attributePatterns||[];O.pattern=v(S);C.attributePatterns.push(O)}else{if(!I[S]){D.push(S)}I[S]=O}}}}if(!M&&K=="@"){M=I;B=D}if(y){C.outputName=K;m[y]=C}if(G.test(K)){C.pattern=v(K);u.push(C)}else{m[K]=C}}}}}function t(y){m={};u=[];r(y);j(g,function(A,z){n[z]=A.children})}function q(z){var y=/^(~)?(.+)$/;if(z){j(h(z),function(C){var B=y.exec(C),D=B[1]==="~"?"span":"div",A=B[2];n[A]=n[D];j(n,function(E,F){if(E[D]){E[A]=E[D]}})})}}function s(z){var y=/^([+\-]?)(\w+)\[([^\]]+)\]$/;if(z){j(h(z),function(D){var C=y.exec(D),A,B;if(C){B=C[1];if(B){A=n[C[2]]}else{A=n[C[2]]={"#comment":{}}}A=n[C[2]];j(h(C[3],"|"),function(E){if(B==="-"){delete A[E]}else{A[E]={}}})}})}}if(!p.valid_elements){j(g,function(z,y){m[y]={attributes:z.attributes,attributesOrder:z.attributesOrder};n[y]=z.children});j(h("strong/b,em/i"),function(y){y=h(y,"/");m[y[1]].outputName=y[0]});m.img.attributesDefault=[{name:"alt",value:""}];j(h("ol,ul,li,sub,sup,blockquote,tr,div,span,font,a,table,tbody"),function(y){m[y].removeEmpty=true});j(h("p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption"),function(y){m[y].paddEmpty=true})}else{t(p.valid_elements)}q(p.custom_elements);s(p.valid_children);r(p.extended_valid_elements);s("+ol[ul|ol],+ul[ul|ol]");if(p.invalid_elements){l.each(l.explode(p.invalid_elements),function(y){if(m[y]){delete m[y]}})}x.children=n;x.styles=o;x.getBoolAttrs=function(){return i};x.getBlockElements=function(){return k};x.getShortEndedElements=function(){return f};x.getSelfClosingElements=function(){return e};x.getNonEmptyElements=function(){return d};x.getWhiteSpaceElements=function(){return b};x.isValidChild=function(y,A){var z=n[y];return !!(z&&z[A])};x.getElementRule=function(y){var A=m[y],z;if(A){return A}z=u.length;while(z--){A=u[z];if(A.pattern.test(y)){return A}}};x.addValidElements=r;x.setValidElements=t;x.addCustomElements=q;x.addValidChildren=s};l.html.Schema.boolAttrMap=i;l.html.Schema.blockElementsMap=k})(tinymce);(function(a){a.html.SaxParser=function(c,e){var b=this,d=function(){};c=c||{};b.schema=e=e||new a.html.Schema();if(c.fix_self_closing!==false){c.fix_self_closing=true}a.each("comment cdata text start end pi doctype".split(" "),function(f){if(f){b[f]=c[f]||d}});b.parse=function(q){var A=this,f,m=0,G,j,l=[],B,K,t,N,F,k,p,x,I,r,E,o,J,n,H,M,L,z,D,h,g,u,s=0,v=a.html.Entities.decode,y;function C(O){var Q,P;Q=l.length;while(Q--){if(l[Q].name===O){break}}if(Q>=0){for(P=l.length-1;P>=Q;P--){O=l[P];if(O.valid){A.end(O.name)}}l.length=Q}}D=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([^\\s\\/<>]+)\\s*((?:[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*)>))","g");h=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;g={script:/<\/script[^>]*>/gi,style:/<\/style[^>]*>/gi,noscript:/<\/noscript[^>]*>/gi};F=e.getShortEndedElements();z=e.getSelfClosingElements();k=e.getBoolAttrs();x=c.validate;y=c.fix_self_closing;while(f=D.exec(q)){if(m<f.index){A.text(v(q.substr(m,f.index-m)))}if(G=f[6]){C(G.toLowerCase())}else{if(G=f[7]){G=G.toLowerCase();p=G in F;if(y&&z[G]&&l.length>0&&l[l.length-1].name===G){C(G)}if(!x||(I=e.getElementRule(G))){r=true;if(x){J=I.attributes;n=I.attributePatterns}if(o=f[8]){B=[];B.map={};o.replace(h,function(P,O,T,S,R){var U,Q;O=O.toLowerCase();T=O in k?O:v(T||S||R||"");if(x&&O.indexOf("data-")!==0){U=J[O];if(!U&&n){Q=n.length;while(Q--){U=n[Q];if(U.pattern.test(O)){break}}if(Q===-1){U=null}}if(!U){return}if(U.validValues&&!(T in U.validValues)){return}}B.map[O]=T;B.push({name:O,value:T})})}else{B=[];B.map={}}if(x){H=I.attributesRequired;M=I.attributesDefault;L=I.attributesForced;if(L){K=L.length;while(K--){E=L[K];N=E.name;u=E.value;if(u==="{$uid}"){u="mce_"+s++}B.map[N]=u;B.push({name:N,value:u})}}if(M){K=M.length;while(K--){E=M[K];N=E.name;if(!(N in B.map)){u=E.value;if(u==="{$uid}"){u="mce_"+s++}B.map[N]=u;B.push({name:N,value:u})}}}if(H){K=H.length;while(K--){if(H[K] in B.map){break}}if(K===-1){r=false}}if(B.map["data-mce-bogus"]){r=false}}if(r){A.start(G,B,p)}}else{r=false}if(j=g[G]){j.lastIndex=m=f.index+f[0].length;if(f=j.exec(q)){if(r){t=q.substr(m,f.index-m)}m=f.index+f[0].length}else{t=q.substr(m);m=q.length}if(r&&t.length>0){A.text(t,true)}if(r){A.end(G)}D.lastIndex=m;continue}if(!p){if(!o||o.indexOf("/")!=o.length-1){l.push({name:G,valid:r})}else{if(r){A.end(G)}}}}else{if(G=f[1]){A.comment(G)}else{if(G=f[2]){A.cdata(G)}else{if(G=f[3]){A.doctype(G)}else{if(G=f[4]){A.pi(G,f[5])}}}}}}m=f.index+f[0].length}if(m<q.length){A.text(v(q.substr(m)))}for(K=l.length-1;K>=0;K--){G=l[K];if(G.valid){A.end(G.name)}}}}})(tinymce);(function(d){var c=/^[ \t\r\n]*$/,e={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};function a(k,l,j){var i,h,f=j?"lastChild":"firstChild",g=j?"prev":"next";if(k[f]){return k[f]}if(k!==l){i=k[g];if(i){return i}for(h=k.parent;h&&h!==l;h=h.parent){i=h[g];if(i){return i}}}}function b(f,g){this.name=f;this.type=g;if(g===1){this.attributes=[];this.attributes.map={}}}d.extend(b.prototype,{replace:function(g){var f=this;if(g.parent){g.remove()}f.insert(g,f);f.remove();return f},attr:function(h,l){var f=this,g,j,k;if(typeof h!=="string"){for(j in h){f.attr(j,h[j])}return f}if(g=f.attributes){if(l!==k){if(l===null){if(h in g.map){delete g.map[h];j=g.length;while(j--){if(g[j].name===h){g=g.splice(j,1);return f}}}return f}if(h in g.map){j=g.length;while(j--){if(g[j].name===h){g[j].value=l;break}}}else{g.push({name:h,value:l})}g.map[h]=l;return f}else{return g.map[h]}}},clone:function(){var g=this,n=new b(g.name,g.type),h,f,m,j,k;if(m=g.attributes){k=[];k.map={};for(h=0,f=m.length;h<f;h++){j=m[h];if(j.name!=="id"){k[k.length]={name:j.name,value:j.value};k.map[j.name]=j.value}}n.attributes=k}n.value=g.value;n.shortEnded=g.shortEnded;return n},wrap:function(g){var f=this;f.parent.insert(g,f);g.append(f);return f},unwrap:function(){var f=this,h,g;for(h=f.firstChild;h;){g=h.next;f.insert(h,f,true);h=g}f.remove()},remove:function(){var f=this,h=f.parent,g=f.next,i=f.prev;if(h){if(h.firstChild===f){h.firstChild=g;if(g){g.prev=null}}else{i.next=g}if(h.lastChild===f){h.lastChild=i;if(i){i.next=null}}else{g.prev=i}f.parent=f.next=f.prev=null}return f},append:function(h){var f=this,g;if(h.parent){h.remove()}g=f.lastChild;if(g){g.next=h;h.prev=g;f.lastChild=h}else{f.lastChild=f.firstChild=h}h.parent=f;return h},insert:function(h,f,i){var g;if(h.parent){h.remove()}g=f.parent||this;if(i){if(f===g.firstChild){g.firstChild=h}else{f.prev.next=h}h.prev=f.prev;h.next=f;f.prev=h}else{if(f===g.lastChild){g.lastChild=h}else{f.next.prev=h}h.next=f.next;h.prev=f;f.next=h}h.parent=g;return h},getAll:function(g){var f=this,h,i=[];for(h=f.firstChild;h;h=a(h,f)){if(h.name===g){i.push(h)}}return i},empty:function(){var g=this,f,h,j;if(g.firstChild){f=[];for(j=g.firstChild;j;j=a(j,g)){f.push(j)}h=f.length;while(h--){j=f[h];j.parent=j.firstChild=j.lastChild=j.next=j.prev=null}}g.firstChild=g.lastChild=null;return g},isEmpty:function(k){var f=this,j=f.firstChild,h,g;if(j){do{if(j.type===1){if(j.attributes.map["data-mce-bogus"]){continue}if(k[j.name]){return false}h=j.attributes.length;while(h--){g=j.attributes[h].name;if(g==="name"||g.indexOf("data-")===0){return false}}}if((j.type===3&&!c.test(j.value))){return false}}while(j=a(j,f))}return true}});d.extend(b,{create:function(g,f){var i,h;i=new b(g,e[g]||1);if(f){for(h in f){i.attr(h,f[h])}}return i}});d.html.Node=b})(tinymce);(function(b){var a=b.html.Node;b.html.DomParser=function(g,h){var f=this,e={},d=[],i={},c={};g=g||{};g.validate="validate" in g?g.validate:true;g.root_name=g.root_name||"body";f.schema=h=h||new b.html.Schema();function j(m){var o,p,x,v,z,n,q,l,t,u,k,s,y,r;s=b.makeMap("tr,td,th,tbody,thead,tfoot,table");k=h.getNonEmptyElements();for(o=0;o<m.length;o++){p=m[o];if(!p.parent){continue}v=[p];for(x=p.parent;x&&!h.isValidChild(x.name,p.name)&&!s[x.name];x=x.parent){v.push(x)}if(x&&v.length>1){v.reverse();z=n=f.filterNode(v[0].clone());for(t=0;t<v.length-1;t++){if(h.isValidChild(n.name,v[t].name)){q=f.filterNode(v[t].clone());n.append(q)}else{q=n}for(l=v[t].firstChild;l&&l!=v[t+1];){r=l.next;q.append(l);l=r}n=q}if(!z.isEmpty(k)){x.insert(z,v[0],true);x.insert(p,z)}else{x.insert(p,v[0],true)}x=v[0];if(x.isEmpty(k)||x.firstChild===x.lastChild&&x.firstChild.name==="br"){x.empty().remove()}}else{if(p.parent){if(p.name==="li"){y=p.prev;if(y&&(y.name==="ul"||y.name==="ul")){y.append(p);continue}y=p.next;if(y&&(y.name==="ul"||y.name==="ul")){y.insert(p,y.firstChild,true);continue}p.wrap(f.filterNode(new a("ul",1)));continue}if(h.isValidChild(p.parent.name,"div")&&h.isValidChild("div",p.name)){p.wrap(f.filterNode(new a("div",1)))}else{if(p.name==="style"||p.name==="script"){p.empty().remove()}else{p.unwrap()}}}}}}f.filterNode=function(m){var l,k,n;if(k in e){n=i[k];if(n){n.push(m)}else{i[k]=[m]}}l=d.length;while(l--){k=d[l].name;if(k in m.attributes.map){n=c[k];if(n){n.push(m)}else{c[k]=[m]}}}return m};f.addNodeFilter=function(k,l){b.each(b.explode(k),function(m){var n=e[m];if(!n){e[m]=n=[]}n.push(l)})};f.addAttributeFilter=function(k,l){b.each(b.explode(k),function(m){var n;for(n=0;n<d.length;n++){if(d[n].name===m){d[n].callbacks.push(l);return}}d.push({name:m,callbacks:[l]})})};f.parse=function(u,m){var n,F,z,y,B,A,v,q,D,I,x,o,C,H=[],s,k,r,p,t;m=m||{};i={};c={};o=b.extend(b.makeMap("script,style,head,html,body,title,meta,param"),h.getBlockElements());t=h.getNonEmptyElements();p=h.children;x=g.validate;r=h.getWhiteSpaceElements();C=/^[ \t\r\n]+/;s=/[ \t\r\n]+$/;k=/[ \t\r\n]+/g;function G(l,J){var K=new a(l,J),L;if(l in e){L=i[l];if(L){L.push(K)}else{i[l]=[K]}}return K}function E(K){var L,l,J;for(L=K.prev;L&&L.type===3;){l=L.value.replace(s,"");if(l.length>0){L.value=l;L=L.prev}else{J=L.prev;L.remove();L=J}}}n=new b.html.SaxParser({validate:x,fix_self_closing:!x,cdata:function(l){z.append(G("#cdata",4)).value=l},text:function(K,l){var J;if(!r[z.name]){K=K.replace(k," ");if(z.lastChild&&o[z.lastChild.name]){K=K.replace(C,"")}}if(K.length!==0){J=G("#text",3);J.raw=!!l;z.append(J).value=K}},comment:function(l){z.append(G("#comment",8)).value=l},pi:function(l,J){z.append(G(l,7)).value=J;E(z)},doctype:function(J){var l;l=z.append(G("#doctype",10));l.value=J;E(z)},start:function(l,R,K){var P,M,L,J,N,S,Q,O;L=x?h.getElementRule(l):{};if(L){P=G(L.outputName||l,1);P.attributes=R;P.shortEnded=K;z.append(P);O=p[z.name];if(O&&p[P.name]&&!O[P.name]){H.push(P)}M=d.length;while(M--){N=d[M].name;if(N in R.map){D=c[N];if(D){D.push(P)}else{c[N]=[P]}}}if(o[l]){E(P)}if(!K){z=P}}},end:function(l){var N,K,M,J,L;K=x?h.getElementRule(l):{};if(K){if(o[l]){if(!r[z.name]){for(N=z.firstChild;N&&N.type===3;){M=N.value.replace(C,"");if(M.length>0){N.value=M;N=N.next}else{J=N.next;N.remove();N=J}}for(N=z.lastChild;N&&N.type===3;){M=N.value.replace(s,"");if(M.length>0){N.value=M;N=N.prev}else{J=N.prev;N.remove();N=J}}}N=z.prev;if(N&&N.type===3){M=N.value.replace(C,"");if(M.length>0){N.value=M}else{N.remove()}}}if(K.removeEmpty||K.paddEmpty){if(z.isEmpty(t)){if(K.paddEmpty){z.empty().append(new a("#text","3")).value="\u00a0"}else{if(!z.attributes.map.name){L=z.parent;z.empty().remove();z=L;return}}}}z=z.parent}}},h);F=z=new a(g.root_name,11);n.parse(u);if(x){j(H)}for(I in i){D=e[I];y=i[I];v=y.length;while(v--){if(!y[v].parent){y.splice(v,1)}}for(B=0,A=D.length;B<A;B++){D[B](y,I,m)}}for(B=0,A=d.length;B<A;B++){D=d[B];if(D.name in c){y=c[D.name];v=y.length;while(v--){if(!y[v].parent){y.splice(v,1)}}for(v=0,q=D.callbacks.length;v<q;v++){D.callbacks[v](y,D.name,m)}}}return F};if(g.remove_trailing_brs){f.addNodeFilter("br",function(n,m){var r,q=n.length,o,u=h.getBlockElements(),k=h.getNonEmptyElements(),s,p,t;for(r=0;r<q;r++){o=n[r];s=o.parent;if(u[o.parent.name]&&o===s.lastChild){p=o.prev;while(p){t=p.name;if(t!=="span"||p.attr("data-mce-type")!=="bookmark"){if(t!=="br"){break}if(t==="br"){o=null;break}}p=p.prev}if(o){o.remove();if(s.isEmpty(k)){elementRule=h.getElementRule(s.name);if(elementRule.removeEmpty){s.remove()}else{if(elementRule.paddEmpty){s.empty().append(new b.html.Node("#text",3)).value="\u00a0"}}}}}}})}}})(tinymce);tinymce.html.Writer=function(e){var c=[],a,b,d,f,g;e=e||{};a=e.indent;b=tinymce.makeMap(e.indent_before||"");d=tinymce.makeMap(e.indent_after||"");f=tinymce.html.Entities.getEncodeFunc(e.entity_encoding||"raw",e.entities);g=e.element_format=="html";return{start:function(m,k,p){var n,j,h,o;if(a&&b[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}c.push("<",m);if(k){for(n=0,j=k.length;n<j;n++){h=k[n];c.push(" ",h.name,'="',f(h.value,true),'"')}}if(!p||g){c[c.length]=">"}else{c[c.length]=" />"}if(p&&a&&d[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}},end:function(h){var i;c.push("</",h,">");if(a&&d[h]&&c.length>0){i=c[c.length-1];if(i.length>0&&i!=="\n"){c.push("\n")}}},text:function(i,h){if(i.length>0){c[c.length]=h?i:f(i)}},cdata:function(h){c.push("<![CDATA[",h,"]]>")},comment:function(h){c.push("<!--",h,"-->")},pi:function(h,i){if(i){c.push("<?",h," ",i,"?>")}else{c.push("<?",h,"?>")}if(a){c.push("\n")}},doctype:function(h){c.push("<!DOCTYPE",h,">",a?"\n":"")},reset:function(){c.length=0},getContent:function(){return c.join("").replace(/\n$/,"")}}};(function(a){a.html.Serializer=function(c,d){var b=this,e=new a.html.Writer(c);c=c||{};c.validate="validate" in c?c.validate:true;b.schema=d=d||new a.html.Schema();b.writer=e;b.serialize=function(h){var g,i;i=c.validate;g={3:function(k,j){e.text(k.value,k.raw)},8:function(j){e.comment(j.value)},7:function(j){e.pi(j.name,j.value)},10:function(j){e.doctype(j.value)},4:function(j){e.cdata(j.value)},11:function(j){if((j=j.firstChild)){do{f(j)}while(j=j.next)}}};e.reset();function f(k){var t=g[k.type],j,o,s,r,p,u,n,m,q;if(!t){j=k.name;o=k.shortEnded;s=k.attributes;if(i&&s&&s.length>1){u=[];u.map={};q=d.getElementRule(k.name);for(n=0,m=q.attributesOrder.length;n<m;n++){r=q.attributesOrder[n];if(r in s.map){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}for(n=0,m=s.length;n<m;n++){r=s[n].name;if(!(r in u.map)){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}s=u}e.start(k.name,s,o);if(!o){if((k=k.firstChild)){do{f(k)}while(k=k.next)}e.end(j)}}else{t(k)}}if(h.type==1&&!c.inner){f(h)}else{g[11](h)}return e.getContent()}}})(tinymce);(function(h){var f=h.each,e=h.is,d=h.isWebKit,b=h.isIE,c=h.html.Entities,a=/^([a-z0-9],?)+$/i,g=h.html.Schema.blockElementsMap,i=/^[ \t\r\n]*$/;h.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(n,l){var k=this,j;k.doc=n;k.win=window;k.files={};k.cssFlicker=false;k.counter=0;k.stdMode=!h.isIE||n.documentMode>=8;k.boxModel=!h.isIE||n.compatMode=="CSS1Compat"||k.stdMode;k.hasOuterHTML="outerHTML" in n.createElement("a");k.settings=l=h.extend({keep_values:false,hex_colors:1},l);k.schema=l.schema;k.styles=new h.html.Styles({url_converter:l.url_converter,url_converter_scope:l.url_converter_scope},l.schema);if(h.isIE6){try{n.execCommand("BackgroundImageCache",false,true)}catch(m){k.cssFlicker=true}}if(b){("abbr article aside audio canvas details figcaption figure footer header hgroup mark menu meter nav output progress section summary time video").replace(/\w+/g,function(o){n.createElement(o)})}h.addUnload(k.destroy,k)},getRoot:function(){var j=this,k=j.settings;return(k&&j.get(k.root_element))||j.doc.body},getViewPort:function(k){var l,j;k=!k?this.win:k;l=k.document;j=this.boxModel?l.documentElement:l.body;return{x:k.pageXOffset||j.scrollLeft,y:k.pageYOffset||j.scrollTop,w:k.innerWidth||j.clientWidth,h:k.innerHeight||j.clientHeight}},getRect:function(m){var l,j=this,k;m=j.get(m);l=j.getPos(m);k=j.getSize(m);return{x:l.x,y:l.y,w:k.w,h:k.h}},getSize:function(m){var k=this,j,l;m=k.get(m);j=k.getStyle(m,"width");l=k.getStyle(m,"height");if(j.indexOf("px")===-1){j=0}if(l.indexOf("px")===-1){l=0}return{w:parseInt(j)||m.offsetWidth||m.clientWidth,h:parseInt(l)||m.offsetHeight||m.clientHeight}},getParent:function(l,k,j){return this.getParents(l,k,j,false)},getParents:function(u,p,l,s){var k=this,j,m=k.settings,q=[];u=k.get(u);s=s===undefined;if(m.strict_root){l=l||k.getRoot()}if(e(p,"string")){j=p;if(p==="*"){p=function(o){return o.nodeType==1}}else{p=function(o){return k.is(o,j)}}}while(u){if(u==l||!u.nodeType||u.nodeType===9){break}if(!p||p(u)){if(s){q.push(u)}else{return u}}u=u.parentNode}return s?q:null},get:function(j){var k;if(j&&this.doc&&typeof(j)=="string"){k=j;j=this.doc.getElementById(j);if(j&&j.id!==k){return this.doc.getElementsByName(k)[1]}}return j},getNext:function(k,j){return this._findSib(k,j,"nextSibling")},getPrev:function(k,j){return this._findSib(k,j,"previousSibling")},select:function(l,k){var j=this;return h.dom.Sizzle(l,j.get(k)||j.get(j.settings.root_element)||j.doc,[])},is:function(l,j){var k;if(l.length===undefined){if(j==="*"){return l.nodeType==1}if(a.test(j)){j=j.toLowerCase().split(/,/);l=l.nodeName.toLowerCase();for(k=j.length-1;k>=0;k--){if(j[k]==l){return true}}return false}}return h.dom.Sizzle.matches(j,l.nodeType?[l]:l).length>0},add:function(m,q,j,l,o){var k=this;return this.run(m,function(s){var r,n;r=e(q,"string")?k.doc.createElement(q):q;k.setAttribs(r,j);if(l){if(l.nodeType){r.appendChild(l)}else{k.setHTML(r,l)}}return !o?s.appendChild(r):r})},create:function(l,j,k){return this.add(this.doc.createElement(l),l,j,k,1)},createHTML:function(r,j,p){var q="",m=this,l;q+="<"+r;for(l in j){if(j.hasOwnProperty(l)){q+=" "+l+'="'+m.encode(j[l])+'"'}}if(typeof(p)!="undefined"){return q+">"+p+"</"+r+">"}return q+" />"},remove:function(j,k){return this.run(j,function(m){var n,l=m.parentNode;if(!l){return null}if(k){while(n=m.firstChild){if(!h.isIE||n.nodeType!==3||n.nodeValue){l.insertBefore(n,m)}else{m.removeChild(n)}}}return l.removeChild(m)})},setStyle:function(m,j,k){var l=this;return l.run(m,function(p){var o,n;o=p.style;j=j.replace(/-(\D)/g,function(r,q){return q.toUpperCase()});if(l.pixelStyles.test(j)&&(h.is(k,"number")||/^[\-0-9\.]+$/.test(k))){k+="px"}switch(j){case"opacity":if(b){o.filter=k===""?"":"alpha(opacity="+(k*100)+")";if(!m.currentStyle||!m.currentStyle.hasLayout){o.display="inline-block"}}o[j]=o["-moz-opacity"]=o["-khtml-opacity"]=k||"";break;case"float":b?o.styleFloat=k:o.cssFloat=k;break;default:o[j]=k||""}if(l.settings.update_styles){l.setAttrib(p,"data-mce-style")}})},getStyle:function(m,j,l){m=this.get(m);if(!m){return}if(this.doc.defaultView&&l){j=j.replace(/[A-Z]/g,function(n){return"-"+n});try{return this.doc.defaultView.getComputedStyle(m,null).getPropertyValue(j)}catch(k){return null}}j=j.replace(/-(\D)/g,function(o,n){return n.toUpperCase()});if(j=="float"){j=b?"styleFloat":"cssFloat"}if(m.currentStyle&&l){return m.currentStyle[j]}return m.style?m.style[j]:undefined},setStyles:function(m,n){var k=this,l=k.settings,j;j=l.update_styles;l.update_styles=0;f(n,function(o,p){k.setStyle(m,p,o)});l.update_styles=j;if(l.update_styles){k.setAttrib(m,l.cssText)}},removeAllAttribs:function(j){return this.run(j,function(m){var l,k=m.attributes;for(l=k.length-1;l>=0;l--){m.removeAttributeNode(k.item(l))}})},setAttrib:function(l,m,j){var k=this;if(!l||!m){return}if(k.settings.strict){m=m.toLowerCase()}return this.run(l,function(o){var n=k.settings;switch(m){case"style":if(!e(j,"string")){f(j,function(p,q){k.setStyle(o,q,p)});return}if(n.keep_values){if(j&&!k._isRes(j)){o.setAttribute("data-mce-style",j,2)}else{o.removeAttribute("data-mce-style",2)}}o.style.cssText=j;break;case"class":o.className=j||"";break;case"src":case"href":if(n.keep_values){if(n.url_converter){j=n.url_converter.call(n.url_converter_scope||k,j,m,o)}k.setAttrib(o,"data-mce-"+m,j,2)}break;case"shape":o.setAttribute("data-mce-style",j);break}if(e(j)&&j!==null&&j.length!==0){o.setAttribute(m,""+j,2)}else{o.removeAttribute(m,2)}})},setAttribs:function(k,l){var j=this;return this.run(k,function(m){f(l,function(o,p){j.setAttrib(m,p,o)})})},getAttrib:function(m,o,l){var j,k=this;m=k.get(m);if(!m||m.nodeType!==1){return false}if(!e(l)){l=""}if(/^(src|href|style|coords|shape)$/.test(o)){j=m.getAttribute("data-mce-"+o);if(j){return j}}if(b&&k.props[o]){j=m[k.props[o]];j=j&&j.nodeValue?j.nodeValue:j}if(!j){j=m.getAttribute(o,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(o)){if(m[k.props[o]]===true&&j===""){return o}return j?o:""}if(m.nodeName==="FORM"&&m.getAttributeNode(o)){return m.getAttributeNode(o).nodeValue}if(o==="style"){j=j||m.style.cssText;if(j){j=k.serializeStyle(k.parseStyle(j),m.nodeName);if(k.settings.keep_values&&!k._isRes(j)){m.setAttribute("data-mce-style",j)}}}if(d&&o==="class"&&j){j=j.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(b){switch(o){case"rowspan":case"colspan":if(j===1){j=""}break;case"size":if(j==="+0"||j===20||j===0){j=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(j===0){j=""}break;case"hspace":if(j===-1){j=""}break;case"maxlength":case"tabindex":if(j===32768||j===2147483647||j==="32768"){j=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(j===65535){return o}return l;case"shape":j=j.toLowerCase();break;default:if(o.indexOf("on")===0&&j){j=h._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1",""+j)}}}return(j!==undefined&&j!==null&&j!=="")?""+j:l},getPos:function(s,m){var k=this,j=0,q=0,o,p=k.doc,l;s=k.get(s);m=m||p.body;if(s){if(b&&!k.stdMode){s=s.getBoundingClientRect();o=k.boxModel?p.documentElement:p.body;j=k.getStyle(k.select("html")[0],"borderWidth");j=(j=="medium"||k.boxModel&&!k.isIE6)&&2||j;return{x:s.left+o.scrollLeft-j,y:s.top+o.scrollTop-j}}l=s;while(l&&l!=m&&l.nodeType){j+=l.offsetLeft||0;q+=l.offsetTop||0;l=l.offsetParent}l=s.parentNode;while(l&&l!=m&&l.nodeType){j-=l.scrollLeft||0;q-=l.scrollTop||0;l=l.parentNode}}return{x:j,y:q}},parseStyle:function(j){return this.styles.parse(j)},serializeStyle:function(k,j){return this.styles.serialize(k,j)},loadCSS:function(j){var l=this,m=l.doc,k;if(!j){j=""}k=l.select("head")[0];f(j.split(","),function(n){var o;if(l.files[n]){return}l.files[n]=true;o=l.create("link",{rel:"stylesheet",href:h._addVer(n)});if(b&&m.documentMode&&m.recalc){o.onload=function(){if(m.recalc){m.recalc()}o.onload=null}}k.appendChild(o)})},addClass:function(j,k){return this.run(j,function(l){var m;if(!k){return 0}if(this.hasClass(l,k)){return l.className}m=this.removeClass(l,k);return l.className=(m!=""?(m+" "):"")+k})},removeClass:function(l,m){var j=this,k;return j.run(l,function(o){var n;if(j.hasClass(o,m)){if(!k){k=new RegExp("(^|\\s+)"+m+"(\\s+|$)","g")}n=o.className.replace(k," ");n=h.trim(n!=" "?n:"");o.className=n;if(!n){o.removeAttribute("class");o.removeAttribute("className")}return n}return o.className})},hasClass:function(k,j){k=this.get(k);if(!k||!j){return false}return(" "+k.className+" ").indexOf(" "+j+" ")!==-1},show:function(j){return this.setStyle(j,"display","block")},hide:function(j){return this.setStyle(j,"display","none")},isHidden:function(j){j=this.get(j);return !j||j.style.display=="none"||this.getStyle(j,"display")=="none"},uniqueId:function(j){return(!j?"mce_":j)+(this.counter++)},setHTML:function(l,k){var j=this;return j.run(l,function(n){if(b){while(n.firstChild){n.removeChild(n.firstChild)}try{n.innerHTML="<br />"+k;n.removeChild(n.firstChild)}catch(m){n=j.create("div");n.innerHTML="<br />"+k;f(n.childNodes,function(p,o){if(o){n.appendChild(p)}})}}else{n.innerHTML=k}return k})},getOuterHTML:function(l){var k,j=this;l=j.get(l);if(!l){return null}if(l.nodeType===1&&j.hasOuterHTML){return l.outerHTML}k=(l.ownerDocument||j.doc).createElement("body");k.appendChild(l.cloneNode(true));return k.innerHTML},setOuterHTML:function(m,k,n){var j=this;function l(p,o,r){var s,q;q=r.createElement("body");q.innerHTML=o;s=q.lastChild;while(s){j.insertAfter(s.cloneNode(true),p);s=s.previousSibling}j.remove(p)}return this.run(m,function(p){p=j.get(p);if(p.nodeType==1){n=n||p.ownerDocument||j.doc;if(b){try{if(b&&p.nodeType==1){p.outerHTML=k}else{l(p,k,n)}}catch(o){l(p,k,n)}}else{l(p,k,n)}}})},decode:c.decode,encode:c.encodeAllRaw,insertAfter:function(j,k){k=this.get(k);return this.run(j,function(m){var l,n;l=k.parentNode;n=k.nextSibling;if(n){l.insertBefore(m,n)}else{l.appendChild(m)}return m})},isBlock:function(k){var j=k.nodeType;if(j){return !!(j===1&&g[k.nodeName])}return !!g[k]},replace:function(p,m,j){var l=this;if(e(m,"array")){p=p.cloneNode(true)}return l.run(m,function(k){if(j){f(h.grep(k.childNodes),function(n){p.appendChild(n)})}return k.parentNode.replaceChild(p,k)})},rename:function(m,j){var l=this,k;if(m.nodeName!=j.toUpperCase()){k=l.create(j);f(l.getAttribs(m),function(n){l.setAttrib(k,n.nodeName,l.getAttrib(m,n.nodeName))});l.replace(k,m,1)}return k||m},findCommonAncestor:function(l,j){var m=l,k;while(m){k=j;while(k&&m!=k){k=k.parentNode}if(m==k){break}m=m.parentNode}if(!m&&l.ownerDocument){return l.ownerDocument.documentElement}return m},toHex:function(j){var l=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(j);function k(m){m=parseInt(m).toString(16);return m.length>1?m:"0"+m}if(l){j="#"+k(l[1])+k(l[2])+k(l[3]);return j}return j},getClasses:function(){var n=this,j=[],m,o={},p=n.settings.class_filter,l;if(n.classes){return n.classes}function q(r){f(r.imports,function(s){q(s)});f(r.cssRules||r.rules,function(s){switch(s.type||1){case 1:if(s.selectorText){f(s.selectorText.split(","),function(t){t=t.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(t)||!/\.[\w\-]+$/.test(t)){return}l=t;t=h._replace(/.*\.([a-z0-9_\-]+).*/i,"$1",t);if(p&&!(t=p(t,l))){return}if(!o[t]){j.push({"class":t});o[t]=1}})}break;case 3:q(s.styleSheet);break}})}try{f(n.doc.styleSheets,q)}catch(k){}if(j.length>0){n.classes=j}return j},run:function(m,l,k){var j=this,n;if(j.doc&&typeof(m)==="string"){m=j.get(m)}if(!m){return false}k=k||this;if(!m.nodeType&&(m.length||m.length===0)){n=[];f(m,function(p,o){if(p){if(typeof(p)=="string"){p=j.doc.getElementById(p)}n.push(l.call(k,p,o))}});return n}return l.call(k,m)},getAttribs:function(k){var j;k=this.get(k);if(!k){return[]}if(b){j=[];if(k.nodeName=="OBJECT"){return k.attributes}if(k.nodeName==="OPTION"&&this.getAttrib(k,"selected")){j.push({specified:1,nodeName:"selected"})}k.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(l){j.push({specified:1,nodeName:l})});return j}return k.attributes},isEmpty:function(o,p){var k=this,m,j,n,q,l;o=o.firstChild;if(o){q=new h.dom.TreeWalker(o);p=p||k.schema?k.schema.getNonEmptyElements():null;do{n=o.nodeType;if(n===1){if(o.getAttribute("data-mce-bogus")){continue}if(p&&p[o.nodeName.toLowerCase()]){return false}j=k.getAttribs(o);m=o.attributes.length;while(m--){l=o.attributes[m].nodeName;if(l==="name"||l.indexOf("data-")===0){return false}}}if((n===3&&!i.test(o.nodeValue))){return false}}while(o=q.next())}return true},destroy:function(k){var j=this;if(j.events){j.events.destroy()}j.win=j.doc=j.root=j.events=null;if(!k){h.removeUnload(j.destroy)}},createRng:function(){var j=this.doc;return j.createRange?j.createRange():new h.dom.Range(this)},nodeIndex:function(o,p){var j=0,m,n,l,k;if(o){for(m=o.nodeType,o=o.previousSibling,n=o;o;o=o.previousSibling){l=o.nodeType;if(p&&l==3){k=false;try{k=o.nodeValue.length}catch(q){}if(l==m||!k){continue}}j++;m=l}}return j},split:function(n,m,q){var s=this,j=s.createRng(),o,l,p;function k(v){var t,r=v.childNodes,u=v.nodeType;if(u==1&&v.getAttribute("data-mce-type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){k(r[t])}if(u!=9){if(u==3&&v.nodeValue.length>0){if(!s.isBlock(v.parentNode)||h.trim(v.nodeValue).length>0){return}}else{if(u==1){r=v.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("data-mce-type")=="bookmark"){v.parentNode.insertBefore(r[0],v)}if(r.length||/^(br|hr|input|img)$/i.test(v.nodeName)){return}}}s.remove(v)}return v}if(n&&m){j.setStart(n.parentNode,s.nodeIndex(n));j.setEnd(m.parentNode,s.nodeIndex(m));o=j.extractContents();j=s.createRng();j.setStart(m.parentNode,s.nodeIndex(m)+1);j.setEnd(n.parentNode,s.nodeIndex(n)+1);l=j.extractContents();p=n.parentNode;p.insertBefore(k(o),n);if(q){p.replaceChild(q,m)}else{p.insertBefore(m,n)}p.insertBefore(k(l),n);s.remove(n);return q||m}},bind:function(n,j,m,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.add(n,j,m,l||this)},unbind:function(m,j,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.remove(m,j,l)},_findSib:function(m,j,k){var l=this,n=j;if(m){if(e(n,"string")){n=function(o){return l.is(o,j)}}for(m=m[k];m;m=m[k]){if(n(m)){return m}}}return null},_isRes:function(j){return/^(top|left|bottom|right|width|height)/i.test(j)||/;\s*(top|left|bottom|right|width|height)/i.test(j)}});h.DOM=new h.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(Y,t){var ab=N[h],W=N[U],aa=N[P],V=N[z],Z=t.startContainer,ad=t.startOffset,X=t.endContainer,ac=t.endOffset;if(Y===0){return G(ab,W,Z,ad)}if(Y===1){return G(aa,V,Z,ad)}if(Y===2){return G(aa,V,X,ac)}if(Y===3){return G(ab,W,X,ac)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z<Y){return -1}return 1}aa=V;while(aa&&aa.parentNode!=X){aa=aa.parentNode}if(aa){W=0;t=X.firstChild;while(t!=aa&&W<Z){W++;t=t.nextSibling}if(Z<=W){return -1}return 1}aa=X;while(aa&&aa.parentNode!=V){aa=aa.parentNode}if(aa){W=0;t=V.firstChild;while(t!=aa&&W<Y){W++;t=t.nextSibling}if(W<Y){return -1}return 1}ab=c.findCommonAncestor(X,V);ad=X;while(ad&&ad.parentNode!=ab){ad=ad.parentNode}if(!ad){ad=ab}ac=V;while(ac&&ac.parentNode!=ab){ac=ac.parentNode}if(!ac){ac=ab}if(ad==ac){return 0}t=ab.firstChild;while(t){if(t==ad){return -1}if(t==ac){return 1}t=t.nextSibling}}function B(V,Y,X){var t,W;if(V){N[h]=Y;N[U]=X}else{N[P]=Y;N[z]=X}t=N[P];while(t.parentNode){t=t.parentNode}W=N[h];while(W.parentNode){W=W.parentNode}if(W==t){if(G(N[h],N[U],N[P],N[z])>0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(g){var i=this,j="\uFEFF",e,h,d=g.dom,c=true,f=false;function b(){var n=g.getRng(),k=d.createRng(),m,o;m=n.item?n.item(0):n.parentElement();if(m.ownerDocument!=d.doc){return k}o=g.isCollapsed();if(n.item||!m.hasChildNodes()){if(o){k.setStart(m,0);k.setEnd(m,0)}else{k.setStart(m.parentNode,d.nodeIndex(m));k.setEnd(k.startContainer,k.startOffset+1)}return k}function l(s){var u,q,t,p,A=0,x,y,z,r,v;r=n.duplicate();r.collapse(s);u=d.create("a");z=r.parentElement();if(!z.hasChildNodes()){k[s?"setStart":"setEnd"](z,0);return}z.appendChild(u);r.moveToElementText(u);v=n.compareEndPoints(s?"StartToStart":"EndToEnd",r);if(v>0){k[s?"setStartAfter":"setEndAfter"](z);d.remove(u);return}p=tinymce.grep(z.childNodes);x=p.length-1;while(A<=x){y=Math.floor((A+x)/2);z.insertBefore(u,p[y]);r.moveToElementText(u);v=n.compareEndPoints(s?"StartToStart":"EndToEnd",r);if(v>0){A=y+1}else{if(v<0){x=y-1}else{found=true;break}}}q=v>0||y==0?u.nextSibling:u.previousSibling;if(q.nodeType==1){d.remove(u);t=d.nodeIndex(q);q=q.parentNode;if(!s||y>0){t++}}else{if(v>0||y==0){r.setEndPoint(s?"StartToStart":"EndToEnd",n);t=r.text.length}else{r.setEndPoint(s?"StartToStart":"EndToEnd",n);t=q.nodeValue.length-r.text.length}d.remove(u)}k[s?"setStart":"setEnd"](q,t)}l(true);if(!o){l()}return k}this.addRange=function(k){var p,n,m,r,u,s,t=g.dom.doc,o=t.body;function l(B){var x,A,v,z,y;v=d.create("a");x=B?m:u;A=B?r:s;z=p.duplicate();if(x==t||x==t.documentElement){x=o;A=0}if(x.nodeType==3){x.parentNode.insertBefore(v,x);z.moveToElementText(v);z.moveStart("character",A);d.remove(v);p.setEndPoint(B?"StartToStart":"EndToEnd",z)}else{y=x.childNodes;if(y.length){if(A>=y.length){d.insertAfter(v,y[y.length-1])}else{x.insertBefore(v,y[A])}z.moveToElementText(v)}else{v=t.createTextNode(j);x.appendChild(v);z.moveToElementText(v.parentNode);z.collapse(c)}p.setEndPoint(B?"StartToStart":"EndToEnd",z);d.remove(v)}}this.destroy();m=k.startContainer;r=k.startOffset;u=k.endContainer;s=k.endOffset;p=o.createTextRange();if(m==u&&m.nodeType==1&&r==s-1){if(r==s-1){try{n=o.createControlRange();n.addElement(m.childNodes[r]);n.select();return}catch(q){}}}l(true);l();p.select()};this.getRangeAt=function(){if(!e||!tinymce.dom.RangeUtils.compareRanges(h,g.getRng())){e=b();h=g.getRng()}try{e.startContainer.nextSibling}catch(k){e=b();h=null}return e};this.destroy=function(){h=e=null}}tinymce.dom.TridentSelection=a})();(function(){var p=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,j=0,d=Object.prototype.toString,o=false,i=true;[0,0].sort(function(){i=false;return 0});var b=function(v,e,z,A){z=z||[];e=e||document;var C=e;if(e.nodeType!==1&&e.nodeType!==9){return[]}if(!v||typeof v!=="string"){return z}var x=[],s,E,H,r,u=true,t=b.isXML(e),B=v,D,G,F,y;do{p.exec("");s=p.exec(B);if(s){B=s[3];x.push(s[1]);if(s[2]){r=s[3];break}}}while(s);if(x.length>1&&k.exec(v)){if(x.length===2&&f.relative[x[0]]){E=h(x[0]+x[1],e)}else{E=f.relative[x[0]]?[e]:b(x.shift(),e);while(x.length){v=x.shift();if(f.relative[v]){v+=x.shift()}E=h(v,E)}}}else{if(!A&&x.length>1&&e.nodeType===9&&!t&&f.match.ID.test(x[0])&&!f.match.ID.test(x[x.length-1])){D=b.find(x.shift(),e,t);e=D.expr?b.filter(D.expr,D.set)[0]:D.set[0]}if(e){D=A?{expr:x.pop(),set:a(A)}:b.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&e.parentNode?e.parentNode:e,t);E=D.expr?b.filter(D.expr,D.set):D.set;if(x.length>0){H=a(E)}else{u=false}while(x.length){G=x.pop();F=G;if(!f.relative[G]){G=""}else{F=x.pop()}if(F==null){F=e}f.relative[G](H,F,t)}}else{H=x=[]}}if(!H){H=E}if(!H){b.error(G||v)}if(d.call(H)==="[object Array]"){if(!u){z.push.apply(z,H)}else{if(e&&e.nodeType===1){for(y=0;H[y]!=null;y++){if(H[y]&&(H[y]===true||H[y].nodeType===1&&b.contains(e,H[y]))){z.push(E[y])}}}else{for(y=0;H[y]!=null;y++){if(H[y]&&H[y].nodeType===1){z.push(E[y])}}}}}else{a(H,z)}if(r){b(r,C,z,A);b.uniqueSort(z)}return z};b.uniqueSort=function(r){if(c){o=i;r.sort(c);if(o){for(var e=1;e<r.length;e++){if(r[e]===r[e-1]){r.splice(e--,1)}}}}return r};b.matches=function(e,r){return b(e,null,null,r)};b.find=function(y,e,z){var x;if(!y){return[]}for(var t=0,s=f.order.length;t<s;t++){var v=f.order[t],u;if((u=f.leftMatch[v].exec(y))){var r=u[1];u.splice(1,1);if(r.substr(r.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");x=f.find[v](u,e,z);if(x!=null){y=y.replace(f.match[v],"");break}}}}if(!x){x=e.getElementsByTagName("*")}return{set:x,expr:y}};b.filter=function(C,B,F,u){var s=C,H=[],z=B,x,e,y=B&&B[0]&&b.isXML(B[0]);while(C&&B.length){for(var A in f.filter){if((x=f.leftMatch[A].exec(C))!=null&&x[2]){var r=f.filter[A],G,E,t=x[1];e=false;x.splice(1,1);if(t.substr(t.length-1)==="\\"){continue}if(z===H){H=[]}if(f.preFilter[A]){x=f.preFilter[A](x,z,F,H,u,y);if(!x){e=G=true}else{if(x===true){continue}}}if(x){for(var v=0;(E=z[v])!=null;v++){if(E){G=r(E,x,v,z);var D=u^!!G;if(F&&G!=null){if(D){e=true}else{z[v]=false}}else{if(D){H.push(E);e=true}}}}}if(G!==undefined){if(!F){z=H}C=C.replace(f.match[A],"");if(!e){return[]}break}}}if(C===s){if(e==null){b.error(C)}else{break}}s=C}return z};b.error=function(e){throw"Syntax error, unrecognized expression: "+e};var f=b.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(x,r){var t=typeof r==="string",v=t&&!/\W/.test(r),y=t&&!v;if(v){r=r.toLowerCase()}for(var s=0,e=x.length,u;s<e;s++){if((u=x[s])){while((u=u.previousSibling)&&u.nodeType!==1){}x[s]=y||u&&u.nodeName.toLowerCase()===r?u||false:u===r}}if(y){b.filter(r,x,true)}},">":function(x,r){var u=typeof r==="string",v,s=0,e=x.length;if(u&&!/\W/.test(r)){r=r.toLowerCase();for(;s<e;s++){v=x[s];if(v){var t=v.parentNode;x[s]=t.nodeName.toLowerCase()===r?t:false}}}else{for(;s<e;s++){v=x[s];if(v){x[s]=u?v.parentNode:v.parentNode===r}}if(u){b.filter(r,x,true)}}},"":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("parentNode",r,s,t,u,v)},"~":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("previousSibling",r,s,t,u,v)}},find:{ID:function(r,s,t){if(typeof s.getElementById!=="undefined"&&!t){var e=s.getElementById(r[1]);return e?[e]:[]}},NAME:function(s,v){if(typeof v.getElementsByName!=="undefined"){var r=[],u=v.getElementsByName(s[1]);for(var t=0,e=u.length;t<e;t++){if(u[t].getAttribute("name")===s[1]){r.push(u[t])}}return r.length===0?null:r}},TAG:function(e,r){return r.getElementsByTagName(e[1])}},preFilter:{CLASS:function(t,r,s,e,x,y){t=" "+t[1].replace(/\\/g,"")+" ";if(y){return t}for(var u=0,v;(v=r[u])!=null;u++){if(v){if(x^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(t)>=0)){if(!s){e.push(v)}}else{if(s){r[u]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(r,e){return r[1].toLowerCase()},CHILD:function(e){if(e[1]==="nth"){var r=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]==="even"&&"2n"||e[2]==="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(r[1]+(r[2]||1))-0;e[3]=r[3]-0}e[0]=j++;return e},ATTR:function(u,r,s,e,v,x){var t=u[1].replace(/\\/g,"");if(!x&&f.attrMap[t]){u[1]=f.attrMap[t]}if(u[2]==="~="){u[4]=" "+u[4]+" "}return u},PSEUDO:function(u,r,s,e,v){if(u[1]==="not"){if((p.exec(u[3])||"").length>1||/^\w/.test(u[3])){u[3]=b(u[3],null,null,r)}else{var t=b.filter(u[3],r,s,true^v);if(!s){e.push.apply(e,t)}return false}}else{if(f.match.POS.test(u[0])||f.match.CHILD.test(u[0])){return true}}return u},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(s,r,e){return !!b(e[3],s).length},header:function(e){return(/h\d/i).test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toLowerCase()==="button"},input:function(e){return(/input|select|textarea|button/i).test(e.nodeName)}},setFilters:{first:function(r,e){return e===0},last:function(s,r,e,t){return r===t.length-1},even:function(r,e){return e%2===0},odd:function(r,e){return e%2===1},lt:function(s,r,e){return r<e[3]-0},gt:function(s,r,e){return r>e[3]-0},nth:function(s,r,e){return e[3]-0===r},eq:function(s,r,e){return e[3]-0===r}},filter:{PSEUDO:function(s,y,x,z){var e=y[1],r=f.filters[e];if(r){return r(s,x,y,z)}else{if(e==="contains"){return(s.textContent||s.innerText||b.getText([s])||"").indexOf(y[3])>=0}else{if(e==="not"){var t=y[3];for(var v=0,u=t.length;v<u;v++){if(t[v]===s){return false}}return true}else{b.error("Syntax error, unrecognized expression: "+e)}}}},CHILD:function(e,t){var x=t[1],r=e;switch(x){case"only":case"first":while((r=r.previousSibling)){if(r.nodeType===1){return false}}if(x==="first"){return true}r=e;case"last":while((r=r.nextSibling)){if(r.nodeType===1){return false}}return true;case"nth":var s=t[2],A=t[3];if(s===1&&A===0){return true}var v=t[0],z=e.parentNode;if(z&&(z.sizcache!==v||!e.nodeIndex)){var u=0;for(r=z.firstChild;r;r=r.nextSibling){if(r.nodeType===1){r.nodeIndex=++u}}z.sizcache=v}var y=e.nodeIndex-A;if(s===0){return y===0}else{return(y%s===0&&y/s>=0)}}},ID:function(r,e){return r.nodeType===1&&r.getAttribute("id")===e},TAG:function(r,e){return(e==="*"&&r.nodeType===1)||r.nodeName.toLowerCase()===e},CLASS:function(r,e){return(" "+(r.className||r.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(v,t){var s=t[1],e=f.attrHandle[s]?f.attrHandle[s](v):v[s]!=null?v[s]:v.getAttribute(s),x=e+"",u=t[2],r=t[4];return e==null?u==="!=":u==="="?x===r:u==="*="?x.indexOf(r)>=0:u==="~="?(" "+x+" ").indexOf(r)>=0:!r?x&&e!==false:u==="!="?x!==r:u==="^="?x.indexOf(r)===0:u==="$="?x.substr(x.length-r.length)===r:u==="|="?x===r||x.substr(0,r.length+1)===r+"-":false},POS:function(u,r,s,v){var e=r[2],t=f.setFilters[e];if(t){return t(u,s,r,v)}}}};var k=f.match.POS,g=function(r,e){return"\\"+(e-0+1)};for(var m in f.match){f.match[m]=new RegExp(f.match[m].source+(/(?![^\[]*\])(?![^\(]*\))/.source));f.leftMatch[m]=new RegExp(/(^(?:.|\r|\n)*?)/.source+f.match[m].source.replace(/\\(\d+)/g,g))}var a=function(r,e){r=Array.prototype.slice.call(r,0);if(e){e.push.apply(e,r);return e}return r};try{Array.prototype.slice.call(document.documentElement.childNodes,0)[0].nodeType}catch(l){a=function(u,t){var r=t||[],s=0;if(d.call(u)==="[object Array]"){Array.prototype.push.apply(r,u)}else{if(typeof u.length==="number"){for(var e=u.length;s<e;s++){r.push(u[s])}}else{for(;u[s];s++){r.push(u[s])}}}return r}}var c;if(document.documentElement.compareDocumentPosition){c=function(r,e){if(!r.compareDocumentPosition||!e.compareDocumentPosition){if(r==e){o=true}return r.compareDocumentPosition?-1:1}var s=r.compareDocumentPosition(e)&4?-1:r===e?0:1;if(s===0){o=true}return s}}else{if("sourceIndex" in document.documentElement){c=function(r,e){if(!r.sourceIndex||!e.sourceIndex){if(r==e){o=true}return r.sourceIndex?-1:1}var s=r.sourceIndex-e.sourceIndex;if(s===0){o=true}return s}}else{if(document.createRange){c=function(t,r){if(!t.ownerDocument||!r.ownerDocument){if(t==r){o=true}return t.ownerDocument?-1:1}var s=t.ownerDocument.createRange(),e=r.ownerDocument.createRange();s.setStart(t,0);s.setEnd(t,0);e.setStart(r,0);e.setEnd(r,0);var u=s.compareBoundaryPoints(Range.START_TO_END,e);if(u===0){o=true}return u}}}}b.getText=function(e){var r="",t;for(var s=0;e[s];s++){t=e[s];if(t.nodeType===3||t.nodeType===4){r+=t.nodeValue}else{if(t.nodeType!==8){r+=b.getText(t.childNodes)}}}return r};(function(){var r=document.createElement("div"),s="script"+(new Date()).getTime();r.innerHTML="<a name='"+s+"'/>";var e=document.documentElement;e.insertBefore(r,e.firstChild);if(document.getElementById(s)){f.find.ID=function(u,v,x){if(typeof v.getElementById!=="undefined"&&!x){var t=v.getElementById(u[1]);return t?t.id===u[1]||typeof t.getAttributeNode!=="undefined"&&t.getAttributeNode("id").nodeValue===u[1]?[t]:undefined:[]}};f.filter.ID=function(v,t){var u=typeof v.getAttributeNode!=="undefined"&&v.getAttributeNode("id");return v.nodeType===1&&u&&u.nodeValue===t}}e.removeChild(r);e=r=null})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){f.find.TAG=function(r,v){var u=v.getElementsByTagName(r[1]);if(r[1]==="*"){var t=[];for(var s=0;u[s];s++){if(u[s].nodeType===1){t.push(u[s])}}u=t}return u}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){f.attrHandle.href=function(r){return r.getAttribute("href",2)}}e=null})();if(document.querySelectorAll){(function(){var e=b,s=document.createElement("div");s.innerHTML="<p class='TEST'></p>";if(s.querySelectorAll&&s.querySelectorAll(".TEST").length===0){return}b=function(x,v,t,u){v=v||document;if(!u&&v.nodeType===9&&!b.isXML(v)){try{return a(v.querySelectorAll(x),t)}catch(y){}}return e(x,v,t,u)};for(var r in e){b[r]=e[r]}s=null})()}(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(!e.getElementsByClassName||e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}f.order.splice(1,0,"CLASS");f.find.CLASS=function(r,s,t){if(typeof s.getElementsByClassName!=="undefined"&&!t){return s.getElementsByClassName(r[1])}};e=null})();function n(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1&&!z){e.sizcache=v;e.sizset=t}if(e.nodeName.toLowerCase()===x){u=e;break}e=e[r]}A[t]=u}}}function q(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1){if(!z){e.sizcache=v;e.sizset=t}if(typeof x!=="string"){if(e===x){u=true;break}}else{if(b.filter(x,[e]).length>0){u=e;break}}}e=e[r]}A[t]=u}}}b.contains=document.compareDocumentPosition?function(r,e){return !!(r.compareDocumentPosition(e)&16)}:function(r,e){return r!==e&&(r.contains?r.contains(e):true)};b.isXML=function(e){var r=(e?e.ownerDocument||e:0).documentElement;return r?r.nodeName!=="HTML":false};var h=function(e,y){var t=[],u="",v,s=y.nodeType?[y]:y;while((v=f.match.PSEUDO.exec(e))){u+=v[0];e=e.replace(f.match.PSEUDO,"")}e=f.relative[e]?e+"*":e;for(var x=0,r=s.length;x<r;x++){b(e,s[x],t)}return b.filter(u,t)};window.tinymce.dom.Sizzle=b})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}if(c.isIE&&i.boxModel){this._fixIESelection()}c.addUnload(f.destroy,f)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML=h.item?h.item(0).outerHTML:h.htmlText}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(k,j){var h=this,f=h.getRng(),i,l=h.win.document,m,g;j=j||{format:"html"};j.set=true;k=j.content=k;if(!j.no_events){h.onBeforeSetContent.dispatch(h,j)}k=j.content;if(f.insertNode){k+='<span id="__caret">_</span>';if(f.startContainer==l&&f.endContainer==l){l.body.innerHTML=k}else{f.deleteContents();if(l.body.childNodes.length==0){l.body.innerHTML=k}else{if(f.createContextualFragment){f.insertNode(f.createContextualFragment(k))}else{m=l.createDocumentFragment();g=l.createElement("div");m.appendChild(g);g.outerHTML=k;f.insertNode(m)}}}i=h.dom.get("__caret");f=l.createRange();f.setStartBefore(i);f.setEndBefore(i);h.setRng(f);h.dom.remove("__caret");h.setRng(f)}else{if(f.item){l.execCommand("Delete",false,null);f=h.getRng()}f.pasteHTML(k)}if(!j.no_events){h.onSetContent.dispatch(h,j)}},getStart:function(){var g=this.getRng(),h,f,j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}j=g.duplicate();j.collapse(1);h=j.parentElement();f=i=g.parentElement();while(i=i.parentNode){if(i==h){h=f;break}}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(r,s){var v=this,m=v.dom,g,j,i,n,h,o,p,l="\uFEFF",u;function f(x,y){var t=0;d(m.select(x),function(A,z){if(A==y){t=z}});return t}if(r==2){function k(){var x=v.getRng(true),t=m.getRoot(),y={};function z(C,H){var B=C[H?"startContainer":"endContainer"],G=C[H?"startOffset":"endOffset"],A=[],D,F,E=0;if(B.nodeType==3){if(s){for(D=B.previousSibling;D&&D.nodeType==3;D=D.previousSibling){G+=D.nodeValue.length}}A.push(G)}else{F=B.childNodes;if(G>=F.length&&F.length){E=1;G=Math.max(0,F.length-1)}A.push(v.dom.nodeIndex(F[G],s)+E)}for(;B&&B!=t;B=B.parentNode){A.push(v.dom.nodeIndex(B,s))}return A}y.start=z(x,true);if(!v.isCollapsed()){y.end=z(x)}return y}return k()}if(r){return{rng:v.getRng()}}g=v.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();u="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();try{g.collapse();g.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_start" style="'+u+'">'+l+"</span>");if(!n){j.collapse(false);g.moveToElementText(j.parentElement());if(g.compareEndPoints("StartToEnd",j)==0){j.move("character",-1)}j.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_end" style="'+u+'">'+l+"</span>")}}catch(q){return null}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=v.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_end",style:u},l))}g.collapse(true);g.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_start",style:u},l))}v.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(n){var r=this,l=r.dom,i,h,f,q,j,s,o,p;if(r.tridentSel){r.tridentSel.destroy()}if(n){if(n.start){f=l.createRng();q=l.getRoot();function g(z){var t=n[z?"start":"end"],v,x,y,u;if(t){y=t[0];for(x=q,v=t.length-1;v>=1;v--){u=x.childNodes;if(t[v]>u.length-1){return}x=u[t[v]]}if(x.nodeType===3){y=Math.min(t[0],x.nodeValue.length)}if(x.nodeType===1){y=Math.min(t[0],x.childNodes.length)}if(z){f.setStart(x,y)}else{f.setEnd(x,y)}}return true}if(g(true)&&g()){r.setRng(f)}}else{if(n.id){function k(A){var u=l.get(n.id+"_"+A),z,t,x,y,v=n.keep;if(u){z=u.parentNode;if(A=="start"){if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}j=s=z;o=p=t}else{if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}s=z;p=t}if(!v){y=u.previousSibling;x=u.nextSibling;d(c.grep(u.childNodes),function(B){if(B.nodeType==3){B.nodeValue=B.nodeValue.replace(/\uFEFF/g,"")}});while(u=l.get(n.id+"_"+A)){l.remove(u,1)}if(y&&x&&y.nodeType==x.nodeType&&y.nodeType==3&&!c.isOpera){t=y.nodeValue.length;y.appendData(x.nodeValue);l.remove(x);if(A=="start"){j=s=y;o=p=t}else{s=y;p=t}}}}}function m(t){if(l.isBlock(t)&&!t.innerHTML){t.innerHTML=!a?'<br data-mce-bogus="1" />':" "}return t}k("start");k("end");if(j){f=l.createRng();f.setStart(m(j),o);f.setEnd(m(s),p);r.setRng(f)}}else{if(n.name){r.select(l.select(n.name)[n.index])}else{if(n.rng){r.setRng(n.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;if(k){f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g)}return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var h=this,g=h.getRng(),i;if(g.item){i=g.item(0);g=h.win.document.body.createTextRange();g.moveToElementText(i)}g.collapse(!!f);h.setRng(g)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(l){var g=this,h,i,k,j=g.win.document;if(l&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():j.createRange())}}catch(f){}if(c.isIE&&i&&i.setStart&&j.selection.createRange().item){k=j.selection.createRange().item(0);i=j.createRange();i.setStartBefore(k);i.setEndAfter(k)}if(!i){i=j.createRange?j.createRange():j.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;try{h.removeAllRanges()}catch(f){}h.addRange(i);g.selectedRange=h.getRangeAt(0)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var h=this,g=h.getRng(),i=h.getSel(),l,k=g.startContainer,f=g.endContainer;if(!g){return h.dom.getRoot()}if(g.setStart){l=g.commonAncestorContainer;if(!g.collapsed){if(g.startContainer==g.endContainer){if(g.endOffset-g.startOffset<2){if(g.startContainer.hasChildNodes()){l=g.startContainer.childNodes[g.startOffset]}}}if(k.nodeType===3&&f.nodeType===3){function j(p,m){var o=p;while(p&&p.nodeType===3&&p.length===0){p=m?p.nextSibling:p.previousSibling}return p||o}if(k.length===g.startOffset){k=j(k.nextSibling,true)}else{k=k.parentNode}if(g.endOffset===0){f=j(f.previousSibling,false)}else{f=f.parentNode}if(k&&k===f){return k}}}if(l&&l.nodeType==3){return l.parentNode}return l}return g.item?g.item(0):g.parentElement()},getSelectedBlocks:function(g,f){var i=this,j=i.dom,m,h,l,k=[];m=j.getParent(g||i.getStart(),j.isBlock);h=j.getParent(f||i.getEnd(),j.isBlock);if(m){k.push(m)}if(m&&h&&m!=h){l=m;while((l=l.nextSibling)&&l!=h){if(j.isBlock(l)){k.push(l)}}}if(h&&m!=h){k.push(h)}return k},destroy:function(g){var f=this;f.win=null;if(f.tridentSel){f.tridentSel.destroy()}if(!g){c.removeUnload(f.destroy)}},_fixIESelection:function(){var g=this.dom,m=g.doc,h=m.body,j,n,f;m.documentElement.unselectable=true;function i(o,r){var p=h.createTextRange();try{p.moveToPoint(o,r)}catch(q){p=null}return p}function l(p){var o;if(p.button){o=i(p.x,p.y);if(o){if(o.compareEndPoints("StartToStart",n)>0){o.setEndPoint("StartToStart",n)}else{o.setEndPoint("EndToEnd",n)}o.select()}}else{k()}}function k(){var o=m.selection.createRange();if(n&&!o.item&&o.compareEndPoints("StartToEnd",o)===0){n.select()}g.unbind(m,"mouseup",k);g.unbind(m,"mousemove",l);n=j=0}g.bind(m,["mousedown","contextmenu"],function(o){if(o.target.nodeName==="HTML"){if(j){k()}f=m.documentElement;if(f.scrollHeight>f.clientHeight){return}j=1;n=i(o.x,o.y);if(n){g.bind(m,"mouseup",k);g.bind(m,"mousemove",l);g.win.focus();n.select()}}})}})})(tinymce);(function(a){a.dom.Serializer=function(e,i,f){var h,b,d=a.isIE,g=a.each,c;if(!e.apply_source_formatting){e.indent=false}e.remove_trailing_brs=true;i=i||a.DOM;f=f||new a.html.Schema(e);e.entity_encoding=e.entity_encoding||"named";h=new a.util.Dispatcher(self);b=new a.util.Dispatcher(self);c=new a.html.DomParser(e,f);c.addAttributeFilter("src,href,style",function(k,j){var o=k.length,l,q,n="data-mce-"+j,p=e.url_converter,r=e.url_converter_scope,m;while(o--){l=k[o];q=l.attributes.map[n];if(q!==m){l.attr(j,q.length>0?q:null);l.attr(n,null)}else{q=l.attributes.map[j];if(j==="style"){q=i.serializeStyle(i.parseStyle(q),l.name)}else{if(p){q=p.call(r,q,j,l.name)}}l.attr(j,q.length>0?q:null)}}});c.addAttributeFilter("class",function(j,k){var l=j.length,m,n;while(l--){m=j[l];n=m.attr("class").replace(/\s*mce(Item\w+|Selected)\s*/g,"");m.attr("class",n.length>0?n:null)}});c.addAttributeFilter("data-mce-type",function(j,l,k){var m=j.length,n;while(m--){n=j[m];if(n.attributes.map["data-mce-type"]==="bookmark"&&!k.cleanup){n.remove()}}});c.addNodeFilter("script,style",function(k,l){var m=k.length,n,o;function j(p){return p.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g,"").replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g,"")}while(m--){n=k[m];o=n.firstChild?n.firstChild.value:"";if(l==="script"){n.attr("type",(n.attr("type")||"text/javascript").replace(/^mce\-/,""));if(o.length>0){n.firstChild.value="// <![CDATA[\n"+j(o)+"\n// ]]>"}}else{if(o.length>0){n.firstChild.value="<!--\n"+j(o)+"\n-->"}}}});c.addNodeFilter("#comment",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.value.indexOf("[CDATA[")===0){m.name="#cdata";m.type=4;m.value=m.value.replace(/^\[CDATA\[|\]\]$/g,"")}else{if(m.value.indexOf("mce:protected ")===0){m.name="#text";m.type=3;m.raw=true;m.value=unescape(m.value).substr(14)}}}});c.addNodeFilter("xml:namespace,input",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.type===7){m.remove()}else{if(m.type===1){if(k==="input"&&!("type" in m.attributes.map)){m.attr("type","text")}}}}});if(e.fix_list_elements){c.addNodeFilter("ul,ol",function(k,l){var m=k.length,n,j;while(m--){n=k[m];j=n.parent;if(j.name==="ul"||j.name==="ol"){if(n.prev&&n.prev.name==="li"){n.prev.append(n)}}}})}c.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style",function(j,k){var l=j.length;while(l--){j[l].attr(k,null)}});return{schema:f,addNodeFilter:c.addNodeFilter,addAttributeFilter:c.addAttributeFilter,onPreProcess:h,onPostProcess:b,serialize:function(o,m){var l,p,k,j,n;if(d&&i.select("script,style,select").length>0){n=o.innerHTML;o=o.cloneNode(false);i.setHTML(o,n)}else{o=o.cloneNode(true)}l=o.ownerDocument.implementation;if(l.createHTMLDocument){p=l.createHTMLDocument("");g(o.nodeName=="BODY"?o.childNodes:[o],function(q){p.body.appendChild(p.importNode(q,true))});if(o.nodeName!="BODY"){o=p.body.firstChild}else{o=p.body}k=i.doc;i.doc=p}m=m||{};m.format=m.format||"html";if(!m.no_events){m.node=o;h.dispatch(self,m)}j=new a.html.Serializer(e,f);m.content=j.serialize(c.parse(m.getInner?o.innerHTML:a.trim(i.getOuterHTML(o),m),m));if(!m.cleanup){m.content=m.content.replace(/\uFEFF/g,"")}if(!m.no_events){b.dispatch(self,m)}if(k){i.doc=k}m.node=null;return m.content},addRules:function(j){f.addValidElements(j)},setRules:function(j){f.setValidElements(j)}}}})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,v){var x=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}v()}function u(){if(typeof(console)!=="undefined"&&console.log){console.log("Failed to load: "+m)}}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol&&o.protocol.toLowerCase()!="file"){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(y){var t=q.create("script",{type:"text/javascript"});t.text=y;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()},error:u});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});if(!a.isIE){s.onload=p}s.onerror=u;if(!a.isOpera){s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}}}(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","previousSibling",e))}};(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,r){var h=d.startContainer,k=d.startOffset,s=d.endContainer,l=d.endOffset,i,f,n,g,q,p,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(t){r([t])});return}function o(v,u,t){var x=[];for(;v&&v!=t;v=v[u]){x.push(v)}return x}function m(u,t){do{if(u.parentNode==t){return u}u=u.parentNode}while(u)}function j(v,u,x){var t=x?"nextSibling":"previousSibling";for(g=v,q=g.parentNode;g&&g!=u;g=q){q=g.parentNode;p=o(g==v?g:g[t],t);if(p.length){if(!x){p.reverse()}r(p)}}}if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[k]}if(s.nodeType==1&&s.hasChildNodes()){s=s.childNodes[Math.min(l-1,s.childNodes.length-1)]}i=c.findCommonAncestor(h,s);if(h==s){return r([h])}for(g=h;g;g=g.parentNode){if(g==s){return j(h,i,true)}if(g==i){break}}for(g=s;g;g=g.parentNode){if(g==h){return j(s,i)}if(g==i){break}}f=m(h,i)||h;n=m(s,i)||s;j(h,f,true);p=o(f==h?f:f.nextSibling,"nextSibling",n==s?n.nextSibling:n);if(p.length){r(p)}j(s,n)}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(b){var a=b.dom.Event,c=b.each;b.create("tinymce.ui.KeyboardNavigation",{KeyboardNavigation:function(e,f){var p=this,m=e.root,l=e.items,n=e.enableUpDown,i=e.enableLeftRight||!e.enableUpDown,k=e.excludeFromTabOrder,j,h,o,d,g;f=f||b.DOM;j=function(q){g=q.target.id};h=function(q){f.setAttrib(q.target.id,"tabindex","-1")};d=function(q){var r=f.get(g);f.setAttrib(r,"tabindex","0");r.focus()};p.focus=function(){f.get(g).focus()};p.destroy=function(){c(l,function(q){f.unbind(f.get(q.id),"focus",j);f.unbind(f.get(q.id),"blur",h)});f.unbind(f.get(m),"focus",d);f.unbind(f.get(m),"keydown",o);l=f=m=p.focus=j=h=o=d=null;p.destroy=function(){}};p.moveFocus=function(u,r){var q=-1,t=p.controls,s;if(!g){return}c(l,function(x,v){if(x.id===g){q=v;return false}});q+=u;if(q<0){q=l.length-1}else{if(q>=l.length){q=0}}s=l[q];f.setAttrib(g,"tabindex","-1");f.setAttrib(s.id,"tabindex","0");f.get(s.id).focus();if(e.actOnFocus){e.onAction(s.id)}if(r){a.cancel(r)}};o=function(y){var u=37,t=39,x=38,z=40,q=27,s=14,r=13,v=32;switch(y.keyCode){case u:if(i){p.moveFocus(-1)}break;case t:if(i){p.moveFocus(1)}break;case x:if(n){p.moveFocus(-1)}break;case z:if(n){p.moveFocus(1)}break;case q:if(e.onCancel){e.onCancel();a.cancel(y)}break;case s:case r:case v:if(e.onAction){e.onAction(g);a.cancel(y)}break}};c(l,function(s,q){var r;if(!s.id){s.id=f.uniqueId("_mce_item_")}if(k){f.bind(s.id,"blur",h);r="-1"}else{r=(q===0?"0":"-1")}f.setAttrib(s.id,"tabindex",r);f.bind(f.get(s.id),"focus",j)});if(l[0]){g=l[0].id}f.setAttrib(m,"tabindex","-1");f.bind(f.get(m),"focus",d);f.bind(f.get(m),"keydown",o)}})})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(f,e,d){this.id=f;this.settings=e=e||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=e.scope||this;this.disabled=0;this.active=0;this.editor=d},setAriaProperty:function(f,e){var d=b.get(this.id+"_aria")||b.get(this.id);if(d){b.setAttrib(d,"aria-"+f,!!e)}},focus:function(){b.get(this.id).focus()},setDisabled:function(d){if(d!=this.disabled){this.setAriaProperty("disabled",d);this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d;this.setAriaProperty("pressed",d)}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(c,b,a){this.parent(c,b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator";this.setDisabled(true)},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix,role:"separator","aria-orientation":"vertical",tabindex:"-1"})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.setAriaProperty("checked",!!f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;j.keyboard_focus=i.keyboard_focus;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},focus:function(){var g=this;if(g.keyboardNav){g.keyboardNav.focus()}},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return a.cancel(s)}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}a.add(o,"keydown",z._keyHandler,z);z.onShowMenu.dispatch(z);if(A.keyboard_focus){z._setupKeyboardNav()}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(h,"mouseover",g.mouseOverFunc);a.remove(c.select("a",h),"focus",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);a.remove(h,"keydown",g._keyHandler);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{role:"listbox",id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000;outline:0"});if(i.settings.parent){c.setAttrib(g,"aria-parent","menu_"+i.settings.parent.id)}k=c.add(g,"div",{role:"presentation",id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{role:"presentation",id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_setupKeyboardNav:function(){var i,h,g=this;i=c.select("#menu_"+g.id)[0];h=c.select("a[role=option]","menu_"+g.id);h.splice(0,0,i);g.keyboardNav=new e.ui.KeyboardNavigation({root:"menu_"+g.id,items:h,onCancel:function(){g.hideMenu()},enableUpDown:true});i.focus()},_keyHandler:function(g){var h=this,i;switch(g.keyCode){case 37:if(h.settings.parent){h.hideMenu();h.settings.parent.focus();a.cancel(g)}break;case 39:if(h.mouseOverFunc){h.mouseOverFunc(g)}break}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,q.titleItem?"th":"td");i=p=c.add(i,"a",{id:h.id+"_aria",role:q.titleItem?"presentation":"option",href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});if(q.parent){c.setAttrib(p,"aria-haspopup","true");c.setAttrib(p,"aria-owns","menu_"+h.id)}c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(e,d,c){this.parent(e,d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a role="button" id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" aria-labelledby="'+this.id+'_voice" title="'+a.encode(e.title)+'">';if(e.image){d+='<img class="mceIcon" src="'+e.image+'" alt="'+a.encode(e.title)+'" />'+c}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}d+='<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="'+this.id+'_voice">'+e.title+"</span>";d+="</a>";return d},postRender:function(){var c=this,d=c.settings;b.dom.Event.add(c.id,"click",function(f){if(!c.isDisabled()){return d.onclick.call(d.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(i,h,f){var g=this;g.parent(i,h,f);g.items=[];g.onChange=new a(g);g.onPostRender=new a(g);g.onAdd=new a(g);g.onRenderMenu=new d.util.Dispatcher(this);g.classPrefix="mceListBox"},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var g=this,h,i;if(f!=g.selectedIndex){h=c.get(g.id+"_text");i=g.items[f];if(i){g.selectedValue=i.value;g.selectedIndex=f;c.setHTML(h,c.encode(i.title));c.removeClass(h,"mceTitle");c.setAttrib(g.id,"aria-valuenow",i.title)}else{c.setHTML(h,c.encode(g.settings.title));c.addClass(h,"mceTitle");g.selectedValue=g.selectedIndex=null;c.setAttrib(g.id,"aria-valuenow",g.settings.title)}h=0}},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<span role="button" aria-haspopup="true" aria-labelledby="'+f.id+'_text" aria-describedby="'+f.id+'_voiceDesc"><table role="presentation" tabindex="0" id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("span",{id:f.id+"_voiceDesc","class":"voiceLabel",style:"display:none;"},f.settings.title);i+=c.createHTML("a",{id:f.id+"_text",tabindex:-1,href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},'<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>')+"</td>";i+="</tr></tbody></table></span>";return i},showMenu:function(){var g=this,j,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}j=c.getPos(this.settings.menu_container);i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;if(g.oldID){f.items[g.oldID].setSelected(0)}e(g.items,function(k){if(k.value===g.selectedValue){f.items[k.id].setSelected(1);g.oldID=k.id}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){c.removeClass(f.id,f.classPrefix+"Selected");if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(function(){g.hideMenu();g.focus()});f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id,"keydown",function(h){if(h.keyCode==32){f.showMenu(h);b.cancel(h)}});b.add(f.id,"focus",function(){if(!f._focused){f.keyDownHandler=b.add(f.id,"keydown",function(h){if(h.keyCode==40){f.showMenu();b.cancel(h)}});f.keyPressHandler=b.add(f.id,"keypress",function(i){var h;if(i.keyCode==13){h=f.selectedValue;f.selectedValue=null;b.cancel(i);f.settings.onselect(h)}})}f._focused=1});b.add(f.id,"blur",function(){b.remove(f.id,"keydown",f.keyDownHandler);b.remove(f.id,"keypress",f.keyPressHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f;this.setAriaProperty("disabled",f)},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox","aria-labelledby":f.id+"_aria"},g);g+=c.createHTML("span",{id:f.id+"_aria",style:"display: none"},f.settings.title);return g},postRender:function(){var g=this,h,i=true;g.rendered=true;function f(k){var j=g.items[k.target.selectedIndex-1];if(j&&(j=j.value)){g.onChange.dispatch(g,j);if(g.settings.onselect){g.settings.onselect(j)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(k){var j;b.remove(g.id,"change",h);i=false;j=b.add(g.id,"blur",function(){if(i){return}i=true;b.add(g.id,"change",f);b.remove(g.id,"blur",j)});if(k.keyCode==13||k.keyCode==32){f(k);return b.cancel(k)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(g,f,e){this.parent(g,f,e);this.onRenderMenu=new c.util.Dispatcher(this);f.menu_container=f.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(function(){f.hideMenu();f.focus()});f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(g,f,e){this.parent(g,f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,role:"presentation","class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}e+=b.createHTML("span",{"class":"mceVoiceLabel mceIconOnly",id:f.id+"_voice",style:"display:none;"},g.title);i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_action",tabindex:"-1",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]},'<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_open",tabindex:"-1",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";i=b.createHTML("table",{id:f.id,role:"presentation",tabindex:"0","class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",title:g.title},i);return b.createHTML("span",{role:"button","aria-labelledby":f.id+"_voice","aria-haspopup":"true"},i)},postRender:function(){var e=this,g=e.settings,f;if(g.onclick){f=function(h){if(!e.isDisabled()){g.onclick(e.value);a.cancel(h)}};a.add(e.id+"_action","click",f);a.add(e.id,["click","keydown"],function(h){var k=32,m=14,i=13,j=38,l=40;if((h.keyCode===32||h.keyCode===13||h.keyCode===14)&&!h.altKey&&!h.ctrlKey&&!h.metaKey){f();a.cancel(h)}else{if(h.type==="click"||h.keyCode===l){e.showMenu();a.cancel(h)}}})}a.add(e.id+"_open","click",function(h){e.showMenu();a.cancel(h)});a.add([e.id,e.id+"_open"],"focus",function(){e._focused=1});a.add([e.id,e.id+"_open"],"blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open");a.clear(this.id)}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(i,h,f){var g=this;g.parent(i,h,f);g.settings=h=d.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"},g.settings);g.onShowMenu=new d.util.Dispatcher(g);g.onHideMenu=new d.util.Dispatcher(g);g.value=h.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(f.isMenuVisible){if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.isMenuVisible=0}},renderMenu:function(){var p=this,h,k=0,q=p.settings,g,j,l,o,f;o=c.add(q.menu_container,"div",{role:"listbox",id:p.id+"_menu","class":q.menu_class+" "+q["class"],style:"position:absolute;left:0;top:-1000px;"});h=c.add(o,"div",{"class":q["class"]+" mceSplitButtonMenu"});c.add(h,"span",{"class":"mceMenuLine"});g=c.add(h,"table",{role:"presentation","class":"mceColorSplitMenu"});j=c.add(g,"tbody");k=0;e(b(q.colors,"array")?q.colors:q.colors.split(","),function(i){i=i.replace(/^#/,"");if(!k--){l=c.add(j,"tr");k=q.grid_width-1}g=c.add(l,"td");g=c.add(g,"a",{role:"option",href:"javascript:;",style:{backgroundColor:"#"+i},title:p.editor.getLang("colors."+i,i),"data-mce-color":"#"+i});if(p.editor.forcedHighContrastMode){g=c.add(g,"canvas",{width:16,height:16,"aria-hidden":"true"});if(g.getContext&&(f=g.getContext("2d"))){f.fillStyle="#"+i;f.fillRect(0,0,16,16)}else{c.remove(g)}}});if(q.more_colors_func){g=c.add(j,"tr");g=c.add(g,"td",{colspan:q.grid_width,"class":"mceMoreColors"});g=c.add(g,"a",{role:"option",id:p.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},q.more_colors_title);a.add(g,"click",function(i){q.more_colors_func.call(q.more_colors_scope||this);return a.cancel(i)})}c.addClass(h,"mceColorSplitMenu");new d.ui.KeyboardNavigation({root:p.id+"_menu",items:c.select("a",p.id+"_menu"),onCancel:function(){p.hideMenu();p.focus()}});a.add(p.id+"_menu","mousedown",function(i){return a.cancel(i)});a.add(p.id+"_menu","click",function(i){var m;i=c.getParent(i.target,"a",j);if(i&&i.nodeName.toLowerCase()=="a"&&(m=i.getAttribute("data-mce-color"))){p.setColor(m)}return a.cancel(i)});return o},setColor:function(f){this.displayColor(f);this.hideMenu();this.settings.onselect(f)},displayColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);(function(b){var d=b.DOM,c=b.each,a=b.dom.Event;b.create("tinymce.ui.ToolbarGroup:tinymce.ui.Container",{renderHTML:function(){var f=this,i=[],e=f.controls,j=b.each,g=f.settings;i.push('<div id="'+f.id+'" role="group" aria-labelledby="'+f.id+'_voice">');i.push("<span role='application'>");i.push('<span id="'+f.id+'_voice" class="mceVoiceLabel" style="display:none;">'+d.encode(g.name)+"</span>");j(e,function(h){i.push(h.renderHTML())});i.push("</span>");i.push("</div>");return i.join("")},focus:function(){this.keyNav.focus()},postRender:function(){var f=this,e=[];c(f.controls,function(g){c(g.controls,function(h){if(h.id){e.push(h)}})});f.keyNav=new b.ui.KeyboardNavigation({root:f.id,items:e,onCancel:function(){f.editor.focus()},excludeFromTabOrder:!f.settings.tab_focus_toolbar})},destroy:function(){var e=this;e.parent();e.keyNav.destroy();a.clear(e.id)}})})(tinymce);(function(a){var c=a.DOM,b=a.each;a.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var m=this,f="",j,k,n=m.settings,e,d,g,l;l=m.controls;for(e=0;e<l.length;e++){k=l[e];d=l[e-1];g=l[e+1];if(e===0){j="mceToolbarStart";if(k.Button){j+=" mceToolbarStartButton"}else{if(k.SplitButton){j+=" mceToolbarStartSplitButton"}else{if(k.ListBox){j+=" mceToolbarStartListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"))}if(d&&k.ListBox){if(d.Button||d.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarEnd"},c.createHTML("span",null,"<!-- IE -->"))}}if(c.stdMode){f+='<td style="position: relative">'+k.renderHTML()+"</td>"}else{f+="<td>"+k.renderHTML()+"</td>"}if(g&&k.ListBox){if(g.Button||g.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarStart"},c.createHTML("span",null,"<!-- IE -->"))}}}j="mceToolbarEnd";if(k.Button){j+=" mceToolbarEndButton"}else{if(k.SplitButton){j+=" mceToolbarEndSplitButton"}else{if(k.ListBox){j+=" mceToolbarEndListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"));return c.createHTML("table",{id:m.id,"class":"mceToolbar"+(n["class"]?" "+n["class"]:""),cellpadding:"0",cellspacing:"0",align:m.settings.align||"",role:"presentation",tabindex:"-1"},"<tbody><tr>"+f+"</tr></tbody>")}})})(tinymce);(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{AddOnManager:function(){var d=this;d.items=[];d.urls={};d.lookup={};d.onAdd=new a(d)},get:function(d){return this.lookup[d]},requireLangPack:function(e){var d=b.settings;if(d&&d.language&&d.language_load!==false){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(e,d){this.items.push(d);this.lookup[e]=d;this.onAdd.dispatch(this,e,d);return d},load:function(h,e,d,g){var f=this;if(f.urls[h]){return}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}f.urls[h]=e.substring(0,e.lastIndexOf("/"));if(!f.lookup[h]){b.ScriptLoader.add(e,d,g)}}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(m){var n=m.DOM,j=m.dom.Event,f=m.extend,k=m.util.Dispatcher,i=m.each,a=m.isGecko,b=m.isIE,e=m.isWebKit,d=m.is,h=m.ThemeManager,c=m.PluginManager,o=m.inArray,l=m.grep,g=m.explode;m.create("tinymce.Editor",{Editor:function(r,q){var p=this;p.id=p.editorId=r;p.execCommands={};p.queryStateCommands={};p.queryValueCommands={};p.isNotDirty=false;p.plugins={};i(["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(s){p[s]=new k(p)});p.settings=q=f({id:r,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:m.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:m.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,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",hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:"30px",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr",validate:true,entity_encoding:"named",url_converter:p.convertURL,url_converter_scope:p,ie7_compat:true},q);p.documentBaseURI=new m.util.URI(q.document_base_url||m.documentBaseURL,{base_uri:tinyMCE.baseURI});p.baseURI=m.baseURI;p.contentCSS=[];p.execCallback("setup",p)},render:function(r){var u=this,v=u.settings,x=u.id,p=m.ScriptLoader;if(!j.domLoaded){j.add(document,"init",function(){u.render()});return}tinyMCE.settings=v;if(!u.getElement()){return}if(m.isIDevice){return}if(!/TEXTAREA|INPUT/i.test(u.getElement().nodeName)&&v.hidden_input&&n.getParent(x,"form")){n.insertAfter(n.create("input",{type:"hidden",name:x}),x)}if(m.WindowManager){u.windowManager=new m.WindowManager(u)}if(v.encoding=="xml"){u.onGetContent.add(function(s,t){if(t.save){t.content=n.encode(t.content)}})}if(v.add_form_submit_trigger){u.onSubmit.addToTop(function(){if(u.initialized){u.save();u.isNotDirty=1}})}if(v.add_unload_trigger){u._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(u.initialized&&!u.destroyed&&!u.isHidden()){u.save({format:"raw",no_events:true})}})}m.addUnload(u.destroy,u);if(v.submit_patch){u.onBeforeRenderUI.add(function(){var s=u.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){u.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){m.triggerSave();u.isNotDirty=1;return u.formElement._mceOldSubmit(u.formElement)}}s=null})}function q(){if(v.language&&v.language_load!==false){p.add(m.baseURL+"/langs/"+v.language+".js")}if(v.theme&&v.theme.charAt(0)!="-"&&!h.urls[v.theme]){h.load(v.theme,"themes/"+v.theme+"/editor_template"+m.suffix+".js")}i(g(v.plugins),function(s){if(s&&s.charAt(0)!="-"&&!c.urls[s]){if(s=="safari"){return}c.load(s,"plugins/"+s+"/editor_plugin"+m.suffix+".js")}});p.loadQueue(function(){if(!u.removed){u.init()}})}q()},init:function(){var r,F=this,G=F.settings,C,z,B=F.getElement(),q,p,D,x,A,E,y;m.add(F);G.aria_label=G.aria_label||n.getAttrib(B,"aria-label",F.getLang("aria.rich_text_area"));if(G.theme){G.theme=G.theme.replace(/-/,"");q=h.get(G.theme);F.theme=new q();if(F.theme.init&&G.init_theme){F.theme.init(F,h.urls[G.theme]||m.documentBaseURL.replace(/\/$/,""))}}i(g(G.plugins.replace(/\-/g,"")),function(H){var I=c.get(H),t=c.urls[H]||m.documentBaseURL.replace(/\/$/,""),s;if(I){s=new I(F,t);F.plugins[H]=s;if(s.init){s.init(F,t)}}});if(G.popup_css!==false){if(G.popup_css){G.popup_css=F.documentBaseURI.toAbsolute(G.popup_css)}else{G.popup_css=F.baseURI.toAbsolute("themes/"+G.theme+"/skins/"+G.skin+"/dialog.css")}}if(G.popup_css_add){G.popup_css+=","+F.documentBaseURI.toAbsolute(G.popup_css_add)}F.controlManager=new m.ControlManager(F);if(G.custom_undo_redo){F.onBeforeExecCommand.add(function(t,H,u,I,s){if(H!="Undo"&&H!="Redo"&&H!="mceRepaint"&&(!s||!s.skip_undo)){F.undoManager.beforeChange()}});F.onExecCommand.add(function(t,H,u,I,s){if(H!="Undo"&&H!="Redo"&&H!="mceRepaint"&&(!s||!s.skip_undo)){F.undoManager.add()}})}F.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){F.nodeChanged()}});if(a){function v(s,t){if(!t||!t.initial){F.execCommand("mceRepaint")}}F.onUndo.add(v);F.onRedo.add(v);F.onSetContent.add(v)}F.onBeforeRenderUI.dispatch(F,F.controlManager);if(G.render_ui){C=G.width||B.style.width||B.offsetWidth;z=G.height||B.style.height||B.offsetHeight;F.orgDisplay=B.style.display;E=/^[0-9\.]+(|px)$/i;if(E.test(""+C)){C=Math.max(parseInt(C)+(q.deltaWidth||0),100)}if(E.test(""+z)){z=Math.max(parseInt(z)+(q.deltaHeight||0),100)}q=F.theme.renderUI({targetNode:B,width:C,height:z,deltaWidth:G.delta_width,deltaHeight:G.delta_height});F.editorContainer=q.editorContainer}if(document.domain&&location.hostname!=document.domain){m.relaxedDomain=document.domain}n.setStyles(q.sizeContainer||q.editorContainer,{width:C,height:z});if(G.content_css){m.each(g(G.content_css),function(s){F.contentCSS.push(F.documentBaseURI.toAbsolute(s))})}z=(q.iframeHeight||z)+(typeof(z)=="number"?(q.deltaHeight||0):"");if(z<100){z=100}F.iframeHTML=G.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(G.document_base_url!=m.documentBaseURL){F.iframeHTML+='<base href="'+F.documentBaseURI.getURI()+'" />'}if(G.ie7_compat){F.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'}else{F.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=edge" />'}F.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';if(!a||!/Firefox\/2/.test(navigator.userAgent)){for(y=0;y<F.contentCSS.length;y++){F.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+F.contentCSS[y]+'" />'}F.contentCSS=[]}x=G.body_id||"tinymce";if(x.indexOf("=")!=-1){x=F.getParam("body_id","","hash");x=x[F.id]||x}A=G.body_class||"";if(A.indexOf("=")!=-1){A=F.getParam("body_class","","hash");A=A[F.id]||""}F.iframeHTML+='</head><body id="'+x+'" class="mceContentBody '+A+'"></body></html>';if(m.relaxedDomain&&(b||(m.isOpera&&parseFloat(opera.version())<11))){D='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+F.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}r=n.add(q.iframeContainer,"iframe",{id:F.id+"_ifr",src:D||'javascript:""',frameBorder:"0",title:G.aria_label,style:{width:"100%",height:z}});F.contentAreaContainer=q.iframeContainer;n.get(q.editorContainer).style.display=F.orgDisplay;n.get(F.id).style.display="none";n.setAttrib(F.id,"aria-hidden",true);if(!m.relaxedDomain||!D){F.setupIframe()}B=r=q=null},setupIframe:function(){var r=this,x=r.settings,y=n.get(r.id),z=r.getDoc(),v,p;if(!b||!m.relaxedDomain){z.open();z.write(r.iframeHTML);z.close();if(m.relaxedDomain){z.domain=m.relaxedDomain}}if(!b){try{if(!x.readonly){z.designMode="On"}}catch(q){}}if(b){p=r.getBody();n.hide(p);if(!x.readonly){p.contentEditable=true}n.show(p)}r.schema=new m.html.Schema(x);r.dom=new m.dom.DOMUtils(r.getDoc(),{keep_values:true,url_converter:r.convertURL,url_converter_scope:r,hex_colors:x.force_hex_style_colors,class_filter:x.class_filter,update_styles:1,fix_ie_paragraphs:1,schema:r.schema});r.parser=new m.html.DomParser(x,r.schema);r.parser.addAttributeFilter("name",function(s,t){var B=s.length,D,A,C,E;while(B--){E=s[B];if(E.name==="a"&&E.firstChild){C=E.parent;D=E.lastChild;do{A=D.prev;C.insert(D,E);D=A}while(D)}}});r.parser.addAttributeFilter("src,href,style",function(s,t){var A=s.length,B,D=r.dom,C;while(A--){B=s[A];C=B.attr(t);if(t==="style"){B.attr("data-mce-style",D.serializeStyle(D.parseStyle(C),B.name))}else{B.attr("data-mce-"+t,r.convertURL(C,t,B.name))}}});r.parser.addNodeFilter("script",function(s,t){var A=s.length;while(A--){s[A].attr("type","mce-text/javascript")}});r.parser.addNodeFilter("#cdata",function(s,t){var A=s.length,B;while(A--){B=s[A];B.type=8;B.name="#comment";B.value="[CDATA["+B.value+"]]"}});r.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(t,A){var B=t.length,C,s=r.schema.getNonEmptyElements();while(B--){C=t[B];if(C.isEmpty(s)){C.empty().append(new m.html.Node("br",1)).shortEnded=true}}});r.serializer=new m.dom.Serializer(x,r.dom,r.schema);r.selection=new m.dom.Selection(r.dom,r.getWin(),r.serializer);r.formatter=new m.Formatter(this);r.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"}},{selector:"img,table",collapsed:false,styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"}},{selector:"img",collapsed:false,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:false,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"}},{selector:"img,table",collapsed:false,styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"}}],bold:[{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all"}],italic:[{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:true},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:false},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:false},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){r.formatter.register(s,{block:s,remove:"all"})});r.formatter.register(r.settings.formats);r.undoManager=new m.UndoManager(r);r.undoManager.onAdd.add(function(t,s){if(t.hasUndo()){return r.onChange.dispatch(r,s,t)}});r.undoManager.onUndo.add(function(t,s){return r.onUndo.dispatch(r,s,t)});r.undoManager.onRedo.add(function(t,s){return r.onRedo.dispatch(r,s,t)});r.forceBlocks=new m.ForceBlocks(r,{forced_root_block:x.forced_root_block});r.editorCommands=new m.EditorCommands(r);r.serializer.onPreProcess.add(function(s,t){return r.onPreProcess.dispatch(r,t,s)});r.serializer.onPostProcess.add(function(s,t){return r.onPostProcess.dispatch(r,t,s)});r.onPreInit.dispatch(r);if(!x.gecko_spellcheck){r.getBody().spellcheck=0}if(!x.readonly){r._addEvents()}r.controlManager.onPostRender.dispatch(r,r.controlManager);r.onPostRender.dispatch(r);if(x.directionality){r.getBody().dir=x.directionality}if(x.nowrap){r.getBody().style.whiteSpace="nowrap"}if(x.handle_node_change_callback){r.onNodeChange.add(function(t,s,A){r.execCallback("handle_node_change_callback",r.id,A,-1,-1,true,r.selection.isCollapsed())})}if(x.save_callback){r.onSaveContent.add(function(s,A){var t=r.execCallback("save_callback",r.id,A.content,r.getBody());if(t){A.content=t}})}if(x.onchange_callback){r.onChange.add(function(t,s){r.execCallback("onchange_callback",r,s)})}if(x.protect){r.onBeforeSetContent.add(function(s,t){if(x.protect){i(x.protect,function(A){t.content=t.content.replace(A,function(B){return"<!--mce:protected "+escape(B)+"-->"})})}})}if(x.convert_newlines_to_brs){r.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(x.preformatted){r.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(x.verify_css_classes){r.serializer.attribValueFilter=function(C,A){var B,t;if(C=="class"){if(!r.classesRE){t=r.dom.getClasses();if(t.length>0){B="";i(t,function(s){B+=(B?"|":"")+s["class"]});r.classesRE=new RegExp("("+B+")","gi")}}return !r.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(A)||r.classesRE.test(A)?A:""}return A}}if(x.cleanup_callback){r.onBeforeSetContent.add(function(s,t){t.content=r.execCallback("cleanup_callback","insert_to_editor",t.content,t)});r.onPreProcess.add(function(s,t){if(t.set){r.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){r.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});r.onPostProcess.add(function(s,t){if(t.set){t.content=r.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=r.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(x.save_callback){r.onGetContent.add(function(s,t){if(t.save){t.content=r.execCallback("save_callback",r.id,t.content,r.getBody())}})}if(x.handle_event_callback){r.onEvent.add(function(s,t,A){if(r.execCallback("handle_event_callback",t,s,A)===false){j.cancel(t)}})}r.onSetContent.add(function(){r.addVisual(r.getBody())});if(x.padd_empty_editor){r.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function u(s,t){i(s.dom.select("a"),function(B){var A=B.parentNode;if(s.dom.isBlock(A)&&A.lastChild===B){s.dom.add(A,"br",{"data-mce-bogus":1})}})}r.onExecCommand.add(function(s,t){if(t==="CreateLink"){u(s)}});r.onSetContent.add(r.selection.onSetContent.add(u));if(!x.readonly){try{z.designMode="Off";z.designMode="On"}catch(q){}}}setTimeout(function(){if(r.removed){return}r.load({initial:true,format:"html"});r.startContent=r.getContent({format:"raw"});r.undoManager.add();r.initialized=true;r.onInit.dispatch(r);r.execCallback("setupcontent_callback",r.id,r.getBody(),r.getDoc());r.execCallback("init_instance_callback",r);r.focus(true);r.nodeChanged({initial:1});i(r.contentCSS,function(s){r.dom.loadCSS(s)});if(x.auto_focus){setTimeout(function(){var s=m.get(x.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getWin().focus()},100)}},1);y=null},focus:function(s){var x,q=this,v=q.settings.content_editable,r,p,u=q.getDoc();if(!s){r=q.selection.getRng();if(r.item){p=r.item(0)}if(!v){q.getWin().focus()}if(p&&p.ownerDocument==u){r=u.body.createControlRange();r.addElement(p);r.select()}}if(m.activeEditor!=q){if((x=m.activeEditor)!=null){x.onDeactivate.dispatch(x,q)}q.onActivate.dispatch(q,x)}m._setActive(q)},execCallback:function(u){var p=this,r=p.settings[u],q;if(!r){return}if(p.callbackLookup&&(q=p.callbackLookup[u])){r=q.func;q=q.scope}if(d(r,"string")){q=r.replace(/\.\w+$/,"");q=q?m.resolve(q):0;r=m.resolve(r);p.callbackLookup=p.callbackLookup||{};p.callbackLookup[u]={func:r,scope:q}}return r.apply(q||p,Array.prototype.slice.call(arguments,1))},translate:function(p){var r=this.settings.language||"en",q=m.i18n;if(!p){return""}return q[r+"."+p]||p.replace(/{\#([^}]+)\}/g,function(t,s){return q[r+"."+s]||"{#"+s+"}"})},getLang:function(q,p){return m.i18n[(this.settings.language||"en")+"."+q]||(d(p)?p:"{#"+q+"}")},getParam:function(u,r,p){var s=m.trim,q=d(this.settings[u])?this.settings[u]:r,t;if(p==="hash"){t={};if(d(q,"string")){i(q.indexOf("=")>0?q.split(/[;,](?![^=;,]*(?:[;,]|$))/):q.split(","),function(x){x=x.split("=");if(x.length>1){t[s(x[0])]=s(x[1])}else{t[s(x[0])]=s(x)}})}else{t=q}return t}return q},nodeChanged:function(r){var p=this,q=p.selection,u=q.getStart()||p.getBody();if(p.initialized){r=r||{};u=b&&u.ownerDocument!=p.getDoc()?p.getBody():u;r.parents=[];p.dom.getParent(u,function(s){if(s.nodeName=="BODY"){return true}r.parents.push(s)});p.onNodeChange.dispatch(p,r?r.controlManager||p.controlManager:p.controlManager,u,q.isCollapsed(),r)}},addButton:function(r,q){var p=this;p.buttons=p.buttons||{};p.buttons[r]=q},addCommand:function(p,r,q){this.execCommands[p]={func:r,scope:q||this}},addQueryStateHandler:function(p,r,q){this.queryStateCommands[p]={func:r,scope:q||this}},addQueryValueHandler:function(p,r,q){this.queryValueCommands[p]={func:r,scope:q||this}},addShortcut:function(r,u,p,s){var q=this,v;if(!q.settings.custom_shortcuts){return false}q.shortcuts=q.shortcuts||{};if(d(p,"string")){v=p;p=function(){q.execCommand(v,false,null)}}if(d(p,"object")){v=p;p=function(){q.execCommand(v[0],v[1],v[2])}}i(g(r),function(t){var x={func:p,scope:s||this,desc:u,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(y){switch(y){case"alt":case"ctrl":case"shift":x[y]=true;break;default:x.charCode=y.charCodeAt(0);x.keyCode=y.toUpperCase().charCodeAt(0)}});q.shortcuts[(x.ctrl?"ctrl":"")+","+(x.alt?"alt":"")+","+(x.shift?"shift":"")+","+x.keyCode]=x});return true},execCommand:function(x,v,z,p){var r=this,u=0,y,q;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(x)&&(!p||!p.skip_focus)){r.focus()}y={};r.onBeforeExecCommand.dispatch(r,x,v,z,y);if(y.terminate){return false}if(r.execCallback("execcommand_callback",r.id,r.selection.getNode(),x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(y=r.execCommands[x]){q=y.func.call(y.scope,v,z);if(q!==true){r.onExecCommand.dispatch(r,x,v,z,p);return q}}i(r.plugins,function(s){if(s.execCommand&&s.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);u=1;return false}});if(u){return true}if(r.theme&&r.theme.execCommand&&r.theme.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(r.editorCommands.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}r.getDoc().execCommand(x,v,z);r.onExecCommand.dispatch(r,x,v,z,p)},queryCommandState:function(u){var q=this,v,r;if(q._isHidden()){return}if(v=q.queryStateCommands[u]){r=v.func.call(v.scope);if(r!==true){return r}}v=q.editorCommands.queryCommandState(u);if(v!==-1){return v}try{return this.getDoc().queryCommandState(u)}catch(p){}},queryCommandValue:function(v){var q=this,u,r;if(q._isHidden()){return}if(u=q.queryValueCommands[v]){r=u.func.call(u.scope);if(r!==true){return r}}u=q.editorCommands.queryCommandValue(v);if(d(u)){return u}try{return this.getDoc().queryCommandValue(v)}catch(p){}},show:function(){var p=this;n.show(p.getContainer());n.hide(p.id);p.load()},hide:function(){var p=this,q=p.getDoc();if(b&&q){q.execCommand("SelectAll")}p.save();n.hide(p.getContainer());n.setStyle(p.id,"display",p.orgDisplay)},isHidden:function(){return !n.isHidden(this.id)},setProgressState:function(p,q,r){this.onSetProgressState.dispatch(this,p,q,r);return p},load:function(s){var p=this,r=p.getElement(),q;if(r){s=s||{};s.load=true;q=p.setContent(d(r.value)?r.value:r.innerHTML,s);s.element=r;if(!s.no_events){p.onLoadContent.dispatch(p,s)}s.element=r=null;return q}},save:function(u){var p=this,s=p.getElement(),q,r;if(!s||!p.initialized){return}u=u||{};u.save=true;if(!u.no_events){p.undoManager.typing=false;p.undoManager.add()}u.element=s;q=u.content=p.getContent(u);if(!u.no_events){p.onSaveContent.dispatch(p,u)}q=u.content;if(!/TEXTAREA|INPUT/i.test(s.nodeName)){s.innerHTML=q;if(r=n.getParent(p.id,"form")){i(r.elements,function(t){if(t.name==p.id){t.value=q;return false}})}}else{s.value=q}u.element=s=null;return q},setContent:function(t,s){var r=this,q,p=r.getBody();s=s||{};s.format=s.format||"html";s.set=true;s.content=t;if(!s.no_events){r.onBeforeSetContent.dispatch(r,s)}t=s.content;if(!m.isIE&&(t.length===0||/^\s+$/.test(t))){p.innerHTML='<br data-mce-bogus="1" />';return}if(s.format!=="raw"){t=new m.html.Serializer({},r.schema).serialize(r.parser.parse(t))}s.content=m.trim(t);r.dom.setHTML(p,s.content);if(!s.no_events){r.onSetContent.dispatch(r,s)}return s.content},getContent:function(q){var p=this,r;q=q||{};q.format=q.format||"html";q.get=true;if(!q.no_events){p.onBeforeGetContent.dispatch(p,q)}if(q.format=="raw"){r=p.getBody().innerHTML}else{r=p.serializer.serialize(p.getBody(),q)}q.content=m.trim(r);if(!q.no_events){p.onGetContent.dispatch(p,q)}return q.content},isDirty:function(){var p=this;return m.trim(p.startContent)!=m.trim(p.getContent({format:"raw",no_events:1}))&&!p.isNotDirty},getContainer:function(){var p=this;if(!p.container){p.container=n.get(p.editorContainer||p.id+"_parent")}return p.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return n.get(this.settings.content_element||this.id)},getWin:function(){var p=this,q;if(!p.contentWindow){q=n.get(p.id+"_ifr");if(q){p.contentWindow=q.contentWindow}}return p.contentWindow},getDoc:function(){var q=this,p;if(!q.contentDocument){p=q.getWin();if(p){q.contentDocument=p.document}}return q.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(p,x,v){var q=this,r=q.settings;if(r.urlconverter_callback){return q.execCallback("urlconverter_callback",p,v,true,x)}if(!r.convert_urls||(v&&v.nodeName=="LINK")||p.indexOf("file:")===0){return p}if(r.relative_urls){return q.documentBaseURI.toRelative(p)}p=q.documentBaseURI.toAbsolute(p,r.remove_script_host);return p},addVisual:function(r){var p=this,q=p.settings;r=r||p.getBody();if(!d(p.hasVisual)){p.hasVisual=q.visual}i(p.dom.select("table,a",r),function(t){var s;switch(t.nodeName){case"TABLE":s=p.dom.getAttrib(t,"border");if(!s||s=="0"){if(p.hasVisual){p.dom.addClass(t,q.visual_table_class)}else{p.dom.removeClass(t,q.visual_table_class)}}return;case"A":s=p.dom.getAttrib(t,"name");if(s){if(p.hasVisual){p.dom.addClass(t,"mceItemAnchor")}else{p.dom.removeClass(t,"mceItemAnchor")}}return}});p.onVisualAid.dispatch(p,r,p.hasVisual)},remove:function(){var p=this,q=p.getContainer();p.removed=1;p.hide();p.execCallback("remove_instance_callback",p);p.onRemove.dispatch(p);p.onExecCommand.listeners=[];m.remove(p);n.remove(q)},destroy:function(q){var p=this;if(p.destroyed){return}if(!q){m.removeUnload(p.destroy);tinyMCE.onBeforeUnload.remove(p._beforeUnload);if(p.theme&&p.theme.destroy){p.theme.destroy()}p.controlManager.destroy();p.selection.destroy();p.dom.destroy();if(!p.settings.content_editable){j.clear(p.getWin());j.clear(p.getDoc())}j.clear(p.getBody());j.clear(p.formElement)}if(p.formElement){p.formElement.submit=p.formElement._mceOldSubmit;p.formElement._mceOldSubmit=null}p.contentAreaContainer=p.formElement=p.container=p.settings.content_element=p.bodyElement=p.contentDocument=p.contentWindow=null;if(p.selection){p.selection=p.selection.win=p.selection.dom=p.selection.dom.doc=null}p.destroyed=1},_addEvents:function(){var B=this,r,C=B.settings,q=B.dom,x={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function p(t,D){var s=t.type;if(B.removed){return}if(B.onEvent.dispatch(B,t,D)!==false){B[x[t.fakeType||t.type]].dispatch(B,t,D)}}i(x,function(t,s){switch(s){case"contextmenu":q.bind(B.getDoc(),s,p);break;case"paste":q.bind(B.getBody(),s,function(D){p(D)});break;case"submit":case"reset":q.bind(B.getElement().form||n.getParent(B.id,"form"),s,p);break;default:q.bind(C.content_editable?B.getBody():B.getDoc(),s,p)}});q.bind(C.content_editable?B.getBody():(a?B.getDoc():B.getWin()),"focus",function(s){B.focus(true)});if(m.isGecko){q.bind(B.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("data-mce-src"))){t.src=B.documentBaseURI.toAbsolute(s)}})}if(a){function u(){var E=this,G=E.getDoc(),F=E.settings;if(a&&!F.readonly){if(E._isHidden()){try{if(!F.content_editable){G.designMode="On"}}catch(D){}}try{G.execCommand("styleWithCSS",0,false)}catch(D){if(!E._isHidden()){try{G.execCommand("useCSS",0,true)}catch(D){}}}if(!F.table_inline_editing){try{G.execCommand("enableInlineTableEditing",false,false)}catch(D){}}if(!F.object_resizing){try{G.execCommand("enableObjectResizing",false,false)}catch(D){}}}}B.onBeforeExecCommand.add(u);B.onMouseDown.add(u)}if(m.isWebKit){B.onClick.add(function(s,t){t=t.target;if(t.nodeName=="IMG"||(t.nodeName=="A"&&q.hasClass(t,"mceItemAnchor"))){B.selection.getSel().setBaseAndExtent(t,0,t,1);B.nodeChanged()}})}B.onMouseUp.add(B.nodeChanged);B.onKeyUp.add(function(s,t){var D=t.keyCode;if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45||D==46||D==8||(m.isMac&&(D==91||D==93))||t.ctrlKey){B.nodeChanged()}});B.onReset.add(function(){B.setContent(B.startContent,{format:"raw"})});if(C.custom_shortcuts){if(C.custom_undo_redo_keyboard_shortcuts){B.addShortcut("ctrl+z",B.getLang("undo_desc"),"Undo");B.addShortcut("ctrl+y",B.getLang("redo_desc"),"Redo")}B.addShortcut("ctrl+b",B.getLang("bold_desc"),"Bold");B.addShortcut("ctrl+i",B.getLang("italic_desc"),"Italic");B.addShortcut("ctrl+u",B.getLang("underline_desc"),"Underline");for(r=1;r<=6;r++){B.addShortcut("ctrl+"+r,"",["FormatBlock",false,"h"+r])}B.addShortcut("ctrl+7","",["FormatBlock",false,"<p>"]);B.addShortcut("ctrl+8","",["FormatBlock",false,"<div>"]);B.addShortcut("ctrl+9","",["FormatBlock",false,"<address>"]);function v(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(B.shortcuts,function(D){if(m.isMac&&D.ctrl!=t.metaKey){return}else{if(!m.isMac&&D.ctrl!=t.ctrlKey){return}}if(D.alt!=t.altKey){return}if(D.shift!=t.shiftKey){return}if(t.keyCode==D.keyCode||(t.charCode&&t.charCode==D.charCode)){s=D;return false}});return s}B.onKeyUp.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyPress.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyDown.add(function(s,t){var D=v(t);if(D){D.func.call(D.scope);return j.cancel(t)}})}if(m.isIE){q.bind(B.getDoc(),"controlselect",function(D){var t=B.resizeInfo,s;D=D.target;if(D.nodeName!=="IMG"){return}if(t){q.unbind(t.node,t.ev,t.cb)}if(!q.hasClass(D,"mceItemNoResize")){ev="resizeend";s=q.bind(D,ev,function(F){var E;F=F.target;if(E=q.getStyle(F,"width")){q.setAttrib(F,"width",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"width","")}if(E=q.getStyle(F,"height")){q.setAttrib(F,"height",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"height","")}})}else{ev="resizestart";s=q.bind(D,"resizestart",j.cancel,j)}t=B.resizeInfo={node:D,ev:ev,cb:s}});B.onKeyDown.add(function(s,D){var t;switch(D.keyCode){case 8:t=B.getDoc().selection;if(t.createRange&&t.createRange().item){s.dom.remove(t.createRange().item(0));return j.cancel(D)}}})}if(m.isOpera){B.onClick.add(function(s,t){j.prevent(t)})}if(C.custom_undo_redo){function y(){B.undoManager.typing=false;B.undoManager.add()}q.bind(B.getDoc(),"focusout",function(s){if(!B.removed&&B.undoManager.typing){y()}});B.dom.bind(B.dom.getRoot(),"dragend",function(s){y()});B.onKeyUp.add(function(t,F){var s,E,D;if(b&&F.keyCode==8){s=B.selection.getRng();if(s.parentElement){E=s.parentElement();D=B.selection.getBookmark();E.innerHTML=E.innerHTML;B.selection.moveToBookmark(D)}}if((F.keyCode>=33&&F.keyCode<=36)||(F.keyCode>=37&&F.keyCode<=40)||F.keyCode==13||F.keyCode==45||F.ctrlKey){y()}});B.onKeyDown.add(function(t,H){var s,F,E,G=H.keyCode;if(b&&G==46){s=B.selection.getRng();if(s.parentElement){F=s.parentElement();if(!B.undoManager.typing){B.undoManager.beforeChange();B.undoManager.typing=true;B.undoManager.add()}if(H.ctrlKey){s.moveEnd("word",1);s.select()}B.selection.getSel().clear();if(s.parentElement()==F){E=B.selection.getBookmark();try{F.innerHTML=F.innerHTML}catch(D){}B.selection.moveToBookmark(E)}H.preventDefault();return}}if((G>=33&&G<=36)||(G>=37&&G<=40)||G==13||G==45){if(m.isIE&&G==13){B.undoManager.beforeChange()}if(B.undoManager.typing){y()}return}if((G<16||G>20)&&G!=224&&G!=91&&!B.undoManager.typing){B.undoManager.beforeChange();B.undoManager.add();B.undoManager.typing=true}});B.onMouseDown.add(function(){if(B.undoManager.typing){y()}})}if(m.isGecko){function A(){var s=B.dom.getAttribs(B.selection.getStart().cloneNode(false));return function(){var t=B.selection.getStart();B.dom.removeAllAttribs(t);i(s,function(D){t.setAttributeNode(D.cloneNode(true))})}}function z(){var t=B.selection;return !t.isCollapsed()&&t.getStart()!=t.getEnd()}B.onKeyPress.add(function(s,D){var t;if((D.keyCode==8||D.keyCode==46)&&z()){t=A();B.getDoc().execCommand("delete",false,null);t();return j.cancel(D)}});B.dom.bind(B.getDoc(),"cut",function(t){var s;if(z()){s=A();B.onKeyUp.addToTop(j.cancel,j);setTimeout(function(){s();B.onKeyUp.remove(j.cancel,j)},0)}})}},_isHidden:function(){var p;if(!a){return 0}p=this.selection.getSel();return(!p||!p.rangeCount||p.rangeCount==0)}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var l=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,o;function q(y,x,v){var u;y=y.toLowerCase();if(u=j.exec[y]){u(y,x,v);return a}return b}function m(v){var u;v=v.toLowerCase();if(u=j.state[v]){return u(v)}return -1}function h(v){var u;v=v.toLowerCase();if(u=j.value[v]){return u(v)}return b}function t(u,v){v=v||"exec";d(u,function(y,x){d(x.toLowerCase().split(","),function(z){j[v][z]=y})})}c.extend(this,{execCommand:q,queryCommandState:m,queryCommandValue:h,addCommands:t});function f(x,v,u){if(v===e){v=b}if(u===e){u=null}return n.getDoc().execCommand(x,v,u)}function s(u){return n.formatter.match(u)}function r(u,v){n.formatter.toggle(u,v?{value:v}:e)}function i(u){o=p.getBookmark(u)}function g(){p.moveToBookmark(o)}t({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(y){var x=n.getDoc(),u;try{f(y)}catch(v){u=a}if(u||!x.queryCommandSupported(y)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(z){if(z){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(u){if(p.isCollapsed()){p.select(p.getNode())}f(u);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(u){var v=u.substring(7);d("left,center,right,full".split(","),function(x){if(v!=x){n.formatter.remove("align"+x)}});r("align"+v);q("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(x){var u,v;f(x);u=l.getParent(p.getNode(),"ol,ul");if(u){v=u.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(v.nodeName)){i();l.split(v,u);g()}}},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(u){r(u)},"ForeColor,HiliteColor,FontName":function(x,v,u){r(x,u)},FontSize:function(y,x,v){var u,z;if(v>=1&&v<=7){z=c.explode(k.font_size_style_values);u=c.explode(k.font_size_classes);if(u){v=u[v-1]||v}else{v=z[v-1]||v}}r(y,v)},RemoveFormat:function(u){n.formatter.remove(u)},mceBlockQuote:function(u){r("blockquote")},FormatBlock:function(x,v,u){return r(u||"p")},mceCleanup:function(){var u=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(u)},mceRemoveNode:function(y,x,v){var u=v||p.getNode();if(u!=n.getBody()){i();n.dom.remove(u,a);g()}},mceSelectNodeDepth:function(y,x,v){var u=0;l.getParent(p.getNode(),function(z){if(z.nodeType==1&&u++==v){p.select(z);return b}},n.getBody())},mceSelectNode:function(x,v,u){p.select(u)},mceInsertContent:function(z,D,E){var C,u,x,F,y,u,A,G,B;function v(I,J,H){var K=new c.dom.TreeWalker(H?I.nextSibling:I.previousSibling,J);while((I=K.current())){if((I.nodeType==3&&c.trim(I.nodeValue).length)||I.nodeName=="BR"||I.nodeName=="IMG"){return I}if(H){K.next()}else{K.prev()}}}B={content:E,format:"html"};p.onBeforeSetContent.dispatch(p,B);E=B.content;if(E.indexOf("{$caret}")==-1){E+="{$caret}"}p.setContent('<span id="__mce">\uFEFF</span>',{no_events:false});l.setOuterHTML("__mce",E.replace(/\{\$caret\}/,'<span data-mce-type="bookmark" id="__mce">\uFEFF</span>'));C=l.select("#__mce")[0];x=l.getRoot();if(C.previousSibling&&l.isBlock(C.previousSibling)||C.parentNode==x){y=v(C,x);if(y){if(y.nodeName=="BR"){y.parentNode.insertBefore(C,y)}else{l.insertAfter(C,y)}}}while(C){if(C===x){l.setOuterHTML(F,new c.html.Serializer({},n.schema).serialize(n.parser.parse(l.getOuterHTML(F))));break}F=C;C=C.parentNode}C=l.select("#__mce")[0];if(C){y=v(C,x)||v(C,x,true);l.remove(C);if(y){u=l.createRng();if(y.nodeType==3){u.setStart(y,y.length);u.setEnd(y,y.length)}else{if(y.nodeName=="BR"){u.setStartBefore(y);u.setEndBefore(y)}else{u.setStartAfter(y);u.setEndAfter(y)}}p.setRng(u);if(!c.isIE){y=l.create("span",null,"\u00a0");u.insertNode(y);A=l.getRect(y);G=l.getViewPort(n.getWin());if((A.y>G.y+G.h||A.y<G.y)||(A.x>G.x+G.w||A.x<G.x)){n.getBody().scrollLeft=A.x;n.getBody().scrollTop=A.y}l.remove(y)}p.collapse(true)}}p.onSetContent.dispatch(p,B);n.addVisual()},mceInsertRawHTML:function(x,v,u){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return u}))},mceSetContent:function(x,v,u){n.setContent(u)},"Indent,Outdent":function(y){var v,u,x;v=k.indentation;u=/[a-z%]+$/i.exec(v);v=parseInt(v);if(!m("InsertUnorderedList")&&!m("InsertOrderedList")){d(p.getSelectedBlocks(),function(z){if(y=="outdent"){x=Math.max(0,parseInt(z.style.paddingLeft||0)-v);l.setStyle(z,"paddingLeft",x?x+u:"")}else{l.setStyle(z,"paddingLeft",(parseInt(z.style.paddingLeft||0)+v)+u)}})}else{f(y)}},mceRepaint:function(){var v;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(u){}}},mceToggleFormat:function(x,v,u){n.formatter.toggle(u)},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",false,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(x,v,u){n.execCommand("mceInsertContent",false,u.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(A,z,y){var x=l.getParent(p.getNode(),"a"),v,u;if(c.is(y,"string")){y={href:y}}y.href=y.href.replace(" ","%20");if(!x){if(c.isWebKit){v=l.getParent(p.getNode(),"img");if(v){u=v.style.cssFloat;v.style.cssFloat=null}}f("CreateLink",b,"javascript:mctmp(0);");if(u){v.style.cssFloat=u}d(l.select("a[href='javascript:mctmp(0);']"),function(B){l.setAttribs(B,y)})}else{if(y.href){l.setAttribs(x,y)}else{n.dom.remove(x,a)}}},selectAll:function(){var v=l.getRoot(),u=l.createRng();u.setStart(v,0);u.setEnd(v,v.childNodes.length);n.selection.setRng(u)}});t({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(u){return s("align"+u.substring(7))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(u){return s(u)},mceBlockQuote:function(){return s("blockquote")},Outdent:function(){var u;if(k.inline_styles){if((u=l.getParent(p.getStart(),l.isBlock))&&parseInt(u.style.paddingLeft)>0){return a}if((u=l.getParent(p.getEnd(),l.isBlock))&&parseInt(u.style.paddingLeft)>0){return a}}return m("InsertUnorderedList")||m("InsertOrderedList")||(!k.inline_styles&&!!l.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(u){return l.getParent(p.getNode(),u=="insertunorderedlist"?"UL":"OL")}},"state");t({"FontSize,FontName":function(x){var v=0,u;if(u=l.getParent(p.getNode(),"span")){if(x=="fontsize"){v=u.style.fontSize}else{v=u.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return v}},"value");if(k.custom_undo_redo){t({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(e){var c,d=0,g=[];function f(){return b.trim(e.getContent({format:"raw",no_events:1}))}return c={typing:false,onAdd:new a(c),onUndo:new a(c),onRedo:new a(c),beforeChange:function(){if(g[d]){g[d].beforeBookmark=e.selection.getBookmark(2,true)}},add:function(l){var h,j=e.settings,k;l=l||{};l.content=f();k=g[d];if(k&&k.content==l.content){return null}if(j.custom_undo_redo_levels){if(g.length>j.custom_undo_redo_levels){for(h=0;h<g.length-1;h++){g[h]=g[h+1]}g.length--;d=g.length}}l.bookmark=e.selection.getBookmark(2,true);if(d<g.length-1){g.length=d+1}g.push(l);d=g.length-1;c.onAdd.dispatch(c,l);e.isNotDirty=0;return l},undo:function(){var j,h;if(c.typing){c.add();c.typing=false}if(d>0){j=g[--d];e.setContent(j.content,{format:"raw"});e.selection.moveToBookmark(j.beforeBookmark);c.onUndo.dispatch(c,j)}return j},redo:function(){var h;if(d<g.length-1){h=g[++d];e.setContent(h.content,{format:"raw"});e.selection.moveToBookmark(h.bookmark);c.onRedo.dispatch(c,h)}return h},clear:function(){g=[];d=0;c.typing=false},hasUndo:function(){return d>0||this.typing},hasRedo:function(){return d<g.length-1&&!this.typing}}}})(tinymce);(function(l){var j=l.dom.Event,c=l.isIE,a=l.isGecko,b=l.isOpera,i=l.each,h=l.extend,d=true,g=false;function k(o){var p,n,m;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(o.nodeName)){if(p){n=o.cloneNode(false);n.appendChild(p);p=n}else{p=m=o.cloneNode(false)}p.removeAttribute("id")}}while(o=o.parentNode);if(p){return{wrapper:p,inner:m}}}function f(n,o){var m=o.ownerDocument.createRange();m.setStart(n.endContainer,n.endOffset);m.setEndAfter(o);return m.cloneContents().textContent.length==0}function e(o,q,m){var n,p;if(q.isEmpty(m)){n=q.getParent(m,"ul,ol");if(!q.getParent(n.parentNode,"ul,ol")){q.split(n,m);p=q.create("p",0,'<br data-mce-bogus="1" />');q.replace(p,m);o.select(p,1)}return g}return d}l.create("tinymce.ForceBlocks",{ForceBlocks:function(m){var n=this,o=m.settings,p;n.editor=m;n.dom=m.dom;p=(o.forced_root_block||"p").toLowerCase();o.element=p.toUpperCase();m.onPreInit.add(n.setup,n);if(o.forced_root_block){m.onInit.add(n.forceRoots,n);m.onSetContent.add(n.forceRoots,n);m.onBeforeGetContent.add(n.forceRoots,n);m.onExecCommand.add(function(q,r){if(r=="mceInsertContent"){n.forceRoots();q.nodeChanged()}})}},setup:function(){var n=this,m=n.editor,p=m.settings,r=m.dom,o=m.selection;if(p.forced_root_block){m.onBeforeExecCommand.add(n.forceRoots,n);m.onKeyUp.add(n.forceRoots,n);m.onPreProcess.add(n.forceRoots,n)}if(p.force_br_newlines){if(c){m.onKeyPress.add(function(s,t){var u;if(t.keyCode==13&&o.getNode().nodeName!="LI"){o.setContent('<br id="__" /> ',{format:"raw"});u=r.get("__");u.removeAttribute("id");o.select(u);o.collapse();return j.cancel(t)}})}}if(p.force_p_newlines){if(!c){m.onKeyPress.add(function(s,t){if(t.keyCode==13&&!t.shiftKey&&!n.insertPara(t)){j.cancel(t)}})}else{l.addUnload(function(){n._previousFormats=0});m.onKeyPress.add(function(s,t){n._previousFormats=0;if(t.keyCode==13&&!t.shiftKey&&s.selection.isCollapsed()&&p.keep_styles){n._previousFormats=k(s.selection.getStart())}});m.onKeyUp.add(function(t,v){if(v.keyCode==13&&!v.shiftKey){var u=t.selection.getStart(),s=n._previousFormats;if(!u.hasChildNodes()&&s){u=r.getParent(u,r.isBlock);if(u&&u.nodeName!="LI"){u.innerHTML="";if(n._previousFormats){u.appendChild(s.wrapper);s.inner.innerHTML="\uFEFF"}else{u.innerHTML="\uFEFF"}o.select(u,1);o.collapse(true);t.getDoc().execCommand("Delete",false,null);n._previousFormats=0}}}})}if(a){m.onKeyDown.add(function(s,t){if((t.keyCode==8||t.keyCode==46)&&!t.shiftKey){n.backspaceDelete(t,t.keyCode==8)}})}}if(l.isWebKit){function q(t){var s=o.getRng(),u,y=r.create("div",null," "),x,v=r.getViewPort(t.getWin()).h;s.insertNode(u=r.create("br"));s.setStartAfter(u);s.setEndAfter(u);o.setRng(s);if(o.getSel().focusNode==u.previousSibling){o.select(r.insertAfter(r.doc.createTextNode("\u00a0"),u));o.collapse(d)}r.insertAfter(y,u);x=r.getPos(y).y;r.remove(y);if(x>v){t.getWin().scrollTo(0,x)}}m.onKeyPress.add(function(s,t){if(t.keyCode==13&&(t.shiftKey||(p.force_br_newlines&&!r.getParent(o.getNode(),"h1,h2,h3,h4,h5,h6,ol,ul")))){q(s);j.cancel(t)}})}if(c){if(p.element!="P"){m.onKeyPress.add(function(s,t){n.lastElm=o.getNode().nodeName});m.onKeyUp.add(function(t,u){var x,v=o.getNode(),s=t.getBody();if(s.childNodes.length===1&&v.nodeName=="P"){v=r.rename(v,p.element);o.select(v);o.collapse();t.nodeChanged()}else{if(u.keyCode==13&&!u.shiftKey&&n.lastElm!="P"){x=r.getParent(v,"p");if(x){r.rename(x,p.element);t.nodeChanged()}}}})}}},find:function(u,p,q){var o=this.editor,m=o.getDoc().createTreeWalker(u,4,null,g),r=-1;while(u=m.nextNode()){r++;if(p==0&&u==q){return r}if(p==1&&r==q){return u}}return -1},forceRoots:function(v,H){var y=this,v=y.editor,L=v.getBody(),I=v.getDoc(),O=v.selection,z=O.getSel(),A=O.getRng(),M=-2,u,F,m,o,J=-16777215;var K,p,N,E,B,q=L.childNodes,D,C,x;for(D=q.length-1;D>=0;D--){K=q[D];if(K.nodeType===1&&K.getAttribute("data-mce-type")){p=null;continue}if(K.nodeType===3||(!y.dom.isBlock(K)&&K.nodeType!==8&&!/^(script|mce:script|style|mce:style)$/i.test(K.nodeName))){if(!p){if(K.nodeType!=3||/[^\s]/g.test(K.nodeValue)){if(M==-2&&A){if(!c||A.setStart){if(A.startContainer.nodeType==1&&(C=A.startContainer.childNodes[A.startOffset])&&C.nodeType==1){x=C.getAttribute("id");C.setAttribute("id","__mce")}else{if(v.dom.getParent(A.startContainer,function(n){return n===L})){F=A.startOffset;m=A.endOffset;M=y.find(L,0,A.startContainer);u=y.find(L,0,A.endContainer)}}}else{if(A.item){o=I.body.createTextRange();o.moveToElementText(A.item(0));A=o}o=I.body.createTextRange();o.moveToElementText(L);o.collapse(1);N=o.move("character",J)*-1;o=A.duplicate();o.collapse(1);E=o.move("character",J)*-1;o=A.duplicate();o.collapse(0);B=(o.move("character",J)*-1)-E;M=E-N;u=B}}p=v.dom.create(v.settings.forced_root_block);K.parentNode.replaceChild(p,K);p.appendChild(K)}}else{if(p.hasChildNodes()){p.insertBefore(K,p.firstChild)}else{p.appendChild(K)}}}else{p=null}}if(M!=-2){if(!c||A.setStart){p=L.getElementsByTagName(v.settings.element)[0];A=I.createRange();if(M!=-1){A.setStart(y.find(L,1,M),F)}else{A.setStart(p,0)}if(u!=-1){A.setEnd(y.find(L,1,u),m)}else{A.setEnd(p,0)}if(z){z.removeAllRanges();z.addRange(A)}}else{try{A=z.createRange();A.moveToElementText(L);A.collapse(1);A.moveStart("character",M);A.moveEnd("character",u);A.select()}catch(G){}}}else{if((!c||A.setStart)&&(C=v.dom.get("__mce"))){if(x){C.setAttribute("id",x)}else{C.removeAttribute("id")}A=I.createRange();A.setStartBefore(C);A.setEndBefore(C);O.setRng(A)}}},getParentBlock:function(o){var m=this.dom;return m.getParent(o,m.isBlock)},insertPara:function(R){var F=this,v=F.editor,N=v.dom,S=v.getDoc(),W=v.settings,G=v.selection.getSel(),H=G.getRangeAt(0),V=S.body;var K,L,I,P,O,q,o,u,z,m,D,U,p,x,J,M=N.getViewPort(v.getWin()),C,E,B;v.undoManager.beforeChange();K=S.createRange();K.setStart(G.anchorNode,G.anchorOffset);K.collapse(d);L=S.createRange();L.setStart(G.focusNode,G.focusOffset);L.collapse(d);I=K.compareBoundaryPoints(K.START_TO_END,L)<0;P=I?G.anchorNode:G.focusNode;O=I?G.anchorOffset:G.focusOffset;q=I?G.focusNode:G.anchorNode;o=I?G.focusOffset:G.anchorOffset;if(P===q&&/^(TD|TH)$/.test(P.nodeName)){if(P.firstChild.nodeName=="BR"){N.remove(P.firstChild)}if(P.childNodes.length==0){v.dom.add(P,W.element,null,"<br />");U=v.dom.add(P,W.element,null,"<br />")}else{J=P.innerHTML;P.innerHTML="";v.dom.add(P,W.element,null,J);U=v.dom.add(P,W.element,null,"<br />")}H=S.createRange();H.selectNodeContents(U);H.collapse(1);v.selection.setRng(H);return g}if(P==V&&q==V&&V.firstChild&&v.dom.isBlock(V.firstChild)){P=q=P.firstChild;O=o=0;K=S.createRange();K.setStart(P,0);L=S.createRange();L.setStart(q,0)}P=P.nodeName=="HTML"?S.body:P;P=P.nodeName=="BODY"?P.firstChild:P;q=q.nodeName=="HTML"?S.body:q;q=q.nodeName=="BODY"?q.firstChild:q;u=F.getParentBlock(P);z=F.getParentBlock(q);m=u?u.nodeName:W.element;if(J=F.dom.getParent(u,"li,pre")){if(J.nodeName=="LI"){return e(v.selection,F.dom,J)}return d}if(u&&(u.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(N.getStyle(u,"position",1)))){m=W.element;u=null}if(z&&(z.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(N.getStyle(u,"position",1)))){m=W.element;z=null}if(/(TD|TABLE|TH|CAPTION)/.test(m)||(u&&m=="DIV"&&/left|right/gi.test(N.getStyle(u,"float",1)))){m=W.element;u=z=null}D=(u&&u.nodeName==m)?u.cloneNode(0):v.dom.create(m);U=(z&&z.nodeName==m)?z.cloneNode(0):v.dom.create(m);U.removeAttribute("id");if(/^(H[1-6])$/.test(m)&&f(H,u)){U=v.dom.create(W.element)}J=p=P;do{if(J==V||J.nodeType==9||F.dom.isBlock(J)||/(TD|TABLE|TH|CAPTION)/.test(J.nodeName)){break}p=J}while((J=J.previousSibling?J.previousSibling:J.parentNode));J=x=q;do{if(J==V||J.nodeType==9||F.dom.isBlock(J)||/(TD|TABLE|TH|CAPTION)/.test(J.nodeName)){break}x=J}while((J=J.nextSibling?J.nextSibling:J.parentNode));if(p.nodeName==m){K.setStart(p,0)}else{K.setStartBefore(p)}K.setEnd(P,O);D.appendChild(K.cloneContents()||S.createTextNode(""));try{L.setEndAfter(x)}catch(Q){}L.setStart(q,o);U.appendChild(L.cloneContents()||S.createTextNode(""));H=S.createRange();if(!p.previousSibling&&p.parentNode.nodeName==m){H.setStartBefore(p.parentNode)}else{if(K.startContainer.nodeName==m&&K.startOffset==0){H.setStartBefore(K.startContainer)}else{H.setStart(K.startContainer,K.startOffset)}}if(!x.nextSibling&&x.parentNode.nodeName==m){H.setEndAfter(x.parentNode)}else{H.setEnd(L.endContainer,L.endOffset)}H.deleteContents();if(b){v.getWin().scrollTo(0,M.y)}if(D.firstChild&&D.firstChild.nodeName==m){D.innerHTML=D.firstChild.innerHTML}if(U.firstChild&&U.firstChild.nodeName==m){U.innerHTML=U.firstChild.innerHTML}if(N.isEmpty(D)){D.innerHTML="<br />"}function T(y,s){var r=[],Y,X,t;y.innerHTML="";if(W.keep_styles){X=s;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(X.nodeName)){Y=X.cloneNode(g);N.setAttrib(Y,"id","");r.push(Y)}}while(X=X.parentNode)}if(r.length>0){for(t=r.length-1,Y=y;t>=0;t--){Y=Y.appendChild(r[t])}r[0].innerHTML=b?"\u00a0":"<br />";return r[0]}else{y.innerHTML=b?"\u00a0":"<br />"}}if(N.isEmpty(U)){B=T(U,q)}if(b&&parseFloat(opera.version())<9.5){H.insertNode(D);H.insertNode(U)}else{H.insertNode(U);H.insertNode(D)}U.normalize();D.normalize();function A(r){return S.createTreeWalker(r,NodeFilter.SHOW_TEXT,null,g).nextNode()||r}H=S.createRange();H.selectNodeContents(a?A(B||U):B||U);H.collapse(1);G.removeAllRanges();G.addRange(H);C=v.dom.getPos(U).y;if(C<M.y||C+25>M.y+M.h){v.getWin().scrollTo(0,C<M.y?C:C-M.h+25)}v.undoManager.add();return g},backspaceDelete:function(u,B){var C=this,s=C.editor,y=s.getBody(),q=s.dom,p,v=s.selection,o=v.getRng(),x=o.startContainer,p,z,A,m;if(!B&&o.collapsed&&x.nodeType==1&&o.startOffset==x.childNodes.length){m=new l.dom.TreeWalker(x.lastChild,x);for(p=x.lastChild;p;p=m.prev()){if(p.nodeType==3){o.setStart(p,p.nodeValue.length);o.collapse(true);v.setRng(o);return}}}if(x&&s.dom.isBlock(x)&&!/^(TD|TH)$/.test(x.nodeName)&&B){if(x.childNodes.length==0||(x.childNodes.length==1&&x.firstChild.nodeName=="BR")){p=x;while((p=p.previousSibling)&&!s.dom.isBlock(p)){}if(p){if(x!=y.firstChild){z=s.dom.doc.createTreeWalker(p,NodeFilter.SHOW_TEXT,null,g);while(A=z.nextNode()){p=A}o=s.getDoc().createRange();o.setStart(p,p.nodeValue?p.nodeValue.length:0);o.setEnd(p,p.nodeValue?p.nodeValue.length:0);v.setRng(o);s.dom.remove(x)}return j.cancel(u)}}}}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;if(g.settings.use_native_selects){k=new c.ui.NativeListBox(m,i)}else{f=l||h._cls.listbox||c.ui.ListBox;k=new f(m,i,g)}h.controls[m]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){g.bookmark=g.selection.getBookmark(1)});a.add(o,"focus",function(){g.selection.moveToBookmark(g.bookmark);g.bookmark=null})})}if(k.hideMenu){g.onMouseDown.add(k.hideMenu,k)}return h.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i,g);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i,g));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n,j);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createToolbarGroup:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||this._cls.toolbarGroup||c.ui.ToolbarGroup;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){a.Formatter=function(V){var M={},O=a.each,c=V.dom,q=V.selection,t=a.dom.TreeWalker,K=new a.dom.RangeUtils(c),d=V.schema.isValidChild,F=c.isBlock,l=V.settings.forced_root_block,s=c.nodeIndex,E="\uFEFF",e=/^(src|href|style)$/,S=false,B=true,p,P={apply:[],remove:[]};function z(W){return W instanceof Array}function m(X,W){return c.getParents(X,W,c.getRoot())}function b(W){return W.nodeType===1&&(W.face==="mceinline"||W.style.fontFamily==="mceinline")}function R(W){return W?M[W]:M}function k(W,X){if(W){if(typeof(W)!=="string"){O(W,function(Z,Y){k(Y,Z)})}else{X=X.length?X:[X];O(X,function(Y){if(Y.deep===p){Y.deep=!Y.selector}if(Y.split===p){Y.split=!Y.selector||Y.inline}if(Y.remove===p&&Y.selector&&!Y.inline){Y.remove="none"}if(Y.selector&&Y.inline){Y.mixed=true;Y.block_expand=true}if(typeof(Y.classes)==="string"){Y.classes=Y.classes.split(/\s+/)}});M[W]=X}}}var i=function(X){var W;V.dom.getParent(X,function(Y){W=V.dom.getStyle(Y,"text-decoration");return W&&W!=="none"});return W};var I=function(W){var X;if(W.nodeType===1&&W.parentNode&&W.parentNode.nodeType===1){X=i(W.parentNode);if(V.dom.getStyle(W,"color")&&X){V.dom.setStyle(W,"text-decoration",X)}else{if(V.dom.getStyle(W,"textdecoration")===X){V.dom.setStyle(W,"text-decoration",null)}}}};function T(Y,af,aa){var ab=R(Y),ag=ab[0],ae,X,ad,ac=q.isCollapsed();function Z(ak){var aj=ak.startContainer,an=ak.startOffset,am,al;if(aj.nodeType==1||aj.nodeValue===""){aj=aj.nodeType==1?aj.childNodes[an]:aj;if(aj){am=new t(aj,aj.parentNode);for(al=am.current();al;al=am.next()){if(al.nodeType==3&&!f(al)){ak.setStart(al,0);break}}}}return ak}function W(ak,aj){aj=aj||ag;if(ak){O(aj.styles,function(am,al){c.setStyle(ak,al,r(am,af))});O(aj.attributes,function(am,al){c.setAttrib(ak,al,r(am,af))});O(aj.classes,function(al){al=r(al,af);if(!c.hasClass(ak,al)){c.addClass(ak,al)}})}}function ah(ak){var aj=[],am,al;am=ag.inline||ag.block;al=c.create(am);W(al);K.walk(ak,function(an){var ao;function ap(aq){var au=aq.nodeName.toLowerCase(),at=aq.parentNode.nodeName.toLowerCase(),ar;if(g(au,"br")){ao=0;if(ag.block){c.remove(aq)}return}if(ag.wrapper&&x(aq,Y,af)){ao=0;return}if(ag.block&&!ag.wrapper&&G(au)){aq=c.rename(aq,am);W(aq);aj.push(aq);ao=0;return}if(ag.selector){O(ab,function(av){if("collapsed" in av&&av.collapsed!==ac){return}if(c.is(aq,av.selector)&&!b(aq)){W(aq,av);ar=true}});if(!ag.inline||ar){ao=0;return}}if(d(am,au)&&d(at,am)&&!(aq.nodeType===3&&aq.nodeValue.length===1&&aq.nodeValue.charCodeAt(0)===65279)){if(!ao){ao=al.cloneNode(S);aq.parentNode.insertBefore(ao,aq);aj.push(ao)}ao.appendChild(aq)}else{ao=0;O(a.grep(aq.childNodes),ap);ao=0}}O(an,ap)});if(ag.wrap_links===false){O(aj,function(an){function ao(at){var ar,aq,ap;if(at.nodeName==="A"){aq=al.cloneNode(S);aj.push(aq);ap=a.grep(at.childNodes);for(ar=0;ar<ap.length;ar++){aq.appendChild(ap[ar])}at.appendChild(aq)}O(a.grep(at.childNodes),ao)}ao(an)})}O(aj,function(ap){var an;function aq(at){var ar=0;O(at.childNodes,function(au){if(!f(au)&&!H(au)){ar++}});return ar}function ao(ar){var au,at;O(ar.childNodes,function(av){if(av.nodeType==1&&!H(av)&&!b(av)){au=av;return S}});if(au&&h(au,ag)){at=au.cloneNode(S);W(at);c.replace(at,ar,B);c.remove(au,1)}return at||ar}an=aq(ap);if((aj.length>1||!F(ap))&&an===0){c.remove(ap,1);return}if(ag.inline||ag.wrapper){if(!ag.exact&&an===1){ap=ao(ap)}O(ab,function(ar){O(c.select(ar.inline,ap),function(au){var at;if(ar.wrap_links===false){at=au.parentNode;do{if(at.nodeName==="A"){return}}while(at=at.parentNode)}U(ar,af,au,ar.exact?au:null)})});if(x(ap.parentNode,Y,af)){c.remove(ap,1);ap=0;return B}if(ag.merge_with_parents){c.getParent(ap.parentNode,function(ar){if(x(ar,Y,af)){c.remove(ap,1);ap=0;return B}})}if(ap){ap=u(C(ap),ap);ap=u(ap,C(ap,B))}}})}if(ag){if(aa){X=c.createRng();X.setStartBefore(aa);X.setEndAfter(aa);ah(o(X,ab))}else{if(!ac||!ag.inline||c.select("td.mceSelected,th.mceSelected").length){var ai=V.selection.getNode();ae=q.getBookmark();ah(o(q.getRng(B),ab));if(ag.styles&&(ag.styles.color||ag.styles.textDecoration)){a.walk(ai,I,"childNodes");I(ai)}q.moveToBookmark(ae);q.setRng(Z(q.getRng(B)));V.nodeChanged()}else{Q("apply",Y,af)}}}}function A(Y,ah,ab){var ac=R(Y),aj=ac[0],ag,af,X;function aa(am){var al=am.startContainer,ar=am.startOffset,aq,ap,an,ao;if(al.nodeType==3&&ar>=al.nodeValue.length-1){al=al.parentNode;ar=s(al)+1}if(al.nodeType==1){an=al.childNodes;al=an[Math.min(ar,an.length-1)];aq=new t(al);if(ar>an.length-1){aq.next()}for(ap=aq.current();ap;ap=aq.next()){if(ap.nodeType==3&&!f(ap)){ao=c.create("a",null,E);ap.parentNode.insertBefore(ao,ap);am.setStart(ap,0);q.setRng(am);c.remove(ao);return}}}}function Z(ao){var an,am,al;an=a.grep(ao.childNodes);for(am=0,al=ac.length;am<al;am++){if(U(ac[am],ah,ao,ao)){break}}if(aj.deep){for(am=0,al=an.length;am<al;am++){Z(an[am])}}}function ad(al){var am;O(m(al.parentNode).reverse(),function(an){var ao;if(!am&&an.id!="_start"&&an.id!="_end"){ao=x(an,Y,ah);if(ao&&ao.split!==false){am=an}}});return am}function W(ao,al,aq,au){var av,at,ar,an,ap,am;if(ao){am=ao.parentNode;for(av=al.parentNode;av&&av!=am;av=av.parentNode){at=av.cloneNode(S);for(ap=0;ap<ac.length;ap++){if(U(ac[ap],ah,at,at)){at=0;break}}if(at){if(ar){at.appendChild(ar)}if(!an){an=at}ar=at}}if(au&&(!aj.mixed||!F(ao))){al=c.split(ao,al)}if(ar){aq.parentNode.insertBefore(ar,aq);an.appendChild(aq)}}return al}function ai(al){return W(ad(al),al,al,true)}function ae(an){var am=c.get(an?"_start":"_end"),al=am[an?"firstChild":"lastChild"];if(H(al)){al=al[an?"firstChild":"lastChild"]}c.remove(am,true);return al}function ak(al){var am,an;al=o(al,ac,B);if(aj.split){am=J(al,B);an=J(al);if(am!=an){am=N(am,"span",{id:"_start","data-mce-type":"bookmark"});an=N(an,"span",{id:"_end","data-mce-type":"bookmark"});ai(am);ai(an);am=ae(B);an=ae()}else{am=an=ai(am)}al.startContainer=am.parentNode;al.startOffset=s(am);al.endContainer=an.parentNode;al.endOffset=s(an)+1}K.walk(al,function(ao){O(ao,function(ap){Z(ap);if(ap.nodeType===1&&V.dom.getStyle(ap,"text-decoration")==="underline"&&ap.parentNode&&i(ap.parentNode)==="underline"){U({deep:false,exact:true,inline:"span",styles:{textDecoration:"underline"}},null,ap)}})})}if(ab){X=c.createRng();X.setStartBefore(ab);X.setEndAfter(ab);ak(X);return}if(!q.isCollapsed()||!aj.inline||c.select("td.mceSelected,th.mceSelected").length){ag=q.getBookmark();ak(q.getRng(B));q.moveToBookmark(ag);if(j(Y,ah,q.getStart())){aa(q.getRng(true))}V.nodeChanged()}else{Q("remove",Y,ah)}}function D(X,Z,Y){var W=R(X);if(j(X,Z,Y)&&(!("toggle" in W[0])||W[0]["toggle"])){A(X,Z,Y)}else{T(X,Z,Y)}}function x(X,W,ac,aa){var Y=R(W),ad,ab,Z;function ae(ai,ak,al){var ah,aj,af=ak[al],ag;if(af){if(af.length===p){for(ah in af){if(af.hasOwnProperty(ah)){if(al==="attributes"){aj=c.getAttrib(ai,ah)}else{aj=L(ai,ah)}if(aa&&!aj&&!ak.exact){return}if((!aa||ak.exact)&&!g(aj,r(af[ah],ac))){return}}}}else{for(ag=0;ag<af.length;ag++){if(al==="attributes"?c.getAttrib(ai,af[ag]):L(ai,af[ag])){return ak}}}}return ak}if(Y&&X){for(ab=0;ab<Y.length;ab++){ad=Y[ab];if(h(X,ad)&&ae(X,ad,"attributes")&&ae(X,ad,"styles")){if(Z=ad.classes){for(ab=0;ab<Z.length;ab++){if(!c.hasClass(X,Z[ab])){return}}}return ad}}}}function j(Y,ab,aa){var X,Z;function W(ac){ac=c.getParent(ac,function(ad){return !!x(ad,Y,ab,true)});return x(ac,Y,ab)}if(aa){return W(aa)}if(q.isCollapsed()){for(Z=P.apply.length-1;Z>=0;Z--){if(P.apply[Z].name==Y){return true}}for(Z=P.remove.length-1;Z>=0;Z--){if(P.remove[Z].name==Y){return false}}return W(q.getNode())}aa=q.getNode();if(W(aa)){return B}X=q.getStart();if(X!=aa){if(W(X)){return B}}return S}function v(ad,ac){var aa,ab=[],Z={},Y,X,W;if(q.isCollapsed()){for(X=0;X<ad.length;X++){for(Y=P.remove.length-1;Y>=0;Y--){W=ad[X];if(P.remove[Y].name==W){Z[W]=true;break}}}for(Y=P.apply.length-1;Y>=0;Y--){for(X=0;X<ad.length;X++){W=ad[X];if(!Z[W]&&P.apply[Y].name==W){Z[W]=true;ab.push(W)}}}}aa=q.getStart();c.getParent(aa,function(ag){var af,ae;for(af=0;af<ad.length;af++){ae=ad[af];if(!Z[ae]&&x(ag,ae,ac)){Z[ae]=true;ab.push(ae)}}});return ab}function y(aa){var ac=R(aa),Z,Y,ab,X,W;if(ac){Z=q.getStart();Y=m(Z);for(X=ac.length-1;X>=0;X--){W=ac[X].selector;if(!W){return B}for(ab=Y.length-1;ab>=0;ab--){if(c.is(Y[ab],W)){return B}}}}return S}a.extend(this,{get:R,register:k,apply:T,remove:A,toggle:D,match:j,matchAll:v,matchNode:x,canApply:y});function h(W,X){if(g(W,X.inline)){return B}if(g(W,X.block)){return B}if(X.selector){return c.is(W,X.selector)}}function g(X,W){X=X||"";W=W||"";X=""+(X.nodeName||X);W=""+(W.nodeName||W);return X.toLowerCase()==W.toLowerCase()}function L(X,W){var Y=c.getStyle(X,W);if(W=="color"||W=="backgroundColor"){Y=c.toHex(Y)}if(W=="fontWeight"&&Y==700){Y="bold"}return""+Y}function r(W,X){if(typeof(W)!="string"){W=W(X)}else{if(X){W=W.replace(/%(\w+)/g,function(Z,Y){return X[Y]||Z})}}return W}function f(W){return W&&W.nodeType===3&&/^([\s\r\n]+|)$/.test(W.nodeValue)}function N(Y,X,W){var Z=c.create(X,W);Y.parentNode.insertBefore(Z,Y);Z.appendChild(Y);return Z}function o(W,ag,Z){var Y=W.startContainer,ad=W.startOffset,aj=W.endContainer,ae=W.endOffset,ai,af,ac;function ah(am,an,ak,al){var ao,ap;al=al||c.getRoot();for(;;){ao=am.parentNode;if(ao==al||(!ag[0].block_expand&&F(ao))){return am}for(ai=ao[an];ai&&ai!=am;ai=ai[ak]){if(ai.nodeType==1&&!H(ai)){return am}if(ai.nodeType==3&&!f(ai)){return am}}am=am.parentNode}return am}function ab(ak,al){if(al===p){al=ak.nodeType===3?ak.length:ak.childNodes.length}while(ak&&ak.hasChildNodes()){ak=ak.childNodes[al];if(ak){al=ak.nodeType===3?ak.length:ak.childNodes.length}}return{node:ak,offset:al}}if(Y.nodeType==1&&Y.hasChildNodes()){af=Y.childNodes.length-1;Y=Y.childNodes[ad>af?af:ad];if(Y.nodeType==3){ad=0}}if(aj.nodeType==1&&aj.hasChildNodes()){af=aj.childNodes.length-1;aj=aj.childNodes[ae>af?af:ae-1];if(aj.nodeType==3){ae=aj.nodeValue.length}}if(H(Y.parentNode)){Y=Y.parentNode}if(H(Y)){Y=Y.nextSibling||Y}if(H(aj.parentNode)){ae=c.nodeIndex(aj);aj=aj.parentNode}if(H(aj)&&aj.previousSibling){aj=aj.previousSibling;ae=aj.length}if(ag[0].inline){ac=ab(aj,ae);if(ac.node){while(ac.node&&ac.offset===0&&ac.node.previousSibling){ac=ab(ac.node.previousSibling)}if(ac.node&&ac.offset>0&&ac.node.nodeType===3&&ac.node.nodeValue.charAt(ac.offset-1)===" "){if(ac.offset>1){aj=ac.node;aj.splitText(ac.offset-1)}else{if(ac.node.previousSibling){aj=ac.node.previousSibling}}}}}if(ag[0].inline||ag[0].block_expand){Y=ah(Y,"firstChild","nextSibling");aj=ah(aj,"lastChild","previousSibling")}if(ag[0].selector&&ag[0].expand!==S&&!ag[0].inline){function aa(al,ak){var am,an,ap,ao;if(al.nodeType==3&&al.nodeValue.length==0&&al[ak]){al=al[ak]}am=m(al);for(an=0;an<am.length;an++){for(ap=0;ap<ag.length;ap++){ao=ag[ap];if("collapsed" in ao&&ao.collapsed!==W.collapsed){continue}if(c.is(am[an],ao.selector)){return am[an]}}}return al}Y=aa(Y,"previousSibling");aj=aa(aj,"nextSibling")}if(ag[0].block||ag[0].selector){function X(al,ak,an){var am;if(!ag[0].wrapper){am=c.getParent(al,ag[0].block)}if(!am){am=c.getParent(al.nodeType==3?al.parentNode:al,F)}if(am&&ag[0].wrapper){am=m(am,"ul,ol").reverse()[0]||am}if(!am){am=al;while(am[ak]&&!F(am[ak])){am=am[ak];if(g(am,"br")){break}}}return am||al}Y=X(Y,"previousSibling");aj=X(aj,"nextSibling");if(ag[0].block){if(!F(Y)){Y=ah(Y,"firstChild","nextSibling")}if(!F(aj)){aj=ah(aj,"lastChild","previousSibling")}}}if(Y.nodeType==1){ad=s(Y);Y=Y.parentNode}if(aj.nodeType==1){ae=s(aj)+1;aj=aj.parentNode}return{startContainer:Y,startOffset:ad,endContainer:aj,endOffset:ae}}function U(ac,ab,Z,W){var Y,X,aa;if(!h(Z,ac)){return S}if(ac.remove!="all"){O(ac.styles,function(ae,ad){ae=r(ae,ab);if(typeof(ad)==="number"){ad=ae;W=0}if(!W||g(L(W,ad),ae)){c.setStyle(Z,ad,"")}aa=1});if(aa&&c.getAttrib(Z,"style")==""){Z.removeAttribute("style");Z.removeAttribute("data-mce-style")}O(ac.attributes,function(af,ad){var ae;af=r(af,ab);if(typeof(ad)==="number"){ad=af;W=0}if(!W||g(c.getAttrib(W,ad),af)){if(ad=="class"){af=c.getAttrib(Z,ad);if(af){ae="";O(af.split(/\s+/),function(ag){if(/mce\w+/.test(ag)){ae+=(ae?" ":"")+ag}});if(ae){c.setAttrib(Z,ad,ae);return}}}if(ad=="class"){Z.removeAttribute("className")}if(e.test(ad)){Z.removeAttribute("data-mce-"+ad)}Z.removeAttribute(ad)}});O(ac.classes,function(ad){ad=r(ad,ab);if(!W||c.hasClass(W,ad)){c.removeClass(Z,ad)}});X=c.getAttribs(Z);for(Y=0;Y<X.length;Y++){if(X[Y].nodeName.indexOf("_")!==0){return S}}}if(ac.remove!="none"){n(Z,ac);return B}}function n(Y,Z){var W=Y.parentNode,X;if(Z.block){if(!l){function aa(ac,ab,ad){ac=C(ac,ab,ad);return !ac||(ac.nodeName=="BR"||F(ac))}if(F(Y)&&!F(W)){if(!aa(Y,S)&&!aa(Y.firstChild,B,1)){Y.insertBefore(c.create("br"),Y.firstChild)}if(!aa(Y,B)&&!aa(Y.lastChild,S,1)){Y.appendChild(c.create("br"))}}}else{if(W==c.getRoot()){if(!Z.list_block||!g(Y,Z.list_block)){O(a.grep(Y.childNodes),function(ab){if(d(l,ab.nodeName.toLowerCase())){if(!X){X=N(ab,l)}else{X.appendChild(ab)}}else{X=0}})}}}}if(Z.selector&&Z.inline&&!g(Z.inline,Y)){return}c.remove(Y,1)}function C(X,W,Y){if(X){W=W?"nextSibling":"previousSibling";for(X=Y?X:X[W];X;X=X[W]){if(X.nodeType==1||!f(X)){return X}}}}function H(W){return W&&W.nodeType==1&&W.getAttribute("data-mce-type")=="bookmark"}function u(aa,Z){var W,Y,X;function ac(af,ae){if(af.nodeName!=ae.nodeName){return S}function ad(ah){var ai={};O(c.getAttribs(ah),function(aj){var ak=aj.nodeName.toLowerCase();if(ak.indexOf("_")!==0&&ak!=="style"){ai[ak]=c.getAttrib(ah,ak)}});return ai}function ag(ak,aj){var ai,ah;for(ah in ak){if(ak.hasOwnProperty(ah)){ai=aj[ah];if(ai===p){return S}if(ak[ah]!=ai){return S}delete aj[ah]}}for(ah in aj){if(aj.hasOwnProperty(ah)){return S}}return B}if(!ag(ad(af),ad(ae))){return S}if(!ag(c.parseStyle(c.getAttrib(af,"style")),c.parseStyle(c.getAttrib(ae,"style")))){return S}return B}if(aa&&Z){function ab(ae,ad){for(Y=ae;Y;Y=Y[ad]){if(Y.nodeType==3&&Y.nodeValue.length!==0){return ae}if(Y.nodeType==1&&!H(Y)){return Y}}return ae}aa=ab(aa,"previousSibling");Z=ab(Z,"nextSibling");if(ac(aa,Z)){for(Y=aa.nextSibling;Y&&Y!=Z;){X=Y;Y=Y.nextSibling;aa.appendChild(X)}c.remove(Z);O(a.grep(Z.childNodes),function(ad){aa.appendChild(ad)});return aa}}return Z}function G(W){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(W)}function J(X,aa){var W,Z,Y;W=X[aa?"startContainer":"endContainer"];Z=X[aa?"startOffset":"endOffset"];if(W.nodeType==1){Y=W.childNodes.length-1;if(!aa&&Z){Z--}W=W.childNodes[Z>Y?Y:Z]}return W}function Q(ab,X,aa){var Y,W=P[ab],ac=P[ab=="apply"?"remove":"apply"];function ad(){return P.apply.length||P.remove.length}function Z(){P.apply=[];P.remove=[]}function ae(af){O(P.apply.reverse(),function(ag){T(ag.name,ag.vars,af);if(ag.name==="forecolor"&&ag.vars.value){I(af.parentNode)}});O(P.remove.reverse(),function(ag){A(ag.name,ag.vars,af)});c.remove(af,1);Z()}for(Y=W.length-1;Y>=0;Y--){if(W[Y].name==X){return}}W.push({name:X,vars:aa});for(Y=ac.length-1;Y>=0;Y--){if(ac[Y].name==X){ac.splice(Y,1)}}if(ad()){V.getDoc().execCommand("FontName",false,"mceinline");P.lastRng=q.getRng();O(c.select("font,span"),function(ag){var af;if(b(ag)){af=q.getBookmark();ae(ag);q.moveToBookmark(af);V.nodeChanged()}});if(!P.isListening&&ad()){P.isListening=true;O("onKeyDown,onKeyUp,onKeyPress,onMouseUp".split(","),function(af){V[af].addToTop(function(ag,ah){if(ad()&&!a.dom.RangeUtils.compareRanges(P.lastRng,q.getRng())){O(c.select("font,span"),function(aj){var ak,ai;if(b(aj)){ak=aj.firstChild;if(ak){ae(aj);ai=c.createRng();ai.setStart(ak,ak.nodeValue.length);ai.setEnd(ak,ak.nodeValue.length);q.setRng(ai);ag.nodeChanged()}else{c.remove(aj)}}});if(ah.type=="keyup"||ah.type=="mouseup"){Z()}}})})}}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_style_values);function b(j,i){e.each(i,function(l,k){if(l){g.setStyle(j,k,l)}});g.rename(j,"span")}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onSetContent.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce_popup.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
index 3ef3acb1f..f859d24e6 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
@@ -2,4 +2,4 @@
 // Uncomment and change this document.domain value if you are loading the script cross subdomains
 // document.domain = 'moxiecode.com';
 
-var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},0)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(){var a=window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.domLoaded){return}b.domLoaded=1;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}document.body.style.display="";if(tinymce.isIE){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){tinymce.dom.Event._add(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){a=a.target||a.srcElement;if(a.onchange){a.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_wait:function(){if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);tinyMCEPopup._onDOMLoaded()}});if(document.documentElement.doScroll&&window==window.top){(function(){if(tinyMCEPopup.domLoaded){return}try{document.documentElement.doScroll("left")}catch(a){setTimeout(arguments.callee,0);return}tinyMCEPopup._onDOMLoaded()})()}document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)}else{if(document.addEventListener){window.addEventListener("DOMContentLoaded",tinyMCEPopup._onDOMLoaded,false);window.addEventListener("load",tinyMCEPopup._onDOMLoaded,false)}}}};tinyMCEPopup.init();tinyMCEPopup._wait();
\ No newline at end of file
+var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},10)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false&&b.editor.settings.language_load!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(){var a=window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.domLoaded){return}b.domLoaded=1;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}if(!b.editor.getParam("browser_preferred_colors",false)||!b.isWindow){b.dom.addClass(document.body,"forceColors")}document.body.style.display="";if(tinymce.isIE){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){tinymce.dom.Event._add(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){a=a.target||a.srcElement;if(a.onchange){a.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_wait:function(){if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);tinyMCEPopup._onDOMLoaded()}});if(document.documentElement.doScroll&&window==window.top){(function(){if(tinyMCEPopup.domLoaded){return}try{document.documentElement.doScroll("left")}catch(a){setTimeout(arguments.callee,0);return}tinyMCEPopup._onDOMLoaded()})()}document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)}else{if(document.addEventListener){window.addEventListener("DOMContentLoaded",tinyMCEPopup._onDOMLoaded,false);window.addEventListener("load",tinyMCEPopup._onDOMLoaded,false)}}}};tinyMCEPopup.init();tinyMCEPopup._wait();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce_src.js
index b3eef7a31..c1d47fcb7 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce_src.js
@@ -1,13 +1,13 @@
 (function(win) {

 	var whiteSpaceRe = /^\s*|\s*$/g,

-		undefined;

+		undefined, isRegExpBroken = 'B'.replace(/A(.)|B/, '$1') === '$1';

 

 	var tinymce = {

 		majorVersion : '3',

 

-		minorVersion : '3.6',

+		minorVersion : '4.2',

 

-		releaseDate : '2010-05-20',

+		releaseDate : '2011-04-07',

 

 		_init : function() {

 			var t = this, d = document, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;

@@ -52,7 +52,7 @@
 			}

 

 			function getBase(n) {

-				if (n.src && /tiny_mce(|_gzip|_jquery|_prototype)(_dev|_src)?.js/.test(n.src)) {

+				if (n.src && /tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(n.src)) {

 					if (/_(src|dev)\.js/g.test(n.src))

 						t.suffix = '_src';

 

@@ -103,6 +103,24 @@
 			return typeof(o) == t;

 		},

 

+		makeMap : function(items, delim, map) {

+			var i;

+

+			items = items || [];

+			delim = delim || ',';

+

+			if (typeof(items) == "string")

+				items = items.split(delim);

+

+			map = map || {};

+

+			i = items.length;

+			while (i--)

+				map[items[i]] = {};

+

+			return map;

+		},

+

 		each : function(o, cb, s) {

 			var n, l;

 

@@ -185,7 +203,7 @@
 			return (s ? '' + s : '').replace(whiteSpaceRe, '');

 		},

 

-		create : function(s, p) {

+		create : function(s, p, root) {

 			var t = this, sp, ns, cn, scn, c, de = 0;

 

 			// Parse : <prefix> <class>:<super class>

@@ -193,7 +211,7 @@
 			cn = s[3].match(/(^|\.)(\w+)$/i)[2]; // Class name

 

 			// Create namespace for new class

-			ns = t.createNS(s[3].replace(/\.\w+$/, ''));

+			ns = t.createNS(s[3].replace(/\.\w+$/, ''), root);

 

 			// Class already exists

 			if (ns[cn])

@@ -428,6 +446,29 @@
 				return u + v;

 

 			return u.replace('#', v + '#');

+		},

+

+		// Fix function for IE 9 where regexps isn't working correctly

+		// Todo: remove me once MS fixes the bug

+		_replace : function(find, replace, str) {

+			// On IE9 we have to fake $x replacement

+			if (isRegExpBroken) {

+				return str.replace(find, function() {

+					var val = replace, args = arguments, i;

+

+					for (i = 0; i < args.length - 2; i++) {

+						if (args[i] === undefined) {

+							val = val.replace(new RegExp('\\$' + i, 'g'), '');

+						} else {

+							val = val.replace(new RegExp('\\$' + i, 'g'), args[i]);

+						}

+					}

+

+					return val;

+				});

+			}

+

+			return str.replace(find, replace);

 		}

 

 		};

@@ -437,7 +478,10 @@
 

 	// Expose tinymce namespace to the global namespace (window)

 	win.tinymce = win.tinyMCE = tinymce;

-})(window);

+

+	// Describe the different namespaces

+

+	})(window);

 

 

 tinymce.create('tinymce.util.Dispatcher', {

@@ -805,9 +849,11 @@ tinymce.create('tinymce.util.Dispatcher', {
 	});

 })();

 

-tinymce.create('static tinymce.util.JSON', {

-	serialize : function(o) {

-		var i, v, s = tinymce.util.JSON.serialize, t;

+(function() {

+	function serialize(o, quote) {

+		var i, v, t;

+

+		quote = quote || '"';

 

 		if (o == null)

 			return 'null';

@@ -817,7 +863,11 @@ tinymce.create('static tinymce.util.JSON', {
 		if (t == 'string') {

 			v = '\bb\tt\nn\ff\rr\""\'\'\\\\';

 

-			return '"' + o.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g, function(a, b) {

+			return quote + o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g, function(a, b) {

+				// Make sure single quotes never get encoded inside double quotes for JSON compatibility

+				if (quote === '"' && a === "'")

+					return a;

+

 				i = v.indexOf(b);

 

 				if (i + 1)

@@ -826,13 +876,13 @@ tinymce.create('static tinymce.util.JSON', {
 				a = b.charCodeAt().toString(16);

 

 				return '\\u' + '0000'.substring(a.length) + a;

-			}) + '"';

+			}) + quote;

 		}

 

 		if (t == 'object') {

 			if (o.hasOwnProperty && o instanceof Array) {

 					for (i=0, v = '['; i<o.length; i++)

-						v += (i > 0 ? ',' : '') + s(o[i]);

+						v += (i > 0 ? ',' : '') + serialize(o[i], quote);

 

 					return v + ']';

 				}

@@ -840,24 +890,27 @@ tinymce.create('static tinymce.util.JSON', {
 				v = '{';

 

 				for (i in o)

-					v += typeof o[i] != 'function' ? (v.length > 1 ? ',"' : '"') + i + '":' + s(o[i]) : '';

+					v += typeof o[i] != 'function' ? (v.length > 1 ? ',' + quote : quote) + i + quote +':' + serialize(o[i], quote) : '';

 

 				return v + '}';

 		}

 

 		return '' + o;

-	},

+	};

 

-	parse : function(s) {

-		try {

-			return eval('(' + s + ')');

-		} catch (ex) {

-			// Ignore

-		}

-	}

+	tinymce.util.JSON = {

+		serialize: serialize,

 

-	});

+		parse: function(s) {

+			try {

+				return eval('(' + s + ')');

+			} catch (ex) {

+				// Ignore

+			}

+		}

 

+		};

+})();

 tinymce.create('static tinymce.util.XHR', {

 	send : function(o) {

 		var x, t, w = window, c = 0;

@@ -948,7 +1001,8 @@ tinymce.create('static tinymce.util.XHR', {
 			};

 

 			o.error = function(ty, x) {

-				ecb.call(o.error_scope || o.scope, ty, x);

+				if (ecb)

+					ecb.call(o.error_scope || o.scope, ty, x);

 			};

 

 			o.data = JSON.serialize({

@@ -971,29 +1025,2206 @@ tinymce.create('static tinymce.util.XHR', {
 	});

 }());

 (function(tinymce) {

+	var namedEntities, baseEntities, reverseEntities,

+		attrsCharsRegExp = /[&\"\u007E-\uD7FF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,

+		textCharsRegExp = /[<>&\u007E-\uD7FF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,

+		rawCharsRegExp = /[<>&\"\']/g,

+		entityRegExp = /&(#)?([\w]+);/g,

+		asciiMap = {

+				128 : "\u20AC", 130 : "\u201A", 131 : "\u0192", 132 : "\u201E", 133 : "\u2026", 134 : "\u2020",

+				135 : "\u2021", 136 : "\u02C6", 137 : "\u2030", 138 : "\u0160", 139 : "\u2039", 140 : "\u0152",

+				142 : "\u017D", 145 : "\u2018", 146 : "\u2019", 147 : "\u201C", 148 : "\u201D", 149 : "\u2022",

+				150 : "\u2013", 151 : "\u2014", 152 : "\u02DC", 153 : "\u2122", 154 : "\u0161", 155 : "\u203A",

+				156 : "\u0153", 158 : "\u017E", 159 : "\u0178"

+		};

+

+	// Raw entities

+	baseEntities = {

+		'"' : '&quot;',

+		"'" : '&#39;',

+		'<' : '&lt;',

+		'>' : '&gt;',

+		'&' : '&amp;'

+	};

+

+	// Reverse lookup table for raw entities

+	reverseEntities = {

+		'&lt;' : '<',

+		'&gt;' : '>',

+		'&amp;' : '&',

+		'&quot;' : '"',

+		'&apos;' : "'"

+	};

+

+	// Decodes text by using the browser

+	function nativeDecode(text) {

+		var elm;

+

+		elm = document.createElement("div");

+		elm.innerHTML = text;

+

+		return elm.textContent || elm.innerText || text;

+	};

+

+	// Build a two way lookup table for the entities

+	function buildEntitiesLookup(items, radix) {

+		var i, chr, entity, lookup = {};

+

+		if (items) {

+			items = items.split(',');

+			radix = radix || 10;

+

+			// Build entities lookup table

+			for (i = 0; i < items.length; i += 2) {

+				chr = String.fromCharCode(parseInt(items[i], radix));

+

+				// Only add non base entities

+				if (!baseEntities[chr]) {

+					entity = '&' + items[i + 1] + ';';

+					lookup[chr] = entity;

+					lookup[entity] = chr;

+				}

+			}

+

+			return lookup;

+		}

+	};

+

+	// Unpack entities lookup where the numbers are in radix 32 to reduce the size

+	namedEntities = buildEntitiesLookup(

+		'50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,' +

+		'5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,' +

+		'5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,' +

+		'5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,' +

+		'68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,' +

+		'6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,' +

+		'6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,' +

+		'75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,' +

+		'7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,' +

+		'7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,' +

+		'sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,' +

+		'st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,' +

+		't9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,' +

+		'tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,' +

+		'u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,' +

+		'81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,' +

+		'8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,' +

+		'8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,' +

+		'8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,' +

+		'8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,' +

+		'nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,' +

+		'rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,' +

+		'Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,' +

+		'80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,' +

+		'811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro'

+	, 32);

+

+	tinymce.html = tinymce.html || {};

+

+	tinymce.html.Entities = {

+		encodeRaw : function(text, attr) {

+			return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {

+				return baseEntities[chr] || chr;

+			});

+		},

+

+		encodeAllRaw : function(text) {

+			return ('' + text).replace(rawCharsRegExp, function(chr) {

+				return baseEntities[chr] || chr;

+			});

+		},

+

+		encodeNumeric : function(text, attr) {

+			return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {

+				// Multi byte sequence convert it to a single entity

+				if (chr.length > 1)

+					return '&#' + (((chr.charCodeAt(0) - 0xD800) * 0x400) + (chr.charCodeAt(1) - 0xDC00) + 0x10000) + ';';

+

+				return baseEntities[chr] || '&#' + chr.charCodeAt(0) + ';';

+			});

+		},

+

+		encodeNamed : function(text, attr, entities) {

+			entities = entities || namedEntities;

+

+			return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {

+				return baseEntities[chr] || entities[chr] || chr;

+			});

+		},

+

+		getEncodeFunc : function(name, entities) {

+			var Entities = tinymce.html.Entities;

+

+			entities = buildEntitiesLookup(entities) || namedEntities;

+

+			function encodeNamedAndNumeric(text, attr) {

+				return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {

+					return baseEntities[chr] || entities[chr] || '&#' + chr.charCodeAt(0) + ';' || chr;

+				});

+			};

+

+			function encodeCustomNamed(text, attr) {

+				return Entities.encodeNamed(text, attr, entities);

+			};

+

+			// Replace + with , to be compatible with previous TinyMCE versions

+			name = tinymce.makeMap(name.replace(/\+/g, ','));

+

+			// Named and numeric encoder

+			if (name.named && name.numeric)

+				return encodeNamedAndNumeric;

+

+			// Named encoder

+			if (name.named) {

+				// Custom names

+				if (entities)

+					return encodeCustomNamed;

+

+				return Entities.encodeNamed;

+			}

+

+			// Numeric

+			if (name.numeric)

+				return Entities.encodeNumeric;

+

+			// Raw encoder

+			return Entities.encodeRaw;

+		},

+

+		decode : function(text) {

+			return text.replace(entityRegExp, function(all, numeric, value) {

+				if (numeric) {

+					value = parseInt(value);

+

+					// Support upper UTF

+					if (value > 0xFFFF) {

+						value -= 0x10000;

+

+						return String.fromCharCode(0xD800 + (value >> 10), 0xDC00 + (value & 0x3FF));

+					} else

+						return asciiMap[value] || String.fromCharCode(value);

+				}

+

+				return reverseEntities[all] || namedEntities[all] || nativeDecode(all);

+			});

+		}

+	};

+})(tinymce);

+

+tinymce.html.Styles = function(settings, schema) {

+	var rgbRegExp = /rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,

+		urlOrStrRegExp = /(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,

+		styleRegExp = /\s*([^:]+):\s*([^;]+);?/g,

+		trimRightRegExp = /\s+$/,

+		urlColorRegExp = /rgb/,

+		undef, i, encodingLookup = {}, encodingItems;

+

+	settings = settings || {};

+

+	encodingItems = '\\" \\\' \\; \\: ; : _'.split(' ');

+	for (i = 0; i < encodingItems.length; i++) {

+		encodingLookup[encodingItems[i]] = '_' + i;

+		encodingLookup['_' + i] = encodingItems[i];

+	}

+

+	function toHex(match, r, g, b) {

+		function hex(val) {

+			val = parseInt(val).toString(16);

+

+			return val.length > 1 ? val : '0' + val; // 0 -> 00

+		};

+

+		return '#' + hex(r) + hex(g) + hex(b);

+	};

+

+	return {

+		toHex : function(color) {

+			return color.replace(rgbRegExp, toHex);

+		},

+

+		parse : function(css) {

+			var styles = {}, matches, name, value, isEncoded, urlConverter = settings.url_converter, urlConverterScope = settings.url_converter_scope || this;

+

+			function compress(prefix, suffix) {

+				var top, right, bottom, left;

+

+				// Get values and check it it needs compressing

+				top = styles[prefix + '-top' + suffix];

+				if (!top)

+					return;

+

+				right = styles[prefix + '-right' + suffix];

+				if (top != right)

+					return;

+

+				bottom = styles[prefix + '-bottom' + suffix];

+				if (right != bottom)

+					return;

+

+				left = styles[prefix + '-left' + suffix];

+				if (bottom != left)

+					return;

+

+				// Compress

+				styles[prefix + suffix] = left;

+				delete styles[prefix + '-top' + suffix];

+				delete styles[prefix + '-right' + suffix];

+				delete styles[prefix + '-bottom' + suffix];

+				delete styles[prefix + '-left' + suffix];

+			};

+

+			function canCompress(key) {

+				var value = styles[key], i;

+

+				if (!value || value.indexOf(' ') < 0)

+					return;

+

+				value = value.split(' ');

+				i = value.length;

+				while (i--) {

+					if (value[i] !== value[0])

+						return false;

+				}

+

+				styles[key] = value[0];

+

+				return true;

+			};

+

+			function compress2(target, a, b, c) {

+				if (!canCompress(a))

+					return;

+

+				if (!canCompress(b))

+					return;

+

+				if (!canCompress(c))

+					return;

+

+				// Compress

+				styles[target] = styles[a] + ' ' + styles[b] + ' ' + styles[c];

+				delete styles[a];

+				delete styles[b];

+				delete styles[c];

+			};

+

+			// Encodes the specified string by replacing all \" \' ; : with _<num>

+			function encode(str) {

+				isEncoded = true;

+

+				return encodingLookup[str];

+			};

+

+			// Decodes the specified string by replacing all _<num> with it's original value \" \' etc

+			// It will also decode the \" \' if keep_slashes is set to fale or omitted

+			function decode(str, keep_slashes) {

+				if (isEncoded) {

+					str = str.replace(/_[0-9]/g, function(str) {

+						return encodingLookup[str];

+					});

+				}

+

+				if (!keep_slashes)

+					str = str.replace(/\\([\'\";:])/g, "$1");

+

+				return str;

+			}

+

+			if (css) {

+				// Encode \" \' % and ; and : inside strings so they don't interfere with the style parsing

+				css = css.replace(/\\[\"\';:_]/g, encode).replace(/\"[^\"]+\"|\'[^\']+\'/g, function(str) {

+					return str.replace(/[;:]/g, encode);

+				});

+

+				// Parse styles

+				while (matches = styleRegExp.exec(css)) {

+					name = matches[1].replace(trimRightRegExp, '').toLowerCase();

+					value = matches[2].replace(trimRightRegExp, '');

+

+					if (name && value.length > 0) {

+						// Opera will produce 700 instead of bold in their style values

+						if (name === 'font-weight' && value === '700')

+							value = 'bold';

+						else if (name === 'color' || name === 'background-color') // Lowercase colors like RED

+							value = value.toLowerCase();		

+

+						// Convert RGB colors to HEX

+						value = value.replace(rgbRegExp, toHex);

+

+						// Convert URLs and force them into url('value') format

+						value = value.replace(urlOrStrRegExp, function(match, url, url2, url3, str, str2) {

+							str = str || str2;

+

+							if (str) {

+								str = decode(str);

+

+								// Force strings into single quote format

+								return "'" + str.replace(/\'/g, "\\'") + "'";

+							}

+

+							url = decode(url || url2 || url3);

+

+							// Convert the URL to relative/absolute depending on config

+							if (urlConverter)

+								url = urlConverter.call(urlConverterScope, url, 'style');

+

+							// Output new URL format

+							return "url('" + url.replace(/\'/g, "\\'") + "')";

+						});

+

+						styles[name] = isEncoded ? decode(value, true) : value;

+					}

+

+					styleRegExp.lastIndex = matches.index + matches[0].length;

+				}

+

+				// Compress the styles to reduce it's size for example IE will expand styles

+				compress("border", "");

+				compress("border", "-width");

+				compress("border", "-color");

+				compress("border", "-style");

+				compress("padding", "");

+				compress("margin", "");

+				compress2('border', 'border-width', 'border-style', 'border-color');

+

+				// Remove pointless border, IE produces these

+				if (styles.border === 'medium none')

+					delete styles.border;

+			}

+

+			return styles;

+		},

+

+		serialize : function(styles, element_name) {

+			var css = '', name, value;

+

+			function serializeStyles(name) {

+				var styleList, i, l, name, value;

+

+				styleList = schema.styles[name];

+				if (styleList) {

+					for (i = 0, l = styleList.length; i < l; i++) {

+						name = styleList[i];

+						value = styles[name];

+

+						if (value !== undef && value.length > 0)

+							css += (css.length > 0 ? ' ' : '') + name + ': ' + value + ';';

+					}

+				}

+			};

+

+			// Serialize styles according to schema

+			if (element_name && schema && schema.styles) {

+				// Serialize global styles and element specific styles

+				serializeStyles('*');

+				serializeStyles(name);

+			} else {

+				// Output the styles in the order they are inside the object

+				for (name in styles) {

+					value = styles[name];

+

+					if (value !== undef && value.length > 0)

+						css += (css.length > 0 ? ' ' : '') + name + ': ' + value + ';';

+				}

+			}

+

+			return css;

+		}

+	};

+};

+

+(function(tinymce) {

+	var transitional = {}, boolAttrMap, blockElementsMap, shortEndedElementsMap, nonEmptyElementsMap,

+		whiteSpaceElementsMap, selfClosingElementsMap, makeMap = tinymce.makeMap, each = tinymce.each;

+

+	function split(str, delim) {

+		return str.split(delim || ',');

+	};

+

+	function unpack(lookup, data) {

+		var key, elements = {};

+

+		function replace(value) {

+			return value.replace(/[A-Z]+/g, function(key) {

+				return replace(lookup[key]);

+			});

+		};

+

+		// Unpack lookup

+		for (key in lookup) {

+			if (lookup.hasOwnProperty(key))

+				lookup[key] = replace(lookup[key]);

+		}

+

+		// Unpack and parse data into object map

+		replace(data).replace(/#/g, '#text').replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g, function(str, name, attributes, children) {

+			attributes = split(attributes, '|');

+

+			elements[name] = {

+				attributes : makeMap(attributes),

+				attributesOrder : attributes,

+				children : makeMap(children, '|', {'#comment' : {}})

+			}

+		});

+

+		return elements;

+	};

+

+	// Build a lookup table for block elements both lowercase and uppercase

+	blockElementsMap = 'h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,' + 

+						'th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,' + 

+						'noscript,menu,isindex,samp,header,footer,article,section,hgroup';

+	blockElementsMap = makeMap(blockElementsMap, ',', makeMap(blockElementsMap.toUpperCase()));

+

+	// This is the XHTML 1.0 transitional elements with it's attributes and children packed to reduce it's size

+	transitional = unpack({

+		Z : 'H|K|N|O|P',

+		Y : 'X|form|R|Q',

+		ZG : 'E|span|width|align|char|charoff|valign',

+		X : 'p|T|div|U|W|isindex|fieldset|table',

+		ZF : 'E|align|char|charoff|valign',

+		W : 'pre|hr|blockquote|address|center|noframes',

+		ZE : 'abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height',

+		ZD : '[E][S]',

+		U : 'ul|ol|dl|menu|dir',

+		ZC : 'p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',

+		T : 'h1|h2|h3|h4|h5|h6',

+		ZB : 'X|S|Q',

+		S : 'R|P',

+		ZA : 'a|G|J|M|O|P',

+		R : 'a|H|K|N|O',

+		Q : 'noscript|P',

+		P : 'ins|del|script',

+		O : 'input|select|textarea|label|button',

+		N : 'M|L',

+		M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',

+		L : 'sub|sup',

+		K : 'J|I',

+		J : 'tt|i|b|u|s|strike',

+		I : 'big|small|font|basefont',

+		H : 'G|F',

+		G : 'br|span|bdo',

+		F : 'object|applet|img|map|iframe',

+		E : 'A|B|C',

+		D : 'accesskey|tabindex|onfocus|onblur',

+		C : 'onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup',

+		B : 'lang|xml:lang|dir',

+		A : 'id|class|style|title'

+	}, 'script[id|charset|type|language|src|defer|xml:space][]' + 

+		'style[B|id|type|media|title|xml:space][]' + 

+		'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' + 

+		'param[id|name|value|valuetype|type][]' + 

+		'p[E|align][#|S]' + 

+		'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' + 

+		'br[A|clear][]' + 

+		'span[E][#|S]' + 

+		'bdo[A|C|B][#|S]' + 

+		'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' + 

+		'h1[E|align][#|S]' + 

+		'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' + 

+		'map[B|C|A|name][X|form|Q|area]' + 

+		'h2[E|align][#|S]' + 

+		'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' + 

+		'h3[E|align][#|S]' + 

+		'tt[E][#|S]' + 

+		'i[E][#|S]' + 

+		'b[E][#|S]' + 

+		'u[E][#|S]' + 

+		's[E][#|S]' + 

+		'strike[E][#|S]' + 

+		'big[E][#|S]' + 

+		'small[E][#|S]' + 

+		'font[A|B|size|color|face][#|S]' + 

+		'basefont[id|size|color|face][]' + 

+		'em[E][#|S]' + 

+		'strong[E][#|S]' + 

+		'dfn[E][#|S]' + 

+		'code[E][#|S]' + 

+		'q[E|cite][#|S]' + 

+		'samp[E][#|S]' + 

+		'kbd[E][#|S]' + 

+		'var[E][#|S]' + 

+		'cite[E][#|S]' + 

+		'abbr[E][#|S]' + 

+		'acronym[E][#|S]' + 

+		'sub[E][#|S]' + 

+		'sup[E][#|S]' + 

+		'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' + 

+		'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' + 

+		'optgroup[E|disabled|label][option]' + 

+		'option[E|selected|disabled|label|value][]' + 

+		'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' + 

+		'label[E|for|accesskey|onfocus|onblur][#|S]' + 

+		'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + 

+		'h4[E|align][#|S]' + 

+		'ins[E|cite|datetime][#|Y]' + 

+		'h5[E|align][#|S]' + 

+		'del[E|cite|datetime][#|Y]' + 

+		'h6[E|align][#|S]' + 

+		'div[E|align][#|Y]' + 

+		'ul[E|type|compact][li]' + 

+		'li[E|type|value][#|Y]' + 

+		'ol[E|type|compact|start][li]' + 

+		'dl[E|compact][dt|dd]' + 

+		'dt[E][#|S]' + 

+		'dd[E][#|Y]' + 

+		'menu[E|compact][li]' + 

+		'dir[E|compact][li]' + 

+		'pre[E|width|xml:space][#|ZA]' + 

+		'hr[E|align|noshade|size|width][]' + 

+		'blockquote[E|cite][#|Y]' + 

+		'address[E][#|S|p]' + 

+		'center[E][#|Y]' + 

+		'noframes[E][#|Y]' + 

+		'isindex[A|B|prompt][]' + 

+		'fieldset[E][#|legend|Y]' + 

+		'legend[E|accesskey|align][#|S]' + 

+		'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' + 

+		'caption[E|align][#|S]' + 

+		'col[ZG][]' + 

+		'colgroup[ZG][col]' + 

+		'thead[ZF][tr]' + 

+		'tr[ZF|bgcolor][th|td]' + 

+		'th[E|ZE][#|Y]' + 

+		'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' + 

+		'noscript[E][#|Y]' + 

+		'td[E|ZE][#|Y]' + 

+		'tfoot[ZF][tr]' + 

+		'tbody[ZF][tr]' + 

+		'area[E|D|shape|coords|href|nohref|alt|target][]' + 

+		'base[id|href|target][]' + 

+		'body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]'

+	);

+

+	boolAttrMap = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected,preload,autoplay,loop,controls');

+	shortEndedElementsMap = makeMap('area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,source');

+	nonEmptyElementsMap = tinymce.extend(makeMap('td,th,iframe,video,object'), shortEndedElementsMap);

+	whiteSpaceElementsMap = makeMap('pre,script,style');

+	selfClosingElementsMap = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr');

+

+	tinymce.html.Schema = function(settings) {

+		var self = this, elements = {}, children = {}, patternElements = [], validStyles;

+

+		settings = settings || {};

+

+		// Allow all elements and attributes if verify_html is set to false

+		if (settings.verify_html === false)

+			settings.valid_elements = '*[*]';

+

+		// Build styles list

+		if (settings.valid_styles) {

+			validStyles = {};

+

+			// Convert styles into a rule list

+			each(settings.valid_styles, function(value, key) {

+				validStyles[key] = tinymce.explode(value);

+			});

+		}

+

+		// Converts a wildcard expression string to a regexp for example *a will become /.*a/.

+		function patternToRegExp(str) {

+			return new RegExp('^' + str.replace(/([?+*])/g, '.$1') + '$');

+		};

+

+		// Parses the specified valid_elements string and adds to the current rules

+		// This function is a bit hard to read since it's heavily optimized for speed

+		function addValidElements(valid_elements) {

+			var ei, el, ai, al, yl, matches, element, attr, attrData, elementName, attrName, attrType, attributes, attributesOrder,

+				prefix, outputName, globalAttributes, globalAttributesOrder, transElement, key, childKey, value,

+				elementRuleRegExp = /^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,

+				attrRuleRegExp = /^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,

+				hasPatternsRegExp = /[*?+]/;

+

+			if (valid_elements) {

+				// Split valid elements into an array with rules

+				valid_elements = split(valid_elements);

+

+				if (elements['@']) {

+					globalAttributes = elements['@'].attributes;

+					globalAttributesOrder = elements['@'].attributesOrder;

+				}

+

+				// Loop all rules

+				for (ei = 0, el = valid_elements.length; ei < el; ei++) {

+					// Parse element rule

+					matches = elementRuleRegExp.exec(valid_elements[ei]);

+					if (matches) {

+						// Setup local names for matches

+						prefix = matches[1];

+						elementName = matches[2];

+						outputName = matches[3];

+						attrData = matches[4];

+

+						// Create new attributes and attributesOrder

+						attributes = {};

+						attributesOrder = [];

+

+						// Create the new element

+						element = {

+							attributes : attributes,

+							attributesOrder : attributesOrder

+						};

+

+						// Padd empty elements prefix

+						if (prefix === '#')

+							element.paddEmpty = true;

+

+						// Remove empty elements prefix

+						if (prefix === '-')

+							element.removeEmpty = true;

+

+						// Copy attributes from global rule into current rule

+						if (globalAttributes) {

+							for (key in globalAttributes)

+								attributes[key] = globalAttributes[key];

+

+							attributesOrder.push.apply(attributesOrder, globalAttributesOrder);

+						}

+

+						// Attributes defined

+						if (attrData) {

+							attrData = split(attrData, '|');

+							for (ai = 0, al = attrData.length; ai < al; ai++) {

+								matches = attrRuleRegExp.exec(attrData[ai]);

+								if (matches) {

+									attr = {};

+									attrType = matches[1];

+									attrName = matches[2].replace(/::/g, ':');

+									prefix = matches[3];

+									value = matches[4];

+

+									// Required

+									if (attrType === '!') {

+										element.attributesRequired = element.attributesRequired || [];

+										element.attributesRequired.push(attrName);

+										attr.required = true;

+									}

+

+									// Denied from global

+									if (attrType === '-') {

+										delete attributes[attrName];

+										attributesOrder.splice(tinymce.inArray(attributesOrder, attrName), 1);

+										continue;

+									}

+

+									// Default value

+									if (prefix) {

+										// Default value

+										if (prefix === '=') {

+											element.attributesDefault = element.attributesDefault || [];

+											element.attributesDefault.push({name: attrName, value: value});

+											attr.defaultValue = value;

+										}

+

+										// Forced value

+										if (prefix === ':') {

+											element.attributesForced = element.attributesForced || [];

+											element.attributesForced.push({name: attrName, value: value});

+											attr.forcedValue = value;

+										}

+

+										// Required values

+										if (prefix === '<')

+											attr.validValues = makeMap(value, '?');

+									}

+

+									// Check for attribute patterns

+									if (hasPatternsRegExp.test(attrName)) {

+										element.attributePatterns = element.attributePatterns || [];

+										attr.pattern = patternToRegExp(attrName);

+										element.attributePatterns.push(attr);

+									} else {

+										// Add attribute to order list if it doesn't already exist

+										if (!attributes[attrName])

+											attributesOrder.push(attrName);

+

+										attributes[attrName] = attr;

+									}

+								}

+							}

+						}

+

+						// Global rule, store away these for later usage

+						if (!globalAttributes && elementName == '@') {

+							globalAttributes = attributes;

+							globalAttributesOrder = attributesOrder;

+						}

+

+						// Handle substitute elements such as b/strong

+						if (outputName) {

+							element.outputName = elementName;

+							elements[outputName] = element;

+						}

+

+						// Add pattern or exact element

+						if (hasPatternsRegExp.test(elementName)) {

+							element.pattern = patternToRegExp(elementName);

+							patternElements.push(element);

+						} else

+							elements[elementName] = element;

+					}

+				}

+			}

+		};

+

+		function setValidElements(valid_elements) {

+			elements = {};

+			patternElements = [];

+

+			addValidElements(valid_elements);

+

+			each(transitional, function(element, name) {

+				children[name] = element.children;

+			});

+		};

+

+		// Adds custom non HTML elements to the schema

+		function addCustomElements(custom_elements) {

+			var customElementRegExp = /^(~)?(.+)$/;

+

+			if (custom_elements) {

+				each(split(custom_elements), function(rule) {

+					var matches = customElementRegExp.exec(rule),

+						cloneName = matches[1] === '~' ? 'span' : 'div',

+						name = matches[2];

+

+					children[name] = children[cloneName];

+

+					// Add custom elements at span/div positions

+					each(children, function(element, child) {

+						if (element[cloneName])

+							element[name] = element[cloneName];

+					});

+				});

+			}

+		};

+

+		// Adds valid children to the schema object

+		function addValidChildren(valid_children) {

+			var childRuleRegExp = /^([+\-]?)(\w+)\[([^\]]+)\]$/;

+

+			if (valid_children) {

+				each(split(valid_children), function(rule) {

+					var matches = childRuleRegExp.exec(rule), parent, prefix;

+

+					if (matches) {

+						prefix = matches[1];

+

+						// Add/remove items from default

+						if (prefix)

+							parent = children[matches[2]];

+						else

+							parent = children[matches[2]] = {'#comment' : {}};

+

+						parent = children[matches[2]];

+

+						each(split(matches[3], '|'), function(child) {

+							if (prefix === '-')

+								delete parent[child];

+							else

+								parent[child] = {};

+						});

+					}

+				});

+			}

+		}

+

+		if (!settings.valid_elements) {

+			// No valid elements defined then clone the elements from the transitional spec

+			each(transitional, function(element, name) {

+				elements[name] = {

+					attributes : element.attributes,

+					attributesOrder : element.attributesOrder

+				};

+

+				children[name] = element.children;

+			});

+

+			// Switch these

+			each(split('strong/b,em/i'), function(item) {

+				item = split(item, '/');

+				elements[item[1]].outputName = item[0];

+			});

+

+			// Add default alt attribute for images

+			elements.img.attributesDefault = [{name: 'alt', value: ''}];

+

+			// Remove these if they are empty by default

+			each(split('ol,ul,li,sub,sup,blockquote,tr,div,span,font,a,table,tbody'), function(name) {

+				elements[name].removeEmpty = true;

+			});

+

+			// Padd these by default

+			each(split('p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption'), function(name) {

+				elements[name].paddEmpty = true;

+			});

+		} else

+			setValidElements(settings.valid_elements);

+

+		addCustomElements(settings.custom_elements);

+		addValidChildren(settings.valid_children);

+		addValidElements(settings.extended_valid_elements);

+

+		// Todo: Remove this when we fix list handling to be valid

+		addValidChildren('+ol[ul|ol],+ul[ul|ol]');

+

+		// Delete invalid elements

+		if (settings.invalid_elements) {

+			tinymce.each(tinymce.explode(settings.invalid_elements), function(item) {

+				if (elements[item])

+					delete elements[item];

+			});

+		}

+

+		self.children = children;

+

+		self.styles = validStyles;

+

+		self.getBoolAttrs = function() {

+			return boolAttrMap;

+		};

+

+		self.getBlockElements = function() {

+			return blockElementsMap;

+		};

+

+		self.getShortEndedElements = function() {

+			return shortEndedElementsMap;

+		};

+

+		self.getSelfClosingElements = function() {

+			return selfClosingElementsMap;

+		};

+

+		self.getNonEmptyElements = function() {

+			return nonEmptyElementsMap;

+		};

+

+		self.getWhiteSpaceElements = function() {

+			return whiteSpaceElementsMap;

+		};

+

+		self.isValidChild = function(name, child) {

+			var parent = children[name];

+

+			return !!(parent && parent[child]);

+		};

+

+		self.getElementRule = function(name) {

+			var element = elements[name], i;

+

+			// Exact match found

+			if (element)

+				return element;

+

+			// No exact match then try the patterns

+			i = patternElements.length;

+			while (i--) {

+				element = patternElements[i];

+

+				if (element.pattern.test(name))

+					return element;

+			}

+		};

+

+		self.addValidElements = addValidElements;

+

+		self.setValidElements = setValidElements;

+

+		self.addCustomElements = addCustomElements;

+

+		self.addValidChildren = addValidChildren;

+	};

+

+	// Expose boolMap and blockElementMap as static properties for usage in DOMUtils

+	tinymce.html.Schema.boolAttrMap = boolAttrMap;

+	tinymce.html.Schema.blockElementsMap = blockElementsMap;

+})(tinymce);

+

+(function(tinymce) {

+	tinymce.html.SaxParser = function(settings, schema) {

+		var self = this, noop = function() {};

+

+		settings = settings || {};

+		self.schema = schema = schema || new tinymce.html.Schema();

+

+		if (settings.fix_self_closing !== false)

+			settings.fix_self_closing = true;

+

+		// Add handler functions from settings and setup default handlers

+		tinymce.each('comment cdata text start end pi doctype'.split(' '), function(name) {

+			if (name)

+				self[name] = settings[name] || noop;

+		});

+

+		self.parse = function(html) {

+			var self = this, matches, index = 0, value, endRegExp, stack = [], attrList, i, text, name,

+				shortEndedElements, fillAttrsMap, isShortEnded, validate, elementRule, isValidElement, attr, attribsValue,

+				validAttributesMap, validAttributePatterns, attributesRequired, attributesDefault, attributesForced, selfClosing,

+				tokenRegExp, attrRegExp, specialElements, attrValue, idCount = 0, decode = tinymce.html.Entities.decode, fixSelfClosing;

+

+			function processEndTag(name) {

+				var pos, i;

+

+				// Find position of parent of the same type

+				pos = stack.length;

+				while (pos--) {

+					if (stack[pos].name === name)

+						break;						

+				}

+

+				// Found parent

+				if (pos >= 0) {

+					// Close all the open elements

+					for (i = stack.length - 1; i >= pos; i--) {

+						name = stack[i];

+

+						if (name.valid)

+							self.end(name.name);

+					}

+

+					// Remove the open elements from the stack

+					stack.length = pos;

+				}

+			};

+

+			// Precompile RegExps and map objects

+			tokenRegExp = new RegExp('<(?:' +

+				'(?:!--([\\w\\W]*?)-->)|' + // Comment

+				'(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|' + // CDATA

+				'(?:!DOCTYPE([\\w\\W]*?)>)|' + // DOCTYPE

+				'(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|' + // PI

+				'(?:\\/([^>]+)>)|' + // End element

+				'(?:([^\\s\\/<>]+)\\s*((?:[^"\'>]+(?:(?:"[^"]*")|(?:\'[^\']*\')|[^>]*))*)>)' + // Start element

+			')', 'g');

+

+			attrRegExp = /([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;

+			specialElements = {

+				'script' : /<\/script[^>]*>/gi,

+				'style' : /<\/style[^>]*>/gi,

+				'noscript' : /<\/noscript[^>]*>/gi

+			};

+

+			// Setup lookup tables for empty elements and boolean attributes

+			shortEndedElements = schema.getShortEndedElements();

+			selfClosing = schema.getSelfClosingElements();

+			fillAttrsMap = schema.getBoolAttrs();

+			validate = settings.validate;

+			fixSelfClosing = settings.fix_self_closing;

+

+			while (matches = tokenRegExp.exec(html)) {

+				// Text

+				if (index < matches.index)

+					self.text(decode(html.substr(index, matches.index - index)));

+

+				if (value = matches[6]) { // End element

+					processEndTag(value.toLowerCase());

+				} else if (value = matches[7]) { // Start element

+					value = value.toLowerCase();

+					isShortEnded = value in shortEndedElements;

+

+					// Is self closing tag for example an <li> after an open <li>

+					if (fixSelfClosing && selfClosing[value] && stack.length > 0 && stack[stack.length - 1].name === value)

+						processEndTag(value);

+

+					// Validate element

+					if (!validate || (elementRule = schema.getElementRule(value))) {

+						isValidElement = true;

+

+						// Grab attributes map and patters when validation is enabled

+						if (validate) {

+							validAttributesMap = elementRule.attributes;

+							validAttributePatterns = elementRule.attributePatterns;

+						}

+

+						// Parse attributes

+						if (attribsValue = matches[8]) {

+							attrList = [];

+							attrList.map = {};

+

+							attribsValue.replace(attrRegExp, function(match, name, value, val2, val3) {

+								var attrRule, i;

+

+								name = name.toLowerCase();

+								value = name in fillAttrsMap ? name : decode(value || val2 || val3 || ''); // Handle boolean attribute than value attribute

+

+								// Validate name and value

+								if (validate && name.indexOf('data-') !== 0) {

+									attrRule = validAttributesMap[name];

+

+									// Find rule by pattern matching

+									if (!attrRule && validAttributePatterns) {

+										i = validAttributePatterns.length;

+										while (i--) {

+											attrRule = validAttributePatterns[i];

+											if (attrRule.pattern.test(name))

+												break;

+										}

+

+										// No rule matched

+										if (i === -1)

+											attrRule = null;

+									}

+

+									// No attribute rule found

+									if (!attrRule)

+										return;

+

+									// Validate value

+									if (attrRule.validValues && !(value in attrRule.validValues))

+										return;

+								}

+

+								// Add attribute to list and map

+								attrList.map[name] = value;

+								attrList.push({

+									name: name,

+									value: value

+								});

+							});

+						} else {

+							attrList = [];

+							attrList.map = {};

+						}

+

+						// Process attributes if validation is enabled

+						if (validate) {

+							attributesRequired = elementRule.attributesRequired;

+							attributesDefault = elementRule.attributesDefault;

+							attributesForced = elementRule.attributesForced;

+

+							// Handle forced attributes

+							if (attributesForced) {

+								i = attributesForced.length;

+								while (i--) {

+									attr = attributesForced[i];

+									name = attr.name;

+									attrValue = attr.value;

+

+									if (attrValue === '{$uid}')

+										attrValue = 'mce_' + idCount++;

+

+									attrList.map[name] = attrValue;

+									attrList.push({name: name, value: attrValue});

+								}

+							}

+

+							// Handle default attributes

+							if (attributesDefault) {

+								i = attributesDefault.length;

+								while (i--) {

+									attr = attributesDefault[i];

+									name = attr.name;

+

+									if (!(name in attrList.map)) {

+										attrValue = attr.value;

+

+										if (attrValue === '{$uid}')

+											attrValue = 'mce_' + idCount++;

+

+										attrList.map[name] = attrValue;

+										attrList.push({name: name, value: attrValue});

+									}

+								}

+							}

+

+							// Handle required attributes

+							if (attributesRequired) {

+								i = attributesRequired.length;

+								while (i--) {

+									if (attributesRequired[i] in attrList.map)

+										break;

+								}

+

+								// None of the required attributes where found

+								if (i === -1)

+									isValidElement = false;

+							}

+

+							// Invalidate element if it's marked as bogus

+							if (attrList.map['data-mce-bogus'])

+								isValidElement = false;

+						}

+

+						if (isValidElement)

+							self.start(value, attrList, isShortEnded);

+					} else

+						isValidElement = false;

+

+					// Treat script, noscript and style a bit different since they may include code that looks like elements

+					if (endRegExp = specialElements[value]) {

+						endRegExp.lastIndex = index = matches.index + matches[0].length;

+

+						if (matches = endRegExp.exec(html)) {

+							if (isValidElement)

+								text = html.substr(index, matches.index - index);

+

+							index = matches.index + matches[0].length;

+						} else {

+							text = html.substr(index);

+							index = html.length;

+						}

+

+						if (isValidElement && text.length > 0)

+							self.text(text, true);

+

+						if (isValidElement)

+							self.end(value);

+

+						tokenRegExp.lastIndex = index;

+						continue;

+					}

+

+					// Push value on to stack

+					if (!isShortEnded) {

+						if (!attribsValue || attribsValue.indexOf('/') != attribsValue.length - 1)

+							stack.push({name: value, valid: isValidElement});

+						else if (isValidElement)

+							self.end(value);

+					}

+				} else if (value = matches[1]) { // Comment

+					self.comment(value);

+				} else if (value = matches[2]) { // CDATA

+					self.cdata(value);

+				} else if (value = matches[3]) { // DOCTYPE

+					self.doctype(value);

+				} else if (value = matches[4]) { // PI

+					self.pi(value, matches[5]);

+				}

+

+				index = matches.index + matches[0].length;

+			}

+

+			// Text

+			if (index < html.length)

+				self.text(decode(html.substr(index)));

+

+			// Close any open elements

+			for (i = stack.length - 1; i >= 0; i--) {

+				value = stack[i];

+

+				if (value.valid)

+					self.end(value.name);

+			}

+		};

+	}

+})(tinymce);

+

+(function(tinymce) {

+	var whiteSpaceRegExp = /^[ \t\r\n]*$/, typeLookup = {

+		'#text' : 3,

+		'#comment' : 8,

+		'#cdata' : 4,

+		'#pi' : 7,

+		'#doctype' : 10,

+		'#document-fragment' : 11

+	};

+

+	// Walks the tree left/right

+	function walk(node, root_node, prev) {

+		var sibling, parent, startName = prev ? 'lastChild' : 'firstChild', siblingName = prev ? 'prev' : 'next';

+

+		// Walk into nodes if it has a start

+		if (node[startName])

+			return node[startName];

+

+		// Return the sibling if it has one

+		if (node !== root_node) {

+			sibling = node[siblingName];

+

+			if (sibling)

+				return sibling;

+

+			// Walk up the parents to look for siblings

+			for (parent = node.parent; parent && parent !== root_node; parent = parent.parent) {

+				sibling = parent[siblingName];

+

+				if (sibling)

+					return sibling;

+			}

+		}

+	};

+

+	function Node(name, type) {

+		this.name = name;

+		this.type = type;

+

+		if (type === 1) {

+			this.attributes = [];

+			this.attributes.map = {};

+		}

+	}

+

+	tinymce.extend(Node.prototype, {

+		replace : function(node) {

+			var self = this;

+

+			if (node.parent)

+				node.remove();

+

+			self.insert(node, self);

+			self.remove();

+

+			return self;

+		},

+

+		attr : function(name, value) {

+			var self = this, attrs, i, undef;

+

+			if (typeof name !== "string") {

+				for (i in name)

+					self.attr(i, name[i]);

+

+				return self;

+			}

+

+			if (attrs = self.attributes) {

+				if (value !== undef) {

+					// Remove attribute

+					if (value === null) {

+						if (name in attrs.map) {

+							delete attrs.map[name];

+

+							i = attrs.length;

+							while (i--) {

+								if (attrs[i].name === name) {

+									attrs = attrs.splice(i, 1);

+									return self;

+								}

+							}

+						}

+

+						return self;

+					}

+

+					// Set attribute

+					if (name in attrs.map) {

+						// Set attribute

+						i = attrs.length;

+						while (i--) {

+							if (attrs[i].name === name) {

+								attrs[i].value = value;

+								break;

+							}

+						}

+					} else

+						attrs.push({name: name, value: value});

+

+					attrs.map[name] = value;

+

+					return self;

+				} else {

+					return attrs.map[name];

+				}

+			}

+		},

+

+		clone : function() {

+			var self = this, clone = new Node(self.name, self.type), i, l, selfAttrs, selfAttr, cloneAttrs;

+

+			// Clone element attributes

+			if (selfAttrs = self.attributes) {

+				cloneAttrs = [];

+				cloneAttrs.map = {};

+

+				for (i = 0, l = selfAttrs.length; i < l; i++) {

+					selfAttr = selfAttrs[i];

+

+					// Clone everything except id

+					if (selfAttr.name !== 'id') {

+						cloneAttrs[cloneAttrs.length] = {name: selfAttr.name, value: selfAttr.value};

+						cloneAttrs.map[selfAttr.name] = selfAttr.value;

+					}

+				}

+

+				clone.attributes = cloneAttrs;

+			}

+

+			clone.value = self.value;

+			clone.shortEnded = self.shortEnded;

+

+			return clone;

+		},

+

+		wrap : function(wrapper) {

+			var self = this;

+

+			self.parent.insert(wrapper, self);

+			wrapper.append(self);

+

+			return self;

+		},

+

+		unwrap : function() {

+			var self = this, node, next;

+

+			for (node = self.firstChild; node; ) {

+				next = node.next;

+				self.insert(node, self, true);

+				node = next;

+			}

+

+			self.remove();

+		},

+

+		remove : function() {

+			var self = this, parent = self.parent, next = self.next, prev = self.prev;

+

+			if (parent) {

+				if (parent.firstChild === self) {

+					parent.firstChild = next;

+

+					if (next)

+						next.prev = null;

+				} else {

+					prev.next = next;

+				}

+

+				if (parent.lastChild === self) {

+					parent.lastChild = prev;

+

+					if (prev)

+						prev.next = null;

+				} else {

+					next.prev = prev;

+				}

+

+				self.parent = self.next = self.prev = null;

+			}

+

+			return self;

+		},

+

+		append : function(node) {

+			var self = this, last;

+

+			if (node.parent)

+				node.remove();

+

+			last = self.lastChild;

+			if (last) {

+				last.next = node;

+				node.prev = last;

+				self.lastChild = node;

+			} else

+				self.lastChild = self.firstChild = node;

+

+			node.parent = self;

+

+			return node;

+		},

+

+		insert : function(node, ref_node, before) {

+			var parent;

+

+			if (node.parent)

+				node.remove();

+

+			parent = ref_node.parent || this;

+

+			if (before) {

+				if (ref_node === parent.firstChild)

+					parent.firstChild = node;

+				else

+					ref_node.prev.next = node;

+

+				node.prev = ref_node.prev;

+				node.next = ref_node;

+				ref_node.prev = node;

+			} else {

+				if (ref_node === parent.lastChild)

+					parent.lastChild = node;

+				else

+					ref_node.next.prev = node;

+

+				node.next = ref_node.next;

+				node.prev = ref_node;

+				ref_node.next = node;

+			}

+

+			node.parent = parent;

+

+			return node;

+		},

+

+		getAll : function(name) {

+			var self = this, node, collection = [];

+

+			for (node = self.firstChild; node; node = walk(node, self)) {

+				if (node.name === name)

+					collection.push(node);

+			}

+

+			return collection;

+		},

+

+		empty : function() {

+			var self = this, nodes, i, node;

+

+			// Remove all children

+			if (self.firstChild) {

+				nodes = [];

+

+				// Collect the children

+				for (node = self.firstChild; node; node = walk(node, self))

+					nodes.push(node);

+

+				// Remove the children

+				i = nodes.length;

+				while (i--) {

+					node = nodes[i];

+					node.parent = node.firstChild = node.lastChild = node.next = node.prev = null;

+				}

+			}

+

+			self.firstChild = self.lastChild = null;

+

+			return self;

+		},

+

+		isEmpty : function(elements) {

+			var self = this, node = self.firstChild, i, name;

+

+			if (node) {

+				do {

+					if (node.type === 1) {

+						// Ignore bogus elements

+						if (node.attributes.map['data-mce-bogus'])

+							continue;

+

+						// Keep empty elements like <img />

+						if (elements[node.name])

+							return false;

+

+						// Keep elements with data attributes or name attribute like <a name="1"></a>

+						i = node.attributes.length;

+						while (i--) {

+							name = node.attributes[i].name;

+							if (name === "name" || name.indexOf('data-') === 0)

+								return false;

+						}

+					}

+

+					// Keep non whitespace text nodes

+					if ((node.type === 3 && !whiteSpaceRegExp.test(node.value)))

+						return false;

+				} while (node = walk(node, self));

+			}

+

+			return true;

+		}

+	});

+

+	tinymce.extend(Node, {

+		create : function(name, attrs) {

+			var node, attrName;

+

+			// Create node

+			node = new Node(name, typeLookup[name] || 1);

+

+			// Add attributes if needed

+			if (attrs) {

+				for (attrName in attrs)

+					node.attr(attrName, attrs[attrName]);

+			}

+

+			return node;

+		}

+	});

+

+	tinymce.html.Node = Node;

+})(tinymce);

+

+(function(tinymce) {

+	var Node = tinymce.html.Node;

+

+	tinymce.html.DomParser = function(settings, schema) {

+		var self = this, nodeFilters = {}, attributeFilters = [], matchedNodes = {}, matchedAttributes = {};

+

+		settings = settings || {};

+		settings.validate = "validate" in settings ? settings.validate : true;

+		settings.root_name = settings.root_name || 'body';

+		self.schema = schema = schema || new tinymce.html.Schema();

+

+		function fixInvalidChildren(nodes) {

+			var ni, node, parent, parents, newParent, currentNode, tempNode, childNode, i,

+				childClone, nonEmptyElements, nonSplitableElements, sibling, nextNode;

+

+			nonSplitableElements = tinymce.makeMap('tr,td,th,tbody,thead,tfoot,table');

+			nonEmptyElements = schema.getNonEmptyElements();

+

+			for (ni = 0; ni < nodes.length; ni++) {

+				node = nodes[ni];

+

+				// Already removed

+				if (!node.parent)

+					continue;

+

+				// Get list of all parent nodes until we find a valid parent to stick the child into

+				parents = [node];

+				for (parent = node.parent; parent && !schema.isValidChild(parent.name, node.name) && !nonSplitableElements[parent.name]; parent = parent.parent)

+					parents.push(parent);

+

+				// Found a suitable parent

+				if (parent && parents.length > 1) {

+					// Reverse the array since it makes looping easier

+					parents.reverse();

+

+					// Clone the related parent and insert that after the moved node

+					newParent = currentNode = self.filterNode(parents[0].clone());

+

+					// Start cloning and moving children on the left side of the target node

+					for (i = 0; i < parents.length - 1; i++) {

+						if (schema.isValidChild(currentNode.name, parents[i].name)) {

+							tempNode = self.filterNode(parents[i].clone());

+							currentNode.append(tempNode);

+						} else

+							tempNode = currentNode;

+

+						for (childNode = parents[i].firstChild; childNode && childNode != parents[i + 1]; ) {

+							nextNode = childNode.next;

+							tempNode.append(childNode);

+							childNode = nextNode;

+						}

+

+						currentNode = tempNode;

+					}

+

+					if (!newParent.isEmpty(nonEmptyElements)) {

+						parent.insert(newParent, parents[0], true);

+						parent.insert(node, newParent);

+					} else {

+						parent.insert(node, parents[0], true);

+					}

+

+					// Check if the element is empty by looking through it's contents and special treatment for <p><br /></p>

+					parent = parents[0];

+					if (parent.isEmpty(nonEmptyElements) || parent.firstChild === parent.lastChild && parent.firstChild.name === 'br') {

+						parent.empty().remove();

+					}

+				} else if (node.parent) {

+					// If it's an LI try to find a UL/OL for it or wrap it

+					if (node.name === 'li') {

+						sibling = node.prev;

+						if (sibling && (sibling.name === 'ul' || sibling.name === 'ul')) {

+							sibling.append(node);

+							continue;

+						}

+

+						sibling = node.next;

+						if (sibling && (sibling.name === 'ul' || sibling.name === 'ul')) {

+							sibling.insert(node, sibling.firstChild, true);

+							continue;

+						}

+

+						node.wrap(self.filterNode(new Node('ul', 1)));

+						continue;

+					}

+

+					// Try wrapping the element in a DIV

+					if (schema.isValidChild(node.parent.name, 'div') && schema.isValidChild('div', node.name)) {

+						node.wrap(self.filterNode(new Node('div', 1)));

+					} else {

+						// We failed wrapping it, then remove or unwrap it

+						if (node.name === 'style' || node.name === 'script')

+							node.empty().remove();

+						else

+							node.unwrap();

+					}

+				}

+			}

+		};

+

+		self.filterNode = function(node) {

+			var i, name, list;

+

+			// Run element filters

+			if (name in nodeFilters) {

+				list = matchedNodes[name];

+

+				if (list)

+					list.push(node);

+				else

+					matchedNodes[name] = [node];

+			}

+

+			// Run attribute filters

+			i = attributeFilters.length;

+			while (i--) {

+				name = attributeFilters[i].name;

+

+				if (name in node.attributes.map) {

+					list = matchedAttributes[name];

+

+					if (list)

+						list.push(node);

+					else

+						matchedAttributes[name] = [node];

+				}

+			}

+

+			return node;

+		};

+

+		self.addNodeFilter = function(name, callback) {

+			tinymce.each(tinymce.explode(name), function(name) {

+				var list = nodeFilters[name];

+

+				if (!list)

+					nodeFilters[name] = list = [];

+

+				list.push(callback);

+			});

+		};

+

+		self.addAttributeFilter = function(name, callback) {

+			tinymce.each(tinymce.explode(name), function(name) {

+				var i;

+

+				for (i = 0; i < attributeFilters.length; i++) {

+					if (attributeFilters[i].name === name) {

+						attributeFilters[i].callbacks.push(callback);

+						return;

+					}

+				}

+

+				attributeFilters.push({name: name, callbacks: [callback]});

+			});

+		};

+

+		self.parse = function(html, args) {

+			var parser, rootNode, node, nodes, i, l, fi, fl, list, name, validate,

+				blockElements, startWhiteSpaceRegExp, invalidChildren = [],

+				endWhiteSpaceRegExp, allWhiteSpaceRegExp, whiteSpaceElements, children, nonEmptyElements;

+

+			args = args || {};

+			matchedNodes = {};

+			matchedAttributes = {};

+			blockElements = tinymce.extend(tinymce.makeMap('script,style,head,html,body,title,meta,param'), schema.getBlockElements());

+			nonEmptyElements = schema.getNonEmptyElements();

+			children = schema.children;

+			validate = settings.validate;

+

+			whiteSpaceElements = schema.getWhiteSpaceElements();

+			startWhiteSpaceRegExp = /^[ \t\r\n]+/;

+			endWhiteSpaceRegExp = /[ \t\r\n]+$/;

+			allWhiteSpaceRegExp = /[ \t\r\n]+/g;

+

+			function createNode(name, type) {

+				var node = new Node(name, type), list;

+

+				if (name in nodeFilters) {

+					list = matchedNodes[name];

+

+					if (list)

+						list.push(node);

+					else

+						matchedNodes[name] = [node];

+				}

+

+				return node;

+			};

+

+			function removeWhitespaceBefore(node) {

+				var textNode, textVal, sibling;

+

+				for (textNode = node.prev; textNode && textNode.type === 3; ) {

+					textVal = textNode.value.replace(endWhiteSpaceRegExp, '');

+

+					if (textVal.length > 0) {

+						textNode.value = textVal;

+						textNode = textNode.prev;

+					} else {

+						sibling = textNode.prev;

+						textNode.remove();

+						textNode = sibling;

+					}

+				}

+			};

+

+			parser = new tinymce.html.SaxParser({

+				validate : validate,

+				fix_self_closing : !validate, // Let the DOM parser handle <li> in <li> or <p> in <p> for better results

+

+				cdata: function(text) {

+					node.append(createNode('#cdata', 4)).value = text;

+				},

+

+				text: function(text, raw) {

+					var textNode;

+

+					// Trim all redundant whitespace on non white space elements

+					if (!whiteSpaceElements[node.name]) {

+						text = text.replace(allWhiteSpaceRegExp, ' ');

+

+						if (node.lastChild && blockElements[node.lastChild.name])

+							text = text.replace(startWhiteSpaceRegExp, '');

+					}

+

+					// Do we need to create the node

+					if (text.length !== 0) {

+						textNode = createNode('#text', 3);

+						textNode.raw = !!raw;

+						node.append(textNode).value = text;

+					}

+				},

+

+				comment: function(text) {

+					node.append(createNode('#comment', 8)).value = text;

+				},

+

+				pi: function(name, text) {

+					node.append(createNode(name, 7)).value = text;

+					removeWhitespaceBefore(node);

+				},

+

+				doctype: function(text) {

+					var newNode;

+		

+					newNode = node.append(createNode('#doctype', 10));

+					newNode.value = text;

+					removeWhitespaceBefore(node);

+				},

+

+				start: function(name, attrs, empty) {

+					var newNode, attrFiltersLen, elementRule, textNode, attrName, text, sibling, parent;

+

+					elementRule = validate ? schema.getElementRule(name) : {};

+					if (elementRule) {

+						newNode = createNode(elementRule.outputName || name, 1);

+						newNode.attributes = attrs;

+						newNode.shortEnded = empty;

+

+						node.append(newNode);

+

+						// Check if node is valid child of the parent node is the child is

+						// unknown we don't collect it since it's probably a custom element

+						parent = children[node.name];

+						if (parent && children[newNode.name] && !parent[newNode.name])

+							invalidChildren.push(newNode);

+

+						attrFiltersLen = attributeFilters.length;

+						while (attrFiltersLen--) {

+							attrName = attributeFilters[attrFiltersLen].name;

+

+							if (attrName in attrs.map) {

+								list = matchedAttributes[attrName];

+

+								if (list)

+									list.push(newNode);

+								else

+									matchedAttributes[attrName] = [newNode];

+							}

+						}

+

+						// Trim whitespace before block

+						if (blockElements[name])

+							removeWhitespaceBefore(newNode);

+

+						// Change current node if the element wasn't empty i.e not <br /> or <img />

+						if (!empty)

+							node = newNode;

+					}

+				},

+

+				end: function(name) {

+					var textNode, elementRule, text, sibling, tempNode;

+

+					elementRule = validate ? schema.getElementRule(name) : {};

+					if (elementRule) {

+						if (blockElements[name]) {

+							if (!whiteSpaceElements[node.name]) {

+								// Trim whitespace at beginning of block

+								for (textNode = node.firstChild; textNode && textNode.type === 3; ) {

+									text = textNode.value.replace(startWhiteSpaceRegExp, '');

+

+									if (text.length > 0) {

+										textNode.value = text;

+										textNode = textNode.next;

+									} else {

+										sibling = textNode.next;

+										textNode.remove();

+										textNode = sibling;

+									}

+								}

+

+								// Trim whitespace at end of block

+								for (textNode = node.lastChild; textNode && textNode.type === 3; ) {

+									text = textNode.value.replace(endWhiteSpaceRegExp, '');

+

+									if (text.length > 0) {

+										textNode.value = text;

+										textNode = textNode.prev;

+									} else {

+										sibling = textNode.prev;

+										textNode.remove();

+										textNode = sibling;

+									}

+								}

+							}

+

+							// Trim start white space

+							textNode = node.prev;

+							if (textNode && textNode.type === 3) {

+								text = textNode.value.replace(startWhiteSpaceRegExp, '');

+

+								if (text.length > 0)

+									textNode.value = text;

+								else

+									textNode.remove();

+							}

+						}

+

+						// Handle empty nodes

+						if (elementRule.removeEmpty || elementRule.paddEmpty) {

+							if (node.isEmpty(nonEmptyElements)) {

+								if (elementRule.paddEmpty)

+									node.empty().append(new Node('#text', '3')).value = '\u00a0';

+								else {

+									// Leave nodes that have a name like <a name="name">

+									if (!node.attributes.map.name) {

+										tempNode = node.parent;

+										node.empty().remove();

+										node = tempNode;

+										return;

+									}

+								}

+							}

+						}

+

+						node = node.parent;

+					}

+				}

+			}, schema);

+

+			rootNode = node = new Node(settings.root_name, 11);

+

+			parser.parse(html);

+

+			if (validate)

+				fixInvalidChildren(invalidChildren);

+

+			// Run node filters

+			for (name in matchedNodes) {

+				list = nodeFilters[name];

+				nodes = matchedNodes[name];

+

+				// Remove already removed children

+				fi = nodes.length;

+				while (fi--) {

+					if (!nodes[fi].parent)

+						nodes.splice(fi, 1);

+				}

+

+				for (i = 0, l = list.length; i < l; i++)

+					list[i](nodes, name, args);

+			}

+

+			// Run attribute filters

+			for (i = 0, l = attributeFilters.length; i < l; i++) {

+				list = attributeFilters[i];

+

+				if (list.name in matchedAttributes) {

+					nodes = matchedAttributes[list.name];

+

+					// Remove already removed children

+					fi = nodes.length;

+					while (fi--) {

+						if (!nodes[fi].parent)

+							nodes.splice(fi, 1);

+					}

+

+					for (fi = 0, fl = list.callbacks.length; fi < fl; fi++)

+						list.callbacks[fi](nodes, list.name, args);

+				}

+			}

+

+			return rootNode;

+		};

+

+		// Remove <br> at end of block elements Gecko and WebKit injects BR elements to

+		// make it possible to place the caret inside empty blocks. This logic tries to remove

+		// these elements and keep br elements that where intended to be there intact

+		if (settings.remove_trailing_brs) {

+			self.addNodeFilter('br', function(nodes, name) {

+				var i, l = nodes.length, node, blockElements = schema.getBlockElements(),

+					nonEmptyElements = schema.getNonEmptyElements(), parent, prev, prevName;

+

+				// Must loop forwards since it will otherwise remove all brs in <p>a<br><br><br></p>

+				for (i = 0; i < l; i++) {

+					node = nodes[i];

+					parent = node.parent;

+

+					if (blockElements[node.parent.name] && node === parent.lastChild) {

+						// Loop all nodes to the right of the current node and check for other BR elements

+						// excluding bookmarks since they are invisible

+						prev = node.prev;

+						while (prev) {

+							prevName = prev.name;

+

+							// Ignore bookmarks

+							if (prevName !== "span" || prev.attr('data-mce-type') !== 'bookmark') {

+								// Found a non BR element

+								if (prevName !== "br")

+									break;

+	

+								// Found another br it's a <br><br> structure then don't remove anything

+								if (prevName === 'br') {

+									node = null;

+									break;

+								}

+							}

+

+							prev = prev.prev;

+						}

+

+						if (node) {

+							node.remove();

+

+							// Is the parent to be considered empty after we removed the BR

+							if (parent.isEmpty(nonEmptyElements)) {

+								elementRule = schema.getElementRule(parent.name);

+

+								// Remove or padd the element depending on schema rule

+								if (elementRule.removeEmpty)

+									parent.remove();

+								else if (elementRule.paddEmpty) 

+									parent.empty().append(new tinymce.html.Node('#text', 3)).value = '\u00a0';

+							}

+						}

+					}

+				}

+			});

+		}

+	}

+})(tinymce);

+

+tinymce.html.Writer = function(settings) {

+	var html = [], indent, indentBefore, indentAfter, encode, htmlOutput;

+

+	settings = settings || {};

+	indent = settings.indent;

+	indentBefore = tinymce.makeMap(settings.indent_before || '');

+	indentAfter = tinymce.makeMap(settings.indent_after || '');

+	encode = tinymce.html.Entities.getEncodeFunc(settings.entity_encoding || 'raw', settings.entities);

+	htmlOutput = settings.element_format == "html";

+

+	return {

+		start: function(name, attrs, empty) {

+			var i, l, attr, value;

+

+			if (indent && indentBefore[name] && html.length > 0) {

+				value = html[html.length - 1];

+

+				if (value.length > 0 && value !== '\n')

+					html.push('\n');

+			}

+

+			html.push('<', name);

+

+			if (attrs) {

+				for (i = 0, l = attrs.length; i < l; i++) {

+					attr = attrs[i];

+					html.push(' ', attr.name, '="', encode(attr.value, true), '"');

+				}

+			}

+

+			if (!empty || htmlOutput)

+				html[html.length] = '>';

+			else

+				html[html.length] = ' />';

+

+			if (empty && indent && indentAfter[name] && html.length > 0) {

+				value = html[html.length - 1];

+

+				if (value.length > 0 && value !== '\n')

+					html.push('\n');

+			}

+		},

+

+		end: function(name) {

+			var value;

+

+			/*if (indent && indentBefore[name] && html.length > 0) {

+				value = html[html.length - 1];

+

+				if (value.length > 0 && value !== '\n')

+					html.push('\n');

+			}*/

+

+			html.push('</', name, '>');

+

+			if (indent && indentAfter[name] && html.length > 0) {

+				value = html[html.length - 1];

+

+				if (value.length > 0 && value !== '\n')

+					html.push('\n');

+			}

+		},

+

+		text: function(text, raw) {

+			if (text.length > 0)

+				html[html.length] = raw ? text : encode(text);

+		},

+

+		cdata: function(text) {

+			html.push('<![CDATA[', text, ']]>');

+		},

+

+		comment: function(text) {

+			html.push('<!--', text, '-->');

+		},

+

+		pi: function(name, text) {

+			if (text)

+				html.push('<?', name, ' ', text, '?>');

+			else

+				html.push('<?', name, '?>');

+

+			if (indent)

+				html.push('\n');

+		},

+

+		doctype: function(text) {

+			html.push('<!DOCTYPE', text, '>', indent ? '\n' : '');

+		},

+

+		reset: function() {

+			html.length = 0;

+		},

+

+		getContent: function() {

+			return html.join('').replace(/\n$/, '');

+		}

+	};

+};

+

+(function(tinymce) {

+	tinymce.html.Serializer = function(settings, schema) {

+		var self = this, writer = new tinymce.html.Writer(settings);

+

+		settings = settings || {};

+		settings.validate = "validate" in settings ? settings.validate : true;

+

+		self.schema = schema = schema || new tinymce.html.Schema();

+		self.writer = writer;

+

+		self.serialize = function(node) {

+			var handlers, validate;

+

+			validate = settings.validate;

+

+			handlers = {

+				// #text

+				3: function(node, raw) {

+					writer.text(node.value, node.raw);

+				},

+

+				// #comment

+				8: function(node) {

+					writer.comment(node.value);

+				},

+

+				// Processing instruction

+				7: function(node) {

+					writer.pi(node.name, node.value);

+				},

+

+				// Doctype

+				10: function(node) {

+					writer.doctype(node.value);

+				},

+

+				// CDATA

+				4: function(node) {

+					writer.cdata(node.value);

+				},

+

+ 				// Document fragment

+				11: function(node) {

+					if ((node = node.firstChild)) {

+						do {

+							walk(node);

+						} while (node = node.next);

+					}

+				}

+			};

+

+			writer.reset();

+

+			function walk(node) {

+				var handler = handlers[node.type], name, isEmpty, attrs, attrName, attrValue, sortedAttrs, i, l, elementRule;

+

+				if (!handler) {

+					name = node.name;

+					isEmpty = node.shortEnded;

+					attrs = node.attributes;

+

+					// Sort attributes

+					if (validate && attrs && attrs.length > 1) {

+						sortedAttrs = [];

+						sortedAttrs.map = {};

+

+						elementRule = schema.getElementRule(node.name);

+						for (i = 0, l = elementRule.attributesOrder.length; i < l; i++) {

+							attrName = elementRule.attributesOrder[i];

+

+							if (attrName in attrs.map) {

+								attrValue = attrs.map[attrName];

+								sortedAttrs.map[attrName] = attrValue;

+								sortedAttrs.push({name: attrName, value: attrValue});

+							}

+						}

+

+						for (i = 0, l = attrs.length; i < l; i++) {

+							attrName = attrs[i].name;

+

+							if (!(attrName in sortedAttrs.map)) {

+								attrValue = attrs.map[attrName];

+								sortedAttrs.map[attrName] = attrValue;

+								sortedAttrs.push({name: attrName, value: attrValue});

+							}

+						}

+

+						attrs = sortedAttrs;

+					}

+

+					writer.start(node.name, attrs, isEmpty);

+

+					if (!isEmpty) {

+						if ((node = node.firstChild)) {

+							do {

+								walk(node);

+							} while (node = node.next);

+						}

+

+						writer.end(name);

+					}

+				} else

+					handler(node);

+			}

+

+			// Serialize element and treat all non elements as fragments

+			if (node.type == 1 && !settings.inner)

+				walk(node);

+			else

+				handlers[11](node);

+

+			return writer.getContent();

+		};

+	}

+})(tinymce);

+

+(function(tinymce) {

 	// Shorten names

 	var each = tinymce.each,

 		is = tinymce.is,

 		isWebKit = tinymce.isWebKit,

 		isIE = tinymce.isIE,

-		blockRe = /^(H[1-6R]|P|DIV|ADDRESS|PRE|FORM|T(ABLE|BODY|HEAD|FOOT|H|R|D)|LI|OL|UL|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|MENU|ISINDEX|SAMP)$/,

-		boolAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),

-		mceAttribs = makeMap('src,href,style,coords,shape'),

-		encodedChars = {'&' : '&amp;', '"' : '&quot;', '<' : '&lt;', '>' : '&gt;'},

-		encodeCharsRe = /[<>&\"]/g,

+		Entities = tinymce.html.Entities,

 		simpleSelectorRe = /^([a-z0-9],?)+$/i,

-		tagRegExp = /<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)(\s*\/?)>/g,

-		attrRegExp = /(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;

-

-	function makeMap(str) {

-		var map = {}, i;

-

-		str = str.split(',');

-		for (i = str.length; i >= 0; i--)

-			map[str[i]] = 1;

-

-		return map;

-	};

+		blockElementsMap = tinymce.html.Schema.blockElementsMap,

+		whiteSpaceRegExp = /^[ \t\r\n]*$/;

 

 	tinymce.create('tinymce.dom.DOMUtils', {

 		doc : null,

@@ -1023,14 +3254,20 @@ tinymce.create('static tinymce.util.XHR', {
 			t.files = {};

 			t.cssFlicker = false;

 			t.counter = 0;

-			t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat"; 

-			t.stdMode = d.documentMode === 8;

+			t.stdMode = !tinymce.isIE || d.documentMode >= 8;

+			t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat" || t.stdMode;

+			t.hasOuterHTML = "outerHTML" in d.createElement("a");

 

 			t.settings = s = tinymce.extend({

 				keep_values : false,

-				hex_colors : 1,

-				process_html : 1

+				hex_colors : 1

 			}, s);

+			

+			t.schema = s.schema;

+			t.styles = new tinymce.html.Styles({

+				url_converter : s.url_converter,

+				url_converter_scope : s.url_converter_scope

+			}, s.schema);

 

 			// Fix IE6SP2 flicker and check it failed for pre SP2

 			if (tinymce.isIE6) {

@@ -1041,13 +3278,14 @@ tinymce.create('static tinymce.util.XHR', {
 				}

 			}

 

-			// Build styles list

-			if (s.valid_styles) {

-				t._styles = {};

-

-				// Convert styles into a rule list

-				each(s.valid_styles, function(value, key) {

-					t._styles[key] = tinymce.explode(value);

+			if (isIE) {

+				// Add missing HTML 4/5 elements to IE

+				('abbr article aside audio canvas ' +

+				'details figcaption figure footer ' +

+				'header hgroup mark menu meter nav ' +

+				'output progress section summary ' +

+				'time video').replace(/\w+/g, function(name) {

+					d.createElement(name);

 				});

 			}

 

@@ -1246,7 +3484,8 @@ tinymce.create('static tinymce.util.XHR', {
 					o += ' ' + k + '="' + t.encode(a[k]) + '"';

 			}

 

-			if (tinymce.is(h))

+			// A call to tinymce.is doesn't work for some odd reason on IE9 possible bug inside their JS runtime

+			if (typeof(h) != "undefined")

 				return o + '>' + h + '</' + n + '>';

 

 			return o + ' />';

@@ -1254,9 +3493,7 @@ tinymce.create('static tinymce.util.XHR', {
 

 		remove : function(node, keep_children) {

 			return this.run(node, function(node) {

-				var parent, child;

-

-				parent = node.parentNode;

+				var child, parent = node.parentNode;

 

 				if (!parent)

 					return null;

@@ -1316,7 +3553,7 @@ tinymce.create('static tinymce.util.XHR', {
 

 				// Force update of the style data

 				if (t.settings.update_styles)

-					t.setAttrib(e, '_mce_style');

+					t.setAttrib(e, 'data-mce-style');

 			});

 		},

 

@@ -1324,7 +3561,7 @@ tinymce.create('static tinymce.util.XHR', {
 			n = this.get(n);

 

 			if (!n)

-				return false;

+				return;

 

 			// Gecko

 			if (this.doc.defaultView && c) {

@@ -1353,7 +3590,7 @@ tinymce.create('static tinymce.util.XHR', {
 			if (n.currentStyle && c)

 				return n.currentStyle[na];

 

-			return n.style[na];

+			return n.style ? n.style[na] : undefined;

 		},

 

 		setStyles : function(e, o) {

@@ -1372,6 +3609,15 @@ tinymce.create('static tinymce.util.XHR', {
 				t.setAttrib(e, s.cssText);

 		},

 

+		removeAllAttribs: function(e) {

+			return this.run(e, function(e) {

+				var i, attrs = e.attributes;

+				for (i = attrs.length - 1; i >= 0; i--) {

+					e.removeAttributeNode(attrs.item(i));

+				}

+			});

+		},

+

 		setAttrib : function(e, n, v) {

 			var t = this;

 

@@ -1399,9 +3645,9 @@ tinymce.create('static tinymce.util.XHR', {
 						// 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);

+								e.setAttribute('data-mce-style', v, 2);

 							else

-								e.removeAttribute('_mce_style', 2);

+								e.removeAttribute('data-mce-style', 2);

 						}

 

 						e.style.cssText = v;

@@ -1417,13 +3663,13 @@ tinymce.create('static tinymce.util.XHR', {
 							if (s.url_converter)

 								v = s.url_converter.call(s.url_converter_scope || t, v, n, e);

 

-							t.setAttrib(e, '_mce_' + n, v, 2);

+							t.setAttrib(e, 'data-mce-' + n, v, 2);

 						}

 

 						break;

-					

+

 					case "shape":

-						e.setAttribute('_mce_style', v);

+						e.setAttribute('data-mce-style', v);

 						break;

 				}

 

@@ -1457,7 +3703,7 @@ tinymce.create('static tinymce.util.XHR', {
 

 			// Try the mce variant for these

 			if (/^(src|href|style|coords|shape)$/.test(n)) {

-				v = e.getAttribute("_mce_" + n);

+				v = e.getAttribute("data-mce-" + n);

 

 				if (v)

 					return v;

@@ -1490,7 +3736,7 @@ tinymce.create('static tinymce.util.XHR', {
 					v = t.serializeStyle(t.parseStyle(v), e.nodeName);

 

 					if (t.settings.keep_values && !t._isRes(v))

-						e.setAttribute('_mce_style', v);

+						e.setAttribute('data-mce-style', v);

 				}

 			}

 

@@ -1558,7 +3804,7 @@ tinymce.create('static tinymce.util.XHR', {
 					default:

 						// IE has odd anonymous function for event attributes

 						if (n.indexOf('on') === 0 && v)

-							v = ('' + v).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/, '$1');

+							v = tinymce._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/, '$1', '' + v);

 				}

 			}

 

@@ -1578,7 +3824,6 @@ tinymce.create('static tinymce.util.XHR', {
 					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};

 				}

@@ -1602,144 +3847,11 @@ tinymce.create('static tinymce.util.XHR', {
 		},

 

 		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;

+			return this.styles.parse(st);

 		},

 

 		serializeStyle : function(o, name) {

-			var t = this, s = '';

-

-			function add(v, k) {

-				if (k && v) {

-					// Remove browser specific styles like -moz- or -webkit-

-					if (k.indexOf('-') === 0)

-						return;

-

-					switch (k) {

-						case 'font-weight':

-							// Opera will output bold as 700

-							if (v == 700)

-								v = 'bold';

-

-							break;

-

-						case 'color':

-						case 'background-color':

-							v = v.toLowerCase();

-							break;

-					}

-

-					s += (s ? ' ' : '') + k + ': ' + v + ';';

-				}

-			};

-

-			// Validate style output

-			if (name && t._styles) {

-				each(t._styles['*'], function(name) {

-					add(o[name], name);

-				});

-

-				each(t._styles[name.toLowerCase()], function(name) {

-					add(o[name], name);

-				});

-			} else

-				each(o, add);

-

-			return s;

+			return this.styles.serialize(o, name);

 		},

 

 		loadCSS : function(u) {

@@ -1762,9 +3874,11 @@ tinymce.create('static tinymce.util.XHR', {
 				// IE 8 has a bug where dynamically loading stylesheets would produce a 1 item remaining bug

 				// This fix seems to resolve that issue by realcing the document ones a stylesheet finishes loading

 				// It's ugly but it seems to work fine.

-				if (isIE && d.documentMode) {

+				if (isIE && d.documentMode && d.recalc) {

 					link.onload = function() {

-						d.recalc();

+						if (d.recalc)

+							d.recalc();

+

 						link.onload = null;

 					};

 				}

@@ -1844,256 +3958,57 @@ tinymce.create('static tinymce.util.XHR', {
 			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);

+		setHTML : function(element, html) {

+			var self = this;

 

+			return self.run(element, function(element) {

 				if (isIE) {

-					function set() {

-						// Remove all child nodes

-						while (e.firstChild)

-							e.firstChild.removeNode();

-

-						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

-

-							// 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;

-								}

+					// Remove all child nodes, IE keeps empty text nodes in DOM

+					while (element.firstChild)

+						element.removeChild(element.firstChild);

 

-								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>/ig, '<div $1 _mce_tmp="1">');

-						h = h.replace(/<\/p>/gi, '</div>');

-

-						// Set the new HTML with DIVs

-						set();

-

-						// Replace all DIV elements with the _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);

-								}

-							}

-						}

+					try {

+						// IE will remove comments from the beginning

+						// unless you padd the contents with something

+						element.innerHTML = '<br />' + html;

+						element.removeChild(element.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

+

+						// Create new div with HTML contents and a BR infront to keep comments

+						element = self.create('div');

+						element.innerHTML = '<br />' + html;

+

+						// Add all children from div to target

+						each (element.childNodes, function(node, i) {

+							// Skip br element

+							if (i)

+								element.appendChild(node);

+						});

 					}

 				} else

-					e.innerHTML = h;

+					element.innerHTML = html;

 

-				return h;

+				return html;

 			});

 		},

 

-		processHTML : function(h) {

-			var t = this, s = t.settings, codeBlocks = [];

-

-			if (!s.process_html)

-				return h;

-

-			if (isIE) {

-				h = h.replace(/&apos;/g, '&#39;'); // IE can't handle apos

-				h = h.replace(/\s+(disabled|checked|readonly|selected)\s*=\s*[\"\']?(false|0)[\"\']?/gi, ''); // IE doesn't handle default values correct

-			}

-

-			// 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|noscript|style/i.test(h)) {

-					function trim(s) {

-						// Remove prefix and suffix code for element

-						s = s.replace(/(<!--\[CDATA\[|\]\]-->)/g, '\n');

-						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;

-					};

-

-					// Wrap the script contents in CDATA and keep them from executing

-					h = h.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/gi, function(v, attribs, text) {

-						// Force type attribute

-						if (!attribs)

-							attribs = ' type="text/javascript"';

-

-						// Convert the src attribute of the scripts

-						attribs = attribs.replace(/src=\"([^\"]+)\"?/i, function(a, url) {

-							if (s.url_converter)

-								url = t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(url), 'src', 'script'));

-

-							return '_mce_src="' + url + '"';

-						});

-

-						// Wrap text contents

-						if (tinymce.trim(text)) {

-							codeBlocks.push(trim(text));

-							text = '<!--\nMCE_SCRIPT:' + (codeBlocks.length - 1) + '\n// -->';

-						}

-

-						return '<mce:script' + attribs + '>' + text + '</mce:script>';

-					});

-

-					// Wrap style elements

-					h = h.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/gi, function(v, attribs, text) {

-						// Wrap text contents

-						if (text) {

-							codeBlocks.push(trim(text));

-							text = '<!--\nMCE_SCRIPT:' + (codeBlocks.length - 1) + '\n-->';

-						}

-

-						return '<mce:style' + attribs + '>' + text + '</mce:style><style ' + attribs + ' _mce_bogus="1">' + text + '</style>';

-					});

-

-					// Wrap noscript elements

-					h = h.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g, function(v, attribs, text) {

-						return '<mce:noscript' + attribs + '><!--' + t.encode(text).replace(/--/g, '&#45;&#45;') + '--></mce:noscript>';

-					});

-				}

-

-				h = h.replace(/<!\[CDATA\[([\s\S]+)\]\]>/g, '<!--[CDATA[$1]]-->');

-

-				// This function processes the attributes in the HTML string to force boolean

-				// attributes to the attr="attr" format and convert style, src and href to _mce_ versions

-				function processTags(html) {

-					return html.replace(tagRegExp, function(match, elm_name, attrs, end) {

-						return '<' + elm_name + attrs.replace(attrRegExp, function(match, name, value, val2, val3) {

-							var mceValue;

-

-							name = name.toLowerCase();

-							value = value || val2 || val3 || "";

-

-							// Treat boolean attributes

-							if (boolAttrs[name]) {

-								// false or 0 is treated as a missing attribute

-								if (value === 'false' || value === '0')

-									return;

-

-								return name + '="' + name + '"';

-							}

-

-							// Is attribute one that needs special treatment

-							if (mceAttribs[name] && attrs.indexOf('_mce_' + name) == -1) {

-								mceValue = t.decode(value);

-

-								// Convert URLs to relative/absolute ones

-								if (s.url_converter && (name == "src" || name == "href"))

-									mceValue = s.url_converter.call(s.url_converter_scope || t, mceValue, name, elm_name);

-

-								// Process styles lowercases them and compresses them

-								if (name == 'style')

-									mceValue = t.serializeStyle(t.parseStyle(mceValue), name);

-

-								return name + '="' + value + '"' + ' _mce_' + name + '="' + t.encode(mceValue) + '"';

-							}

-

-							return match;

-						}) + end + '>';

-					});

-				};

-

-				h = processTags(h);

-

-				// Restore script blocks

-				h = h.replace(/MCE_SCRIPT:([0-9]+)/g, function(val, idx) {

-					return codeBlocks[idx];

-				});

-			}

-

-			return h;

-		},

-

-		getOuterHTML : function(e) {

-			var d;

+		getOuterHTML : function(elm) {

+			var doc, self = this;

 

-			e = this.get(e);

+			elm = self.get(elm);

 

-			if (!e)

+			if (!elm)

 				return null;

 

-			if (e.outerHTML !== undefined)

-				return e.outerHTML;

+			if (elm.nodeType === 1 && self.hasOuterHTML)

+				return elm.outerHTML;

 

-			d = (e.ownerDocument || this.doc).createElement("body");

-			d.appendChild(e.cloneNode(true));

+			doc = (elm.ownerDocument || self.doc).createElement("body");

+			doc.appendChild(elm.cloneNode(true));

 

-			return d.innerHTML;

+			return doc.innerHTML;

 		},

 

 		setOuterHTML : function(e, h, d) {

@@ -2138,34 +4053,9 @@ tinymce.create('static tinymce.util.XHR', {
 			});

 		},

 

-		decode : function(s) {

-			var e, n, v;

+		decode : Entities.decode,

 

-			// Look for entities to decode

-			if (/&[\w#]+;/.test(s)) {

-				// Decode the entities using a div element not super efficient but less code

-				e = this.doc.createElement("div");

-				e.innerHTML = s;

-				n = e.firstChild;

-				v = '';

-

-				if (n) {

-					do {

-						v += n.nodeValue;

-					} while (n = n.nextSibling);

-				}

-

-				return v || s;

-			}

-

-			return s;

-		},

-

-		encode : function(str) {

-			return ('' + str).replace(encodeCharsRe, function(chr) {

-				return encodedChars[chr];

-			});

-		},

+		encode : Entities.encodeAllRaw,

 

 		insertAfter : function(node, reference_node) {

 			reference_node = this.get(reference_node);

@@ -2185,13 +4075,14 @@ tinymce.create('static tinymce.util.XHR', {
 			});

 		},

 

-		isBlock : function(n) {

-			if (n.nodeType && n.nodeType !== 1)

-				return false;

+		isBlock : function(node) {

+			var type = node.nodeType;

 

-			n = n.nodeName || n;

+			// If it's a node then check the type and use the nodeName

+			if (type)

+				return !!(type === 1 && blockElementsMap[node.nodeName]);

 

-			return blockRe.test(n);

+			return !!blockElementsMap[node];

 		},

 

 		replace : function(n, o, k) {

@@ -2296,7 +4187,7 @@ tinymce.create('static tinymce.util.XHR', {
 

 									// Remove everything but class name

 									ov = v;

-									v = v.replace(/.*\.([a-z0-9_\-]+).*/i, '$1');

+									v = tinymce._replace(/.*\.([a-z0-9_\-]+).*/i, '$1', v);

 

 									// Filter classes

 									if (f && !(v = f(v, ov)))

@@ -2388,6 +4279,45 @@ tinymce.create('static tinymce.util.XHR', {
 			return n.attributes;

 		},

 

+		isEmpty : function(node, elements) {

+			var self = this, i, attributes, type, walker, name;

+

+			node = node.firstChild;

+			if (node) {

+				walker = new tinymce.dom.TreeWalker(node);

+				elements = elements || self.schema ? self.schema.getNonEmptyElements() : null;

+

+				do {

+					type = node.nodeType;

+

+					if (type === 1) {

+						// Ignore bogus elements

+						if (node.getAttribute('data-mce-bogus'))

+							continue;

+

+						// Keep empty elements like <img />

+						if (elements && elements[node.nodeName.toLowerCase()])

+							return false;

+

+						// Keep elements with data attributes or name attribute like <a name="1"></a>

+						attributes = self.getAttribs(node);

+						i = node.attributes.length;

+						while (i--) {

+							name = node.attributes[i].nodeName;

+							if (name === "name" || name.indexOf('data-') === 0)

+								return false;

+						}

+					}

+

+					// Keep non whitespace text nodes

+					if ((type === 3 && !whiteSpaceRegExp.test(node.nodeValue)))

+						return false;

+				} while (node = walker.next());

+			}

+

+			return true;

+		},

+

 		destroy : function(s) {

 			var t = this;

 

@@ -2408,7 +4338,7 @@ tinymce.create('static tinymce.util.XHR', {
 		},

 

 		nodeIndex : function(node, normalized) {

-			var idx = 0, lastNodeType, lastNode, nodeType;

+			var idx = 0, lastNodeType, lastNode, nodeType, nodeValueExists;

 

 			if (node) {

 				for (lastNodeType = node.nodeType, node = node.previousSibling, lastNode = node; node; node = node.previousSibling) {

@@ -2416,10 +4346,13 @@ tinymce.create('static tinymce.util.XHR', {
 

 					// Normalize text nodes

 					if (normalized && nodeType == 3) {

-						if (nodeType == lastNodeType || !node.nodeValue.length)

+						// ensure that text nodes that have been removed are handled correctly in Internet Explorer.

+						// (the nodeValue attribute will not exist, and will error here).

+						nodeValueExists = false;

+						try {nodeValueExists = node.nodeValue.length} catch (c) {}

+						if (nodeType == lastNodeType || !nodeValueExists)

 							continue;

 					}

-

 					idx++;

 					lastNodeType = nodeType;

 				}

@@ -2440,23 +4373,24 @@ tinymce.create('static tinymce.util.XHR', {
 			// this function will then trim of empty edges and produce:

 			//   <p>text 1</p><b>CHOP</b><p>text 2</p>

 			function trim(node) {

-				var i, children = node.childNodes;

+				var i, children = node.childNodes, type = node.nodeType;

 

-				if (node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark')

+				if (type == 1 && node.getAttribute('data-mce-type') == 'bookmark')

 					return;

 

 				for (i = children.length - 1; i >= 0; i--)

 					trim(children[i]);

 

-				if (node.nodeType != 9) {

+				if (type != 9) {

 					// Keep non whitespace text nodes

-					if (node.nodeType == 3 && node.nodeValue.length > 0)

-						return;

-

-					if (node.nodeType == 1) {

+					if (type == 3 && node.nodeValue.length > 0) {

+						// If parent element isn't a block or there isn't any useful contents for example "<p>   </p>"

+						if (!t.isBlock(node.parentNode) || tinymce.trim(node.nodeValue).length > 0)

+							return;

+					} else if (type == 1) {

 						// If the only child is a bookmark then move it up

 						children = node.childNodes;

-						if (children.length == 1 && children[0] && children[0].nodeType == 1 && children[0].getAttribute('_mce_type') == 'bookmark')

+						if (children.length == 1 && children[0] && children[0].nodeType == 1 && children[0].getAttribute('data-mce-type') == 'bookmark')

 							node.parentNode.insertBefore(children[0], node);

 

 						// Keep non empty elements or img, hr etc

@@ -2677,23 +4611,24 @@ tinymce.create('static tinymce.util.XHR', {
 		};

 

 		function compareBoundaryPoints(h, r) {

-			var sc = t[START_CONTAINER], so = t[START_OFFSET], ec = t[END_CONTAINER], eo = t[END_OFFSET];

+			var sc = t[START_CONTAINER], so = t[START_OFFSET], ec = t[END_CONTAINER], eo = t[END_OFFSET],

+			rsc = r.startContainer, rso = r.startOffset, rec = r.endContainer, reo = r.endOffset;

 

 			// Check START_TO_START

 			if (h === 0)

-				return _compareBoundaryPoints(sc, so, sc, so);

-

+				return _compareBoundaryPoints(sc, so, rsc, rso);

+	

 			// Check START_TO_END

 			if (h === 1)

-				return _compareBoundaryPoints(sc, so, ec, eo);

-

+				return _compareBoundaryPoints(ec, eo, rsc, rso);

+	

 			// Check END_TO_END

 			if (h === 2)

-				return _compareBoundaryPoints(ec, eo, ec, eo);

-

+				return _compareBoundaryPoints(ec, eo, rec, reo);

+	

 			// Check END_TO_START

-			if (h === 3)

-				return _compareBoundaryPoints(ec, eo, sc, so);

+			if (h === 3) 

+				return _compareBoundaryPoints(sc, so, rec, reo);

 		};

 

 		function deleteContents() {

@@ -2785,7 +4720,7 @@ tinymce.create('static tinymce.util.XHR', {
 

 		function _compareBoundaryPoints(containerA, offsetA, containerB, offsetB) {

 			var c, offsetC, n, cmnRoot, childA, childB;

-

+			

 			// In the first case the boundary-points have the same container. A is before B

 			// if its offset is less than the offset of B, A is equal to B if its offset is

 			// equal to the offset of B, and A is after B if its offset is greater than the

@@ -3071,7 +5006,7 @@ tinymce.create('static tinymce.util.XHR', {
 				frag.appendChild(n);

 

 			startIdx = nodeIndex(startAncestor);

-			++startIdx;  // Because we already traversed it....

+			++startIdx; // Because we already traversed it

 

 			cnt = t[END_OFFSET] - startIdx;

 			n = startAncestor.nextSibling;

@@ -3269,16 +5204,21 @@ tinymce.create('static tinymce.util.XHR', {
 			if (element.ownerDocument != dom.doc)

 				return domRange;

 

+			collapsed = selection.isCollapsed();

+

 			// Handle control selection or text selection of a image

 			if (ieRange.item || !element.hasChildNodes()) {

-				domRange.setStart(element.parentNode, dom.nodeIndex(element));

-				domRange.setEnd(domRange.startContainer, domRange.startOffset + 1);

+				if (collapsed) {

+					domRange.setStart(element, 0);

+					domRange.setEnd(element, 0);

+				} else {

+					domRange.setStart(element.parentNode, dom.nodeIndex(element));

+					domRange.setEnd(domRange.startContainer, domRange.startOffset + 1);

+				}

 

 				return domRange;

 			}

 

-			collapsed = selection.isCollapsed();

-

 			function findEndPoint(start) {

 				var marker, container, offset, nodes, startIndex = 0, endIndex, index, parent, checkRng, position;

 

@@ -3289,6 +5229,13 @@ tinymce.create('static tinymce.util.XHR', {
 				// Create marker and insert it at the end of the endpoints parent

 				marker = dom.create('a');

 				parent = checkRng.parentElement();

+

+				// If parent doesn't have any children then set the container to that parent and the index to 0

+				if (!parent.hasChildNodes()) {

+					domRange[start ? 'setStart' : 'setEnd'](parent, 0);

+					return;

+				}

+

 				parent.appendChild(marker);

 				checkRng.moveToElementText(marker);

 				position = ieRange.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', checkRng);

@@ -3365,147 +5312,81 @@ tinymce.create('static tinymce.util.XHR', {
 		};

 

 		this.addRange = function(rng) {

-			var ieRng, ieRng2, doc = selection.dom.doc, body = doc.body, startPos, endPos, sc, so, ec, eo, marker, lastIndex, skipStart, skipEnd;

-

-			this.destroy();

-

-			// Setup some shorter versions

-			sc = rng.startContainer;

-			so = rng.startOffset;

-			ec = rng.endContainer;

-			eo = rng.endOffset;

-			ieRng = body.createTextRange();

-

-			// If document selection move caret to first node in document

-			if (sc == doc || ec == doc) {

-				ieRng = body.createTextRange();

-				ieRng.collapse();

-				ieRng.select();

-				return;

-			}

+			var ieRng, ctrlRng, startContainer, startOffset, endContainer, endOffset, doc = selection.dom.doc, body = doc.body;

 

-			// If child index resolve it

-			if (sc.nodeType == 1 && sc.hasChildNodes()) {

-				lastIndex = sc.childNodes.length - 1;

+			function setEndPoint(start) {

+				var container, offset, marker, tmpRng, nodes;

 

-				// Index is higher that the child count then we need to jump over the start container

-				if (so > lastIndex) {

-					skipStart = 1;

-					sc = sc.childNodes[lastIndex];

-				} else

-					sc = sc.childNodes[so];

-

-				// Child was text node then move offset to start of it

-				if (sc.nodeType == 3)

-					so = 0;

-			}

-

-			// If child index resolve it

-			if (ec.nodeType == 1 && ec.hasChildNodes()) {

-				lastIndex = ec.childNodes.length - 1;

-

-				if (eo == 0) {

-					skipEnd = 1;

-					ec = ec.childNodes[0];

-				} else {

-					ec = ec.childNodes[Math.min(lastIndex, eo - 1)];

+				marker = dom.create('a');

+				container = start ? startContainer : endContainer;

+				offset = start ? startOffset : endOffset;

+				tmpRng = ieRng.duplicate();

 

-					// Child was text node then move offset to end of text node

-					if (ec.nodeType == 3)

-						eo = ec.nodeValue.length;

+				if (container == doc || container == doc.documentElement) {

+					container = body;

+					offset = 0;

 				}

-			}

 

-			// Single element selection

-			if (sc == ec && sc.nodeType == 1) {

-				// Make control selection for some elements

-				if (/^(IMG|TABLE)$/.test(sc.nodeName) && so != eo) {

-					ieRng = body.createControlRange();

-					ieRng.addElement(sc);

+				if (container.nodeType == 3) {

+					container.parentNode.insertBefore(marker, container);

+					tmpRng.moveToElementText(marker);

+					tmpRng.moveStart('character', offset);

+					dom.remove(marker);

+					ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);

 				} else {

-					ieRng = body.createTextRange();

-

-					// Padd empty elements with invisible character

-					if (!sc.hasChildNodes() && sc.canHaveHTML)

-						sc.innerHTML = invisibleChar;

+					nodes = container.childNodes;

 

-					// Select element contents

-					ieRng.moveToElementText(sc);

+					if (nodes.length) {

+						if (offset >= nodes.length) {

+							dom.insertAfter(marker, nodes[nodes.length - 1]);

+						} else {

+							container.insertBefore(marker, nodes[offset]);

+						}

 

-					// If it's only containing a padding remove it so the caret remains

-					if (sc.innerHTML == invisibleChar) {

-						ieRng.collapse(TRUE);

-						sc.removeChild(sc.firstChild);

+						tmpRng.moveToElementText(marker);

+					} else {

+						// Empty node selection for example <div>|</div>

+						marker = doc.createTextNode(invisibleChar);

+						container.appendChild(marker);

+						tmpRng.moveToElementText(marker.parentNode);

+						tmpRng.collapse(TRUE);

 					}

-				}

-

-				if (so == eo)

-					ieRng.collapse(eo <= rng.endContainer.childNodes.length - 1);

 

-				ieRng.select();

-				ieRng.scrollIntoView();

-				return;

+					ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);

+					dom.remove(marker);

+				}

 			}

 

-			// Create range and marker

-			ieRng = body.createTextRange();

-			marker = doc.createElement('span');

-			marker.innerHTML = ' ';

-

-			// Set start of range to startContainer/startOffset

-			if (sc.nodeType == 3) {

-				// Insert marker after/before startContainer

-				if (skipStart)

-					dom.insertAfter(marker, sc);

-				else

-					sc.parentNode.insertBefore(marker, sc);

-

-				// Select marker the caret to offset position

-				ieRng.moveToElementText(marker);

-				marker.parentNode.removeChild(marker);

-				ieRng.move('character', so);

-			} else {

-				ieRng.moveToElementText(sc);

+			// Destroy cached range

+			this.destroy();

 

-				if (skipStart)

-					ieRng.collapse(FALSE);

-			}

+			// Setup some shorter versions

+			startContainer = rng.startContainer;

+			startOffset = rng.startOffset;

+			endContainer = rng.endContainer;

+			endOffset = rng.endOffset;

+			ieRng = body.createTextRange();

 

-			// If same text container then we can do a more simple move

-			if (sc == ec && sc.nodeType == 3) {

-				try {

-					ieRng.moveEnd('character', eo - so);

-					ieRng.select();

-					ieRng.scrollIntoView();

-				} catch (ex) {

-					// Some times a Runtime error of the 800a025e type gets thrown

-					// especially when the caret is placed before a table.

-					// This is a somewhat strange location for the caret.

-					// TODO: Find a better solution for this would possible require a rewrite of the setRng method

+			// If single element selection then try making a control selection out of it

+			if (startContainer == endContainer && startContainer.nodeType == 1 && startOffset == endOffset - 1) {

+				if (startOffset == endOffset - 1) {

+					try {

+						ctrlRng = body.createControlRange();

+						ctrlRng.addElement(startContainer.childNodes[startOffset]);

+						ctrlRng.select();

+						return;

+					} catch (ex) {

+						// Ignore

+					}

 				}

-

-				return;

 			}

 

-			// Set end of range to endContainer/endOffset

-			ieRng2 = body.createTextRange();

-			if (ec.nodeType == 3) {

-				// Insert marker after/before startContainer

-				ec.parentNode.insertBefore(marker, ec);

-

-				// Move selection to end marker and move caret to end offset

-				ieRng2.moveToElementText(marker);

-				marker.parentNode.removeChild(marker);

-				ieRng2.move('character', eo);

-				ieRng.setEndPoint('EndToStart', ieRng2);

-			} else {

-				ieRng2.moveToElementText(ec);

-				ieRng2.collapse(!!skipEnd);

-				ieRng.setEndPoint('EndToEnd', ieRng2);

-			}

+			// Set start/end point of selection

+			setEndPoint(true);

+			setEndPoint();

 

+			// Select the new range and scroll it into view

 			ieRng.select();

-			ieRng.scrollIntoView();

 		};

 

 		this.getRangeAt = function() {

@@ -3535,79 +5416,6 @@ tinymce.create('static tinymce.util.XHR', {
 			// Destroy cached range and last IE range to avoid memory leaks

 			lastIERng = range = null;

 		};

-

-		// IE has an issue where you can't select/move the caret by clicking outside the body if the document is in standards mode

-		if (selection.dom.boxModel) {

-			(function() {

-				var doc = dom.doc, body = doc.body, started, startRng;

-

-				// Make HTML element unselectable since we are going to handle selection by hand

-				doc.documentElement.unselectable = TRUE;

-

-				// Return range from point or null if it failed

-				function rngFromPoint(x, y) {

-					var rng = body.createTextRange();

-

-					try {

-						rng.moveToPoint(x, y);

-					} catch (ex) {

-						// IE sometimes throws and exception, so lets just ignore it

-						rng = null;

-					}

-

-					return rng;

-				};

-

-				// Fires while the selection is changing

-				function selectionChange(e) {

-					var pointRng;

-

-					// Check if the button is down or not

-					if (e.button) {

-						// Create range from mouse position

-						pointRng = rngFromPoint(e.x, e.y);

-

-						if (pointRng) {

-							// Check if pointRange is before/after selection then change the endPoint

-							if (pointRng.compareEndPoints('StartToStart', startRng) > 0)

-								pointRng.setEndPoint('StartToStart', startRng);

-							else

-								pointRng.setEndPoint('EndToEnd', startRng);

-

-							pointRng.select();

-						}

-					} else

-						endSelection();

-				}

-

-				// Removes listeners

-				function endSelection() {

-					dom.unbind(doc, 'mouseup', endSelection);

-					dom.unbind(doc, 'mousemove', selectionChange);

-					started = 0;

-				};

-

-				// Detect when user selects outside BODY

-				dom.bind(doc, 'mousedown', function(e) {

-					if (e.target.nodeName === 'HTML') {

-						if (started)

-							endSelection();

-

-						started = 1;

-

-						// Setup start position

-						startRng = rngFromPoint(e.x, e.y);

-						if (startRng) {

-							// Listen for selection change events

-							dom.bind(doc, 'mouseup', endSelection);

-							dom.bind(doc, 'mousemove', selectionChange);

-

-							startRng.select();

-						}

-					}

-				});

-			})();

-		}

 	};

 

 	// Expose the selection object

@@ -3623,14 +5431,26 @@ tinymce.create('static tinymce.util.XHR', {
  */

 (function(){

 

-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,

+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,

 	done = 0,

 	toString = Object.prototype.toString,

-	hasDuplicate = false;

+	hasDuplicate = false,

+	baseHasDuplicate = true;

+

+// Here we check if the JavaScript engine is using some sort of

+// optimization where it does not always call our comparision

+// function. If that is the case, discard the hasDuplicate value.

+//   Thus far that includes Google Chrome.

+[0, 0].sort(function(){

+	baseHasDuplicate = false;

+	return 0;

+});

 

 var Sizzle = function(selector, context, results, seed) {

 	results = results || [];

-	var origContext = context = context || document;

+	context = context || document;

+

+	var origContext = context;

 

 	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {

 		return [];

@@ -3640,19 +5460,25 @@ var Sizzle = function(selector, context, results, seed) {
 		return results;

 	}

 

-	var parts = [], m, set, checkSet, check, mode, extra, prune = true, contextXML = isXML(context);

+	var parts = [], m, set, checkSet, extra, prune = true, contextXML = Sizzle.isXML(context),

+		soFar = selector, ret, cur, pop, i;

 	

 	// Reset the position of the chunker regexp (start from head)

-	chunker.lastIndex = 0;

-	

-	while ( (m = chunker.exec(selector)) !== null ) {

-		parts.push( m[1] );

+	do {

+		chunker.exec("");

+		m = chunker.exec(soFar);

+

+		if ( m ) {

+			soFar = m[3];

 		

-		if ( m[2] ) {

-			extra = RegExp.rightContext;

-			break;

+			parts.push( m[1] );

+		

+			if ( m[2] ) {

+				extra = m[3];

+				break;

+			}

 		}

-	}

+	} while ( m );

 

 	if ( parts.length > 1 && origPOS.exec( selector ) ) {

 		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {

@@ -3665,9 +5491,10 @@ var Sizzle = function(selector, context, results, seed) {
 			while ( parts.length ) {

 				selector = parts.shift();

 

-				if ( Expr.relative[ selector ] )

+				if ( Expr.relative[ selector ] ) {

 					selector += parts.shift();

-

+				}

+				

 				set = posProcess( selector, set );

 			}

 		}

@@ -3676,12 +5503,12 @@ var Sizzle = function(selector, context, results, seed) {
 		// (but not if it'll be faster if the inner selector is an ID)

 		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&

 				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {

-			var ret = Sizzle.find( parts.shift(), context, contextXML );

+			ret = Sizzle.find( parts.shift(), context, contextXML );

 			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];

 		}

 

 		if ( context ) {

-			var ret = seed ?

+			ret = seed ?

 				{ expr: parts.pop(), set: makeArray(seed) } :

 				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );

 			set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;

@@ -3693,7 +5520,8 @@ var Sizzle = function(selector, context, results, seed) {
 			}

 

 			while ( parts.length ) {

-				var cur = parts.pop(), pop = cur;

+				cur = parts.pop();

+				pop = cur;

 

 				if ( !Expr.relative[ cur ] ) {

 					cur = "";

@@ -3717,20 +5545,20 @@ var Sizzle = function(selector, context, results, seed) {
 	}

 

 	if ( !checkSet ) {

-		throw "Syntax error, unrecognized expression: " + (cur || selector);

+		Sizzle.error( cur || selector );

 	}

 

 	if ( toString.call(checkSet) === "[object Array]" ) {

 		if ( !prune ) {

 			results.push.apply( results, checkSet );

 		} else if ( context && context.nodeType === 1 ) {

-			for ( var i = 0; checkSet[i] != null; i++ ) {

-				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {

+			for ( i = 0; checkSet[i] != null; i++ ) {

+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {

 					results.push( set[i] );

 				}

 			}

 		} else {

-			for ( var i = 0; checkSet[i] != null; i++ ) {

+			for ( i = 0; checkSet[i] != null; i++ ) {

 				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {

 					results.push( set[i] );

 				}

@@ -3750,7 +5578,7 @@ var Sizzle = function(selector, context, results, seed) {
 

 Sizzle.uniqueSort = function(results){

 	if ( sortOrder ) {

-		hasDuplicate = false;

+		hasDuplicate = baseHasDuplicate;

 		results.sort(sortOrder);

 

 		if ( hasDuplicate ) {

@@ -3761,6 +5589,8 @@ Sizzle.uniqueSort = function(results){
 			}

 		}

 	}

+

+	return results;

 };

 

 Sizzle.matches = function(expr, set){

@@ -3768,7 +5598,7 @@ Sizzle.matches = function(expr, set){
 };

 

 Sizzle.find = function(expr, context, isXML){

-	var set, match;

+	var set;

 

 	if ( !expr ) {

 		return [];

@@ -3777,8 +5607,9 @@ Sizzle.find = function(expr, context, isXML){
 	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {

 		var type = Expr.order[i], match;

 		

-		if ( (match = Expr.match[ type ].exec( expr )) ) {

-			var left = RegExp.leftContext;

+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {

+			var left = match[1];

+			match.splice(1,1);

 

 			if ( left.substr( left.length - 1 ) !== "\\" ) {

 				match[1] = (match[1] || "").replace(/\\/g, "");

@@ -3800,15 +5631,21 @@ Sizzle.find = function(expr, context, isXML){
 

 Sizzle.filter = function(expr, set, inplace, not){

 	var old = expr, result = [], curLoop = set, match, anyFound,

-		isXMLFilter = set && set[0] && isXML(set[0]);

+		isXMLFilter = set && set[0] && Sizzle.isXML(set[0]);

 

 	while ( expr && set.length ) {

 		for ( var type in Expr.filter ) {

-			if ( (match = Expr.match[ type ].exec( expr )) != null ) {

-				var filter = Expr.filter[ type ], found, item;

+			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {

+				var filter = Expr.filter[ type ], found, item, left = match[1];

 				anyFound = false;

 

-				if ( curLoop == result ) {

+				match.splice(1,1);

+

+				if ( left.substr( left.length - 1 ) === "\\" ) {

+					continue;

+				}

+

+				if ( curLoop === result ) {

 					result = [];

 				}

 

@@ -3859,9 +5696,9 @@ Sizzle.filter = function(expr, set, inplace, not){
 		}

 

 		// Improper expression

-		if ( expr == old ) {

+		if ( expr === old ) {

 			if ( anyFound == null ) {

-				throw "Syntax error, unrecognized expression: " + expr;

+				Sizzle.error( expr );

 			} else {

 				break;

 			}

@@ -3873,18 +5710,23 @@ Sizzle.filter = function(expr, set, inplace, not){
 	return curLoop;

 };

 

+Sizzle.error = function( msg ) {

+	throw "Syntax error, unrecognized expression: " + msg;

+};

+

 var Expr = Sizzle.selectors = {

 	order: [ "ID", "NAME", "TAG" ],

 	match: {

-		ID: /#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,

-		CLASS: /\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,

-		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,

-		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,

-		TAG: /^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,

-		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,

-		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,

-		PSEUDO: /:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/

+		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,

+		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,

+		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,

+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,

+		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,

+		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,

+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,

+		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/

 	},

+	leftMatch: {},

 	attrMap: {

 		"class": "className",

 		"for": "htmlFor"

@@ -3895,20 +5737,20 @@ var Expr = Sizzle.selectors = {
 		}

 	},

 	relative: {

-		"+": function(checkSet, part, isXML){

+		"+": function(checkSet, part){

 			var isPartStr = typeof part === "string",

 				isTag = isPartStr && !/\W/.test(part),

 				isPartStrNotTag = isPartStr && !isTag;

 

-			if ( isTag && !isXML ) {

-				part = part.toUpperCase();

+			if ( isTag ) {

+				part = part.toLowerCase();

 			}

 

 			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {

 				if ( (elem = checkSet[i]) ) {

 					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}

 

-					checkSet[i] = isPartStrNotTag || elem && elem.nodeName === part ?

+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?

 						elem || false :

 						elem === part;

 				}

@@ -3918,22 +5760,23 @@ var Expr = Sizzle.selectors = {
 				Sizzle.filter( part, checkSet, true );

 			}

 		},

-		">": function(checkSet, part, isXML){

-			var isPartStr = typeof part === "string";

+		">": function(checkSet, part){

+			var isPartStr = typeof part === "string",

+				elem, i = 0, l = checkSet.length;

 

 			if ( isPartStr && !/\W/.test(part) ) {

-				part = isXML ? part : part.toUpperCase();

+				part = part.toLowerCase();

 

-				for ( var i = 0, l = checkSet.length; i < l; i++ ) {

-					var elem = checkSet[i];

+				for ( ; i < l; i++ ) {

+					elem = checkSet[i];

 					if ( elem ) {

 						var parent = elem.parentNode;

-						checkSet[i] = parent.nodeName === part ? parent : false;

+						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;

 					}

 				}

 			} else {

-				for ( var i = 0, l = checkSet.length; i < l; i++ ) {

-					var elem = checkSet[i];

+				for ( ; i < l; i++ ) {

+					elem = checkSet[i];

 					if ( elem ) {

 						checkSet[i] = isPartStr ?

 							elem.parentNode :

@@ -3947,20 +5790,22 @@ var Expr = Sizzle.selectors = {
 			}

 		},

 		"": function(checkSet, part, isXML){

-			var doneName = done++, checkFn = dirCheck;

+			var doneName = done++, checkFn = dirCheck, nodeCheck;

 

-			if ( !part.match(/\W/) ) {

-				var nodeCheck = part = isXML ? part : part.toUpperCase();

+			if ( typeof part === "string" && !/\W/.test(part) ) {

+				part = part.toLowerCase();

+				nodeCheck = part;

 				checkFn = dirNodeCheck;

 			}

 

 			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);

 		},

 		"~": function(checkSet, part, isXML){

-			var doneName = done++, checkFn = dirCheck;

+			var doneName = done++, checkFn = dirCheck, nodeCheck;

 

-			if ( typeof part === "string" && !part.match(/\W/) ) {

-				var nodeCheck = part = isXML ? part : part.toUpperCase();

+			if ( typeof part === "string" && !/\W/.test(part) ) {

+				part = part.toLowerCase();

+				nodeCheck = part;

 				checkFn = dirNodeCheck;

 			}

 

@@ -3974,7 +5819,7 @@ var Expr = Sizzle.selectors = {
 				return m ? [m] : [];

 			}

 		},

-		NAME: function(match, context, isXML){

+		NAME: function(match, context){

 			if ( typeof context.getElementsByName !== "undefined" ) {

 				var ret = [], results = context.getElementsByName(match[1]);

 

@@ -4001,9 +5846,10 @@ var Expr = Sizzle.selectors = {
 

 			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {

 				if ( elem ) {

-					if ( not ^ (elem.className && (" " + elem.className + " ").indexOf(match) >= 0) ) {

-						if ( !inplace )

+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {

+						if ( !inplace ) {

 							result.push( elem );

+						}

 					} else if ( inplace ) {

 						curLoop[i] = false;

 					}

@@ -4016,14 +5862,13 @@ var Expr = Sizzle.selectors = {
 			return match[1].replace(/\\/g, "");

 		},

 		TAG: function(match, curLoop){

-			for ( var i = 0; curLoop[i] === false; i++ ){}

-			return curLoop[i] && isXML(curLoop[i]) ? match[1] : match[1].toUpperCase();

+			return match[1].toLowerCase();

 		},

 		CHILD: function(match){

-			if ( match[1] == "nth" ) {

+			if ( match[1] === "nth" ) {

 				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'

 				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(

-					match[2] == "even" && "2n" || match[2] == "odd" && "2n+1" ||

+					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||

 					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);

 

 				// calculate the numbers (first)n+(last) including if they are negative

@@ -4052,7 +5897,7 @@ var Expr = Sizzle.selectors = {
 		PSEUDO: function(match, curLoop, inplace, result, not){

 			if ( match[1] === "not" ) {

 				// If we're dealing with a complex expression, or a simple one

-				if ( match[3].match(chunker).length > 1 || /^\w/.test(match[3]) ) {

+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {

 					match[3] = Sizzle(match[3], null, null, curLoop);

 				} else {

 					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);

@@ -4098,7 +5943,7 @@ var Expr = Sizzle.selectors = {
 			return !!Sizzle( match[3], elem ).length;

 		},

 		header: function(elem){

-			return /h\d/i.test( elem.nodeName );

+			return (/h\d/i).test( elem.nodeName );

 		},

 		text: function(elem){

 			return "text" === elem.type;

@@ -4125,10 +5970,10 @@ var Expr = Sizzle.selectors = {
 			return "reset" === elem.type;

 		},

 		button: function(elem){

-			return "button" === elem.type || elem.nodeName.toUpperCase() === "BUTTON";

+			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";

 		},

 		input: function(elem){

-			return /input|select|textarea|button/i.test(elem.nodeName);

+			return (/input|select|textarea|button/i).test(elem.nodeName);

 		}

 	},

 	setFilters: {

@@ -4151,10 +5996,10 @@ var Expr = Sizzle.selectors = {
 			return i > match[3] - 0;

 		},

 		nth: function(elem, i, match){

-			return match[3] - 0 == i;

+			return match[3] - 0 === i;

 		},

 		eq: function(elem, i, match){

-			return match[3] - 0 == i;

+			return match[3] - 0 === i;

 		}

 	},

 	filter: {

@@ -4164,17 +6009,19 @@ var Expr = Sizzle.selectors = {
 			if ( filter ) {

 				return filter( elem, i, match, array );

 			} else if ( name === "contains" ) {

-				return (elem.textContent || elem.innerText || "").indexOf(match[3]) >= 0;

+				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;

 			} else if ( name === "not" ) {

 				var not = match[3];

 

-				for ( var i = 0, l = not.length; i < l; i++ ) {

-					if ( not[i] === elem ) {

+				for ( var j = 0, l = not.length; j < l; j++ ) {

+					if ( not[j] === elem ) {

 						return false;

 					}

 				}

 

 				return true;

+			} else {

+				Sizzle.error( "Syntax error, unrecognized expression: " + name );

 			}

 		},

 		CHILD: function(elem, match){

@@ -4182,20 +6029,26 @@ var Expr = Sizzle.selectors = {
 			switch (type) {

 				case 'only':

 				case 'first':

-					while (node = node.previousSibling)  {

-						if ( node.nodeType === 1 ) return false;

+					while ( (node = node.previousSibling) )	 {

+						if ( node.nodeType === 1 ) { 

+							return false; 

+						}

+					}

+					if ( type === "first" ) { 

+						return true; 

 					}

-					if ( type == 'first') return true;

 					node = elem;

 				case 'last':

-					while (node = node.nextSibling)  {

-						if ( node.nodeType === 1 ) return false;

+					while ( (node = node.nextSibling) )	 {

+						if ( node.nodeType === 1 ) { 

+							return false; 

+						}

 					}

 					return true;

 				case 'nth':

 					var first = match[2], last = match[3];

 

-					if ( first == 1 && last == 0 ) {

+					if ( first === 1 && last === 0 ) {

 						return true;

 					}

 					

@@ -4213,10 +6066,10 @@ var Expr = Sizzle.selectors = {
 					}

 					

 					var diff = elem.nodeIndex - last;

-					if ( first == 0 ) {

-						return diff == 0;

+					if ( first === 0 ) {

+						return diff === 0;

 					} else {

-						return ( diff % first == 0 && diff / first >= 0 );

+						return ( diff % first === 0 && diff / first >= 0 );

 					}

 			}

 		},

@@ -4224,7 +6077,7 @@ var Expr = Sizzle.selectors = {
 			return elem.nodeType === 1 && elem.getAttribute("id") === match;

 		},

 		TAG: function(elem, match){

-			return (match === "*" && elem.nodeType === 1) || elem.nodeName === match;

+			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;

 		},

 		CLASS: function(elem, match){

 			return (" " + (elem.className || elem.getAttribute("class")) + " ")

@@ -4252,7 +6105,7 @@ var Expr = Sizzle.selectors = {
 				!check ?

 				value && result !== false :

 				type === "!=" ?

-				value != check :

+				value !== check :

 				type === "^=" ?

 				value.indexOf(check) === 0 :

 				type === "$=" ?

@@ -4271,14 +6124,18 @@ var Expr = Sizzle.selectors = {
 	}

 };

 

-var origPOS = Expr.match.POS;

+var origPOS = Expr.match.POS,

+	fescape = function(all, num){

+		return "\\" + (num - 0 + 1);

+	};

 

 for ( var type in Expr.match ) {

-	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );

+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );

+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );

 }

 

 var makeArray = function(array, results) {

-	array = Array.prototype.slice.call( array );

+	array = Array.prototype.slice.call( array, 0 );

 

 	if ( results ) {

 		results.push.apply( results, array );

@@ -4290,23 +6147,25 @@ var makeArray = function(array, results) {
 

 // Perform a simple check to determine if the browser is capable of

 // converting a NodeList to an array using builtin methods.

+// Also verifies that the returned array holds DOM nodes

+// (which is not the case in the Blackberry browser)

 try {

-	Array.prototype.slice.call( document.documentElement.childNodes );

+	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;

 

 // Provide a fallback method if it does not work

 } catch(e){

 	makeArray = function(array, results) {

-		var ret = results || [];

+		var ret = results || [], i = 0;

 

 		if ( toString.call(array) === "[object Array]" ) {

 			Array.prototype.push.apply( ret, array );

 		} else {

 			if ( typeof array.length === "number" ) {

-				for ( var i = 0, l = array.length; i < l; i++ ) {

+				for ( var l = array.length; i < l; i++ ) {

 					ret.push( array[i] );

 				}

 			} else {

-				for ( var i = 0; array[i]; i++ ) {

+				for ( ; array[i]; i++ ) {

 					ret.push( array[i] );

 				}

 			}

@@ -4320,6 +6179,13 @@ var sortOrder;
 

 if ( document.documentElement.compareDocumentPosition ) {

 	sortOrder = function( a, b ) {

+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {

+			if ( a == b ) {

+				hasDuplicate = true;

+			}

+			return a.compareDocumentPosition ? -1 : 1;

+		}

+

 		var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;

 		if ( ret === 0 ) {

 			hasDuplicate = true;

@@ -4328,6 +6194,13 @@ if ( document.documentElement.compareDocumentPosition ) {
 	};

 } else if ( "sourceIndex" in document.documentElement ) {

 	sortOrder = function( a, b ) {

+		if ( !a.sourceIndex || !b.sourceIndex ) {

+			if ( a == b ) {

+				hasDuplicate = true;

+			}

+			return a.sourceIndex ? -1 : 1;

+		}

+

 		var ret = a.sourceIndex - b.sourceIndex;

 		if ( ret === 0 ) {

 			hasDuplicate = true;

@@ -4336,6 +6209,13 @@ if ( document.documentElement.compareDocumentPosition ) {
 	};

 } else if ( document.createRange ) {

 	sortOrder = function( a, b ) {

+		if ( !a.ownerDocument || !b.ownerDocument ) {

+			if ( a == b ) {

+				hasDuplicate = true;

+			}

+			return a.ownerDocument ? -1 : 1;

+		}

+

 		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();

 		aRange.setStart(a, 0);

 		aRange.setEnd(a, 0);

@@ -4349,12 +6229,32 @@ if ( document.documentElement.compareDocumentPosition ) {
 	};

 }

 

+// Utility function for retreiving the text value of an array of DOM nodes

+Sizzle.getText = function( elems ) {

+	var ret = "", elem;

+

+	for ( var i = 0; elems[i]; i++ ) {

+		elem = elems[i];

+

+		// Get the text from text nodes and CDATA nodes

+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {

+			ret += elem.nodeValue;

+

+		// Traverse everything else, except comment nodes

+		} else if ( elem.nodeType !== 8 ) {

+			ret += Sizzle.getText( elem.childNodes );

+		}

+	}

+

+	return ret;

+};

+

 // Check to see if the browser returns elements by name when

 // querying by getElementById (and provide a workaround)

 (function(){

 	// We're going to inject a fake input element with a specified name

 	var form = document.createElement("div"),

-		id = "script" + (new Date).getTime();

+		id = "script" + (new Date()).getTime();

 	form.innerHTML = "<a name='" + id + "'/>";

 

 	// Inject it into the root element, check its status, and remove it quickly

@@ -4363,7 +6263,7 @@ if ( document.documentElement.compareDocumentPosition ) {
 

 	// The workaround has to do additional checks after a getElementById

 	// Which slows things down for other browsers (hence the branching)

-	if ( !!document.getElementById( id ) ) {

+	if ( document.getElementById( id ) ) {

 		Expr.find.ID = function(match, context, isXML){

 			if ( typeof context.getElementById !== "undefined" && !isXML ) {

 				var m = context.getElementById(match[1]);

@@ -4378,6 +6278,7 @@ if ( document.documentElement.compareDocumentPosition ) {
 	}

 

 	root.removeChild( form );

+	root = form = null; // release memory in IE

 })();

 

 (function(){

@@ -4418,68 +6319,75 @@ if ( document.documentElement.compareDocumentPosition ) {
 			return elem.getAttribute("href", 2);

 		};

 	}

+

+	div = null; // release memory in IE

 })();

 

-if ( document.querySelectorAll ) (function(){

-	var oldSizzle = Sizzle, div = document.createElement("div");

-	div.innerHTML = "<p class='TEST'></p>";

+if ( document.querySelectorAll ) {

+	(function(){

+		var oldSizzle = Sizzle, div = document.createElement("div");

+		div.innerHTML = "<p class='TEST'></p>";

 

-	// Safari can't handle uppercase or unicode characters when

-	// in quirks mode.

-	if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {

-		return;

-	}

+		// Safari can't handle uppercase or unicode characters when

+		// in quirks mode.

+		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {

+			return;

+		}

 	

-	Sizzle = function(query, context, extra, seed){

-		context = context || document;

+		Sizzle = function(query, context, extra, seed){

+			context = context || document;

 

-		// Only use querySelectorAll on non-XML documents

-		// (ID selectors don't work in non-HTML documents)

-		if ( !seed && context.nodeType === 9 && !isXML(context) ) {

-			try {

-				return makeArray( context.querySelectorAll(query), extra );

-			} catch(e){}

-		}

+			// Only use querySelectorAll on non-XML documents

+			// (ID selectors don't work in non-HTML documents)

+			if ( !seed && context.nodeType === 9 && !Sizzle.isXML(context) ) {

+				try {

+					return makeArray( context.querySelectorAll(query), extra );

+				} catch(e){}

+			}

 		

-		return oldSizzle(query, context, extra, seed);

-	};

+			return oldSizzle(query, context, extra, seed);

+		};

 

-	for ( var prop in oldSizzle ) {

-		Sizzle[ prop ] = oldSizzle[ prop ];

-	}

-})();

+		for ( var prop in oldSizzle ) {

+			Sizzle[ prop ] = oldSizzle[ prop ];

+		}

+

+		div = null; // release memory in IE

+	})();

+}

 

-if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) (function(){

+(function(){

 	var div = document.createElement("div");

+

 	div.innerHTML = "<div class='test e'></div><div class='test'></div>";

 

 	// Opera can't find a second classname (in 9.6)

-	if ( div.getElementsByClassName("e").length === 0 )

+	// Also, make sure that getElementsByClassName actually exists

+	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {

 		return;

+	}

 

 	// Safari caches class attributes, doesn't catch changes (in 3.2)

 	div.lastChild.className = "e";

 

-	if ( div.getElementsByClassName("e").length === 1 )

+	if ( div.getElementsByClassName("e").length === 1 ) {

 		return;

-

+	}

+	

 	Expr.order.splice(1, 0, "CLASS");

 	Expr.find.CLASS = function(match, context, isXML) {

 		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {

 			return context.getElementsByClassName(match[1]);

 		}

 	};

+

+	div = null; // release memory in IE

 })();

 

 function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {

-	var sibDir = dir == "previousSibling" && !isXML;

 	for ( var i = 0, l = checkSet.length; i < l; i++ ) {

 		var elem = checkSet[i];

 		if ( elem ) {

-			if ( sibDir && elem.nodeType === 1 ){

-				elem.sizcache = doneName;

-				elem.sizset = i;

-			}

 			elem = elem[dir];

 			var match = false;

 

@@ -4494,7 +6402,7 @@ function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 					elem.sizset = i;

 				}

 

-				if ( elem.nodeName === cur ) {

+				if ( elem.nodeName.toLowerCase() === cur ) {

 					match = elem;

 					break;

 				}

@@ -4508,14 +6416,9 @@ function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 }

 

 function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {

-	var sibDir = dir == "previousSibling" && !isXML;

 	for ( var i = 0, l = checkSet.length; i < l; i++ ) {

 		var elem = checkSet[i];

 		if ( elem ) {

-			if ( sibDir && elem.nodeType === 1 ) {

-				elem.sizcache = doneName;

-				elem.sizset = i;

-			}

 			elem = elem[dir];

 			var match = false;

 

@@ -4550,15 +6453,17 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 	}

 }

 

-var contains = document.compareDocumentPosition ?  function(a, b){

-	return a.compareDocumentPosition(b) & 16;

+Sizzle.contains = document.compareDocumentPosition ? function(a, b){

+	return !!(a.compareDocumentPosition(b) & 16);

 } : function(a, b){

 	return a !== b && (a.contains ? a.contains(b) : true);

 };

 

-var isXML = function(elem){

-	return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||

-		!!elem.ownerDocument && elem.ownerDocument.documentElement.nodeName !== "HTML";

+Sizzle.isXML = function(elem){

+	// documentElement is verified for cases where it doesn't yet exist

+	// (such as loading iframes in IE - #4833) 

+	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;

+	return documentElement ? documentElement.nodeName !== "HTML" : false;

 };

 

 var posProcess = function(selector, context){

@@ -4852,7 +6757,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 		},

 

 		_stoppers : {

-			preventDefault :  function() {

+			preventDefault : function() {

 				this.returnValue = false;

 			},

 

@@ -5000,8 +6905,11 @@ window.tinymce.dom.Sizzle = Sizzle;
 			// Add events

 			each([

 				'onBeforeSetContent',

+

 				'onBeforeGetContent',

+

 				'onSetContent',

+

 				'onGetContent'

 			], function(e) {

 				t[e] = new tinymce.util.Dispatcher(t);

@@ -5011,6 +6919,9 @@ window.tinymce.dom.Sizzle = Sizzle;
 			if (!t.win.getSelection)

 				t.tridentSel = new tinymce.dom.TridentSelection(t);

 

+			if (tinymce.isIE && dom.boxModel)

+				this._fixIESelection();

+

 			// Prevent leaks

 			tinymce.addUnload(t.destroy, t);

 		},

@@ -5052,84 +6963,110 @@ window.tinymce.dom.Sizzle = Sizzle;
 			return s.content;

 		},

 

-		setContent : function(h, s) {

-			var t = this, r = t.getRng(), c, d = t.win.document;

+		setContent : function(content, args) {

+			var self = this, rng = self.getRng(), caretNode, doc = self.win.document, frag, temp;

 

-			s = s || {format : 'html'};

-			s.set = true;

-			h = s.content = t.dom.processHTML(h);

+			args = args || {format : 'html'};

+			args.set = true;

+			content = args.content = content;

 

 			// Dispatch before set content event

-			t.onBeforeSetContent.dispatch(t, s);

-			h = s.content;

+			if (!args.no_events)

+				self.onBeforeSetContent.dispatch(self, args);

+

+			content = args.content;

 

-			if (r.insertNode) {

+			if (rng.insertNode) {

 				// Make caret marker since insertNode places the caret in the beginning of text after insert

-				h += '<span id="__caret">_</span>';

+				content += '<span id="__caret">_</span>';

 

 				// Delete and insert new node

-				

-				if (r.startContainer == d && r.endContainer ==  d) {

+				if (rng.startContainer == doc && rng.endContainer == doc) {

 					// WebKit will fail if the body is empty since the range is then invalid and it can't insert contents

-					d.body.innerHTML = h;

+					doc.body.innerHTML = content;

 				} else {

-					r.deleteContents();

-					if (d.body.childNodes.length == 0) {

-						d.body.innerHTML = h;

+					rng.deleteContents();

+

+					if (doc.body.childNodes.length == 0) {

+						doc.body.innerHTML = content;

 					} else {

-						r.insertNode(r.createContextualFragment(h));

+						// createContextualFragment doesn't exists in IE 9 DOMRanges

+						if (rng.createContextualFragment) {

+							rng.insertNode(rng.createContextualFragment(content));

+						} else {

+							// Fake createContextualFragment call in IE 9

+							frag = doc.createDocumentFragment();

+							temp = doc.createElement('div');

+

+							frag.appendChild(temp);

+							temp.outerHTML = content;

+

+							rng.insertNode(frag);

+						}

 					}

 				}

 

 				// Move to caret marker

-				c = t.dom.get('__caret');

+				caretNode = self.dom.get('__caret');

+

 				// Make sure we wrap it compleatly, Opera fails with a simple select call

-				r = d.createRange();

-				r.setStartBefore(c);

-				r.setEndBefore(c);

-				t.setRng(r);

+				rng = doc.createRange();

+				rng.setStartBefore(caretNode);

+				rng.setEndBefore(caretNode);

+				self.setRng(rng);

 

 				// Remove the caret position

-				t.dom.remove('__caret');

+				self.dom.remove('__caret');

+				self.setRng(rng);

 			} else {

-				if (r.item) {

+				if (rng.item) {

 					// Delete content and get caret text selection

-					d.execCommand('Delete', false, null);

-					r = t.getRng();

+					doc.execCommand('Delete', false, null);

+					rng = self.getRng();

 				}

 

-				r.pasteHTML(h);

+				rng.pasteHTML(content);

 			}

 

 			// Dispatch set content event

-			t.onSetContent.dispatch(t, s);

+			if (!args.no_events)

+				self.onSetContent.dispatch(self, args);

 		},

 

 		getStart : function() {

-			var t = this, r = t.getRng(), e;

-

-			if (r.duplicate || r.item) {

-				if (r.item)

-					return r.item(0);

-

-				r = r.duplicate();

-				r.collapse(1);

-				e = r.parentElement();

+			var rng = this.getRng(), startElement, parentElement, checkRng, node;

 

-				if (e && e.nodeName == 'BODY')

-					return e.firstChild || e;

+			if (rng.duplicate || rng.item) {

+				// Control selection, return first item

+				if (rng.item)

+					return rng.item(0);

+

+				// Get start element

+				checkRng = rng.duplicate();

+				checkRng.collapse(1);

+				startElement = checkRng.parentElement();

+

+				// Check if range parent is inside the start element, then return the inner parent element

+				// This will fix issues when a single element is selected, IE would otherwise return the wrong start element

+				parentElement = node = rng.parentElement();

+				while (node = node.parentNode) {

+					if (node == startElement) {

+						startElement = parentElement;

+						break;

+					}

+				}

 

-				return e;

+				return startElement;

 			} else {

-				e = r.startContainer;

+				startElement = rng.startContainer;

 

-				if (e.nodeType == 1 && e.hasChildNodes())

-					e = e.childNodes[Math.min(e.childNodes.length - 1, r.startOffset)];

+				if (startElement.nodeType == 1 && startElement.hasChildNodes())

+					startElement = startElement.childNodes[Math.min(startElement.childNodes.length - 1, rng.startOffset)];

 

-				if (e && e.nodeType == 3)

-					return e.parentNode;

+				if (startElement && startElement.nodeType == 3)

+					return startElement.parentNode;

 

-				return e;

+				return startElement;

 			}

 		},

 

@@ -5234,14 +7171,25 @@ window.tinymce.dom.Sizzle = Sizzle;
 				if (!rng.item) {

 					rng2 = rng.duplicate();

 

-					// Insert start marker

-					rng.collapse();

-					rng.pasteHTML('<span _mce_type="bookmark" id="' + id + '_start" style="' + styles + '">' + chr + '</span>');

+					try {

+						// Insert start marker

+						rng.collapse();

+						rng.pasteHTML('<span data-mce-type="bookmark" id="' + id + '_start" style="' + styles + '">' + chr + '</span>');

+

+						// Insert end marker

+						if (!collapsed) {

+							rng2.collapse(false);

 

-					// Insert end marker

-					if (!collapsed) {

-						rng2.collapse(false);

-						rng2.pasteHTML('<span _mce_type="bookmark" id="' + id + '_end" style="' + styles + '">' + chr + '</span>');

+							// Detect the empty space after block elements in IE and move the end back one character <p></p>] becomes <p>]</p>

+							rng.moveToElementText(rng2.parentElement());

+							if (rng.compareEndPoints('StartToEnd', rng2) == 0)

+								rng2.move('character', -1);

+

+							rng2.pasteHTML('<span data-mce-type="bookmark" id="' + id + '_end" style="' + styles + '">' + chr + '</span>');

+						}

+					} catch (ex) {

+						// IE might throw unspecified error so lets ignore it

+						return null;

 					}

 				} else {

 					// Control selection

@@ -5262,11 +7210,11 @@ window.tinymce.dom.Sizzle = Sizzle;
 				// Insert end marker

 				if (!collapsed) {

 					rng2.collapse(false);

-					rng2.insertNode(dom.create('span', {_mce_type : "bookmark", id : id + '_end', style : styles}, chr));

+					rng2.insertNode(dom.create('span', {'data-mce-type' : "bookmark", id : id + '_end', style : styles}, chr));

 				}

 

 				rng.collapse(true);

-				rng.insertNode(dom.create('span', {_mce_type : "bookmark", id : id + '_start', style : styles}, chr));

+				rng.insertNode(dom.create('span', {'data-mce-type' : "bookmark", id : id + '_start', style : styles}, chr));

 			}

 

 			t.moveToBookmark({id : id, keep : 1});

@@ -5287,25 +7235,42 @@ window.tinymce.dom.Sizzle = Sizzle;
 					root = dom.getRoot();

 

 					function setEndPoint(start) {

-						var point = bookmark[start ? 'start' : 'end'], i, node, offset;

+						var point = bookmark[start ? 'start' : 'end'], i, node, offset, children;

 

 						if (point) {

+							offset = point[0];

+

 							// Find container node

-							for (node = root, i = point.length - 1; i >= 1; i--)

-								node = node.childNodes[point[i]];

+							for (node = root, i = point.length - 1; i >= 1; i--) {

+								children = node.childNodes;

+

+								if (point[i] > children.length - 1)

+									return;

+

+								node = children[point[i]];

+							}

+

+							// Move text offset to best suitable location

+							if (node.nodeType === 3)

+								offset = Math.min(point[0], node.nodeValue.length);

+

+							// Move element offset to best suitable location

+							if (node.nodeType === 1)

+								offset = Math.min(point[0], node.childNodes.length);

 

 							// Set offset within container node

 							if (start)

-								rng.setStart(node, point[0]);

+								rng.setStart(node, offset);

 							else

-								rng.setEnd(node, point[0]);

+								rng.setEnd(node, offset);

 						}

-					};

 

-					setEndPoint(true);

-					setEndPoint();

+						return true;

+					};

 

-					t.setRng(rng);

+					if (setEndPoint(true) && setEndPoint()) {

+						t.setRng(rng);

+					}

 				} else if (bookmark.id) {

 					function restoreEndPoint(suffix) {

 						var marker = dom.get(bookmark.id + '_' + suffix), node, idx, next, prev, keep = bookmark.keep;

@@ -5317,7 +7282,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 								if (!keep) {

 									idx = dom.nodeIndex(marker);

 								} else {

-									node = marker;

+									node = marker.firstChild;

 									idx = 1;

 								}

 

@@ -5327,7 +7292,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 								if (!keep) {

 									idx = dom.nodeIndex(marker);

 								} else {

-									node = marker;

+									node = marker.firstChild;

 									idx = 1;

 								}

 

@@ -5350,8 +7315,9 @@ window.tinymce.dom.Sizzle = Sizzle;
 								while (marker = dom.get(bookmark.id + '_' + suffix))

 									dom.remove(marker, 1);

 

-								// If siblings are text nodes then merge them

-								if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3) {

+								// If siblings are text nodes then merge them unless it's Opera since it some how removes the node

+								// and we are sniffing since adding a lot of detection code for a browser with 3% of the market isn't worth the effort. Sorry, Opera but it's just a fact

+								if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3 && !tinymce.isOpera) {

 									idx = prev.nodeValue.length;

 									prev.appendData(next.nodeValue);

 									dom.remove(next);

@@ -5368,14 +7334,24 @@ window.tinymce.dom.Sizzle = Sizzle;
 						}

 					};

 

+					function addBogus(node) {

+						// Adds a bogus BR element for empty block elements or just a space on IE since it renders BR elements incorrectly

+						if (dom.isBlock(node) && !node.innerHTML)

+							node.innerHTML = !isIE ? '<br data-mce-bogus="1" />' : ' ';

+

+						return node;

+					};

+

 					// Restore start/end points

 					restoreEndPoint('start');

 					restoreEndPoint('end');

 

-					rng = dom.createRng();

-					rng.setStart(startContainer, startOffset);

-					rng.setEnd(endContainer, endOffset);

-					t.setRng(rng);

+					if (startContainer) {

+						rng = dom.createRng();

+						rng.setStart(addBogus(startContainer), startOffset);

+						rng.setEnd(addBogus(endContainer), endOffset);

+						t.setRng(rng);

+					}

 				} else if (bookmark.name) {

 					t.select(dom.select(bookmark.name)[bookmark.index]);

 				} else if (bookmark.rng)

@@ -5386,44 +7362,46 @@ window.tinymce.dom.Sizzle = Sizzle;
 		select : function(node, content) {

 			var t = this, dom = t.dom, rng = dom.createRng(), idx;

 

-			idx = dom.nodeIndex(node);

-			rng.setStart(node.parentNode, idx);

-			rng.setEnd(node.parentNode, idx + 1);

-

-			// Find first/last text node or BR element

-			if (content) {

-				function setPoint(node, start) {

-					var walker = new tinymce.dom.TreeWalker(node, node);

+			if (node) {

+				idx = dom.nodeIndex(node);

+				rng.setStart(node.parentNode, idx);

+				rng.setEnd(node.parentNode, idx + 1);

+

+				// Find first/last text node or BR element

+				if (content) {

+					function setPoint(node, start) {

+						var walker = new tinymce.dom.TreeWalker(node, node);

+

+						do {

+							// Text node

+							if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {

+								if (start)

+									rng.setStart(node, 0);

+								else

+									rng.setEnd(node, node.nodeValue.length);

 

-					do {

-						// Text node

-						if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {

-							if (start)

-								rng.setStart(node, 0);

-							else

-								rng.setEnd(node, node.nodeValue.length);

+								return;

+							}

 

-							return;

-						}

+							// BR element

+							if (node.nodeName == 'BR') {

+								if (start)

+									rng.setStartBefore(node);

+								else

+									rng.setEndBefore(node);

 

-						// BR element

-						if (node.nodeName == 'BR') {

-							if (start)

-								rng.setStartBefore(node);

-							else

-								rng.setEndBefore(node);

+								return;

+							}

+						} while (node = (start ? walker.next() : walker.prev()));

+					};

 

-							return;

-						}

-					} while (node = (start ? walker.next() : walker.prev()));

-				};

+					setPoint(node, 1);

+					setPoint(node);

+				}

 

-				setPoint(node, 1);

-				setPoint(node);

+				t.setRng(rng);

 			}

 

-			t.setRng(rng);

-

 			return node;

 		},

 

@@ -5439,18 +7417,18 @@ window.tinymce.dom.Sizzle = Sizzle;
 			return !s || r.collapsed;

 		},

 

-		collapse : function(b) {

-			var t = this, r = t.getRng(), n;

+		collapse : function(to_start) {

+			var self = this, rng = self.getRng(), node;

 

 			// Control range on IE

-			if (r.item) {

-				n = r.item(0);

-				r = this.win.document.body.createTextRange();

-				r.moveToElementText(n);

+			if (rng.item) {

+				node = rng.item(0);

+				rng = self.win.document.body.createTextRange();

+				rng.moveToElementText(node);

 			}

 

-			r.collapse(!!b);

-			t.setRng(r);

+			rng.collapse(!!to_start);

+			self.setRng(rng);

 		},

 

 		getSel : function() {

@@ -5460,7 +7438,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 		},

 

 		getRng : function(w3c) {

-			var t = this, s, r;

+			var t = this, s, r, elm, doc = t.win.document;

 

 			// Found tridentSel object then we need to use that one

 			if (w3c && t.tridentSel)

@@ -5468,16 +7446,24 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 			try {

 				if (s = t.getSel())

-					r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : t.win.document.createRange());

+					r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : doc.createRange());

 			} catch (ex) {

 				// IE throws unspecified error here if TinyMCE is placed in a frame/iframe

 			}

 

+			// We have W3C ranges and it's IE then fake control selection since IE9 doesn't handle that correctly yet

+			if (tinymce.isIE && r && r.setStart && doc.selection.createRange().item) {

+				elm = doc.selection.createRange().item(0);

+				r = doc.createRange();

+				r.setStartBefore(elm);

+				r.setEndAfter(elm);

+			}

+

 			// 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 = t.win.document.createRange ? t.win.document.createRange() : t.win.document.body.createTextRange();

+				r = doc.createRange ? doc.createRange() : doc.body.createTextRange();

 

 			if (t.selectedRange && t.explicitRange) {

 				if (r.compareBoundaryPoints(r.START_TO_START, t.selectedRange) === 0 && r.compareBoundaryPoints(r.END_TO_END, t.selectedRange) === 0) {

@@ -5489,6 +7475,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 					t.explicitRange = null;

 				}

 			}

+

 			return r;

 		},

 

@@ -5500,7 +7487,13 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 				if (s) {

 					t.explicitRange = r;

-					s.removeAllRanges();

+

+					try {

+						s.removeAllRanges();

+					} catch (ex) {

+						// IE9 might throw errors here don't know why

+					}

+

 					s.addRange(r);

 					t.selectedRange = s.getRangeAt(0);

 				}

@@ -5529,27 +7522,52 @@ window.tinymce.dom.Sizzle = Sizzle;
 		},

 

 		getNode : function() {

-			var t = this, rng = t.getRng(), sel = t.getSel(), elm;

+			var t = this, rng = t.getRng(), sel = t.getSel(), elm, start = rng.startContainer, end = rng.endContainer;

 

-			if (rng.setStart) {

-				// Range maybe lost after the editor is made visible again

-				if (!rng)

-					return t.dom.getRoot();

+			// Range maybe lost after the editor is made visible again

+			if (!rng)

+				return t.dom.getRoot();

 

+			if (rng.setStart) {

 				elm = rng.commonAncestorContainer;

 

 				// Handle selection a image or other control like element such as anchors

 				if (!rng.collapsed) {

 					if (rng.startContainer == rng.endContainer) {

-						if (rng.startOffset - rng.endOffset < 2) {

+						if (rng.endOffset - rng.startOffset < 2) {

 							if (rng.startContainer.hasChildNodes())

 								elm = rng.startContainer.childNodes[rng.startOffset];

 						}

 					}

 

 					// If the anchor node is a element instead of a text node then return this element

-					if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1) 

-						return sel.anchorNode.childNodes[sel.anchorOffset]; 

+					//if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1) 

+					//	return sel.anchorNode.childNodes[sel.anchorOffset];

+

+					// Handle cases where the selection is immediately wrapped around a node and return that node instead of it's parent.

+					// This happens when you double click an underlined word in FireFox.

+					if (start.nodeType === 3 && end.nodeType === 3) {

+						function skipEmptyTextNodes(n, forwards) {

+							var orig = n;

+							while (n && n.nodeType === 3 && n.length === 0) {

+								n = forwards ? n.nextSibling : n.previousSibling;

+							}

+							return n || orig;

+						}

+						if (start.length === rng.startOffset) {

+							start = skipEmptyTextNodes(start.nextSibling, true);

+						} else {

+							start = start.parentNode;

+						}

+						if (rng.endOffset === 0) {

+							end = skipEmptyTextNodes(end.previousSibling, false);

+						} else {

+							end = end.parentNode;

+						}

+

+						if (start && start === end)

+							return start;

+					}

 				}

 

 				if (elm && elm.nodeType == 3)

@@ -5596,1103 +7614,344 @@ window.tinymce.dom.Sizzle = Sizzle;
 			// Manual destroy then remove unload handler

 			if (!s)

 				tinymce.removeUnload(t.destroy);

-		}

-	});

-})(tinymce);

-

-(function(tinymce) {

-	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.createCDATASection(v));

-		},

-

-		writeComment : function(v) {

-			// Fix for bug #2035694

-			if (tinymce.isIE)

-				v = v.replace(/^\-|\-$/g, ' ');

-

-			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;

-		}

-	});

-})(tinymce);

-

-(function(tinymce) {

-	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 : 0

-			}, 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;

-		},

+		// IE has an issue where you can't select/move the caret by clicking outside the body if the document is in standards mode

+		_fixIESelection : function() {

+			var dom = this.dom, doc = dom.doc, body = doc.body, started, startRng, htmlElm;

 

-		writeAttribute : function(n, v) {

-			var t = this;

+			// Make HTML element unselectable since we are going to handle selection by hand

+			doc.documentElement.unselectable = true;

 

-			t.writeRaw(" " + t.encode(n) + '="' + t.encode(v) + '"');

-		},

+			// Return range from point or null if it failed

+			function rngFromPoint(x, y) {

+				var rng = body.createTextRange();

 

-		writeEndElement : function() {

-			var n;

+				try {

+					rng.moveToPoint(x, y);

+				} catch (ex) {

+					// IE sometimes throws and exception, so lets just ignore it

+					rng = null;

+				}

 

-			if (this.tags.length > 0) {

-				n = this.tags.pop();

+				return rng;

+			};

 

-				if (this._writeAttributesEnd(1))

-					this.writeRaw('</' + n + '>');

+			// Fires while the selection is changing

+			function selectionChange(e) {

+				var pointRng;

 

-				if (this.settings.indentation > 0)

-					this.writeRaw('\n');

-			}

-		},

+				// Check if the button is down or not

+				if (e.button) {

+					// Create range from mouse position

+					pointRng = rngFromPoint(e.x, e.y);

 

-		writeFullEndElement : function() {

-			if (this.tags.length > 0) {

-				this._writeAttributesEnd();

-				this.writeRaw('</' + this.tags.pop() + '>');

+					if (pointRng) {

+						// Check if pointRange is before/after selection then change the endPoint

+						if (pointRng.compareEndPoints('StartToStart', startRng) > 0)

+							pointRng.setEndPoint('StartToStart', startRng);

+						else

+							pointRng.setEndPoint('EndToEnd', startRng);

 

-				if (this.settings.indentation > 0)

-					this.writeRaw('\n');

+						pointRng.select();

+					}

+				} else

+					endSelection();

 			}

-		},

-

-		writeText : function(v) {

-			this._writeAttributesEnd();

-			this.writeRaw(this.encode(v));

-			this.count++;

-		},

 

-		writeCDATA : function(v) {

-			this._writeAttributesEnd();

-			this.writeRaw('<![CDATA[' + v + ']]>');

-			this.count++;

-		},

+			// Removes listeners

+			function endSelection() {

+				var rng = doc.selection.createRange();

 

-		writeComment : function(v) {

-			this._writeAttributesEnd();

-			this.writeRaw('<!-- ' + v + '-->');

-			this.count++;

-		},

+				// If the range is collapsed then use the last start range

+				if (startRng && !rng.item && rng.compareEndPoints('StartToEnd', rng) === 0)

+					startRng.select();

 

-		writeRaw : function(v) {

-			this.str += v;

-		},

+				dom.unbind(doc, 'mouseup', endSelection);

+				dom.unbind(doc, 'mousemove', selectionChange);

+				startRng = started = 0;

+			};

 

-		encode : function(s) {

-			return s.replace(/[<>&"]/g, function(v) {

-				switch (v) {

-					case '<':

-						return '&lt;';

+			// Detect when user selects outside BODY

+			dom.bind(doc, ['mousedown', 'contextmenu'], function(e) {

+				if (e.target.nodeName === 'HTML') {

+					if (started)

+						endSelection();

 

-					case '>':

-						return '&gt;';

+					// Detect vertical scrollbar, since IE will fire a mousedown on the scrollbar and have target set as HTML

+					htmlElm = doc.documentElement;

+					if (htmlElm.scrollHeight > htmlElm.clientHeight)

+						return;

 

-					case '&':

-						return '&amp;';

+					started = 1;

+					// Setup start position

+					startRng = rngFromPoint(e.x, e.y);

+					if (startRng) {

+						// Listen for selection change events

+						dom.bind(doc, 'mouseup', endSelection);

+						dom.bind(doc, 'mousemove', selectionChange);

 

-					case '"':

-						return '&quot;';

+						dom.win.focus();

+						startRng.select();

+					}

 				}

-

-				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;

 		}

 	});

 })(tinymce);

 

 (function(tinymce) {

-	// Shorten names

-	var extend = tinymce.extend, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, isIE = tinymce.isIE, isGecko = tinymce.isGecko;

+	tinymce.dom.Serializer = function(settings, dom, schema) {

+		var onPreProcess, onPostProcess, isIE = tinymce.isIE, each = tinymce.each, htmlParser;

 

-	function wildcardToRE(s) {

-		return s.replace(/([?+*])/g, '.$1');

-	};

+		// Support the old apply_source_formatting option

+		if (!settings.apply_source_formatting)

+			settings.indent = false;

 

-	tinymce.create('tinymce.dom.Serializer', {

-		Serializer : function(s) {

-			var t = this;

+		settings.remove_trailing_brs = true;

 

-			t.key = 0;

-			t.onPreProcess = new Dispatcher(t);

-			t.onPostProcess = new Dispatcher(t);

+		// Default DOM and Schema if they are undefined

+		dom = dom || tinymce.DOM;

+		schema = schema || new tinymce.html.Schema(settings);

+		settings.entity_encoding = settings.entity_encoding || 'named';

 

-			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_|sizset|sizcache)/,

-				closed : /^(br|hr|input|meta|img|link|param|area)$/,

-				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,

-				invalid_elements : 0,

-				fix_table_elements : 1,

-				fix_list_elements : true,

-				fix_content_duplication : true,

-				convert_fonts_to_spans : false,

-				font_size_classes : 0,

-				apply_source_formatting : 0,

-				indent_mode : 'simple',

-				indent_char : '\t',

-				indent_levels : 1,

-				remove_linebreaks : 1,

-				remove_redundant_brs : 1,

-				element_format : 'xhtml'

-			}, s);

+		onPreProcess = new tinymce.util.Dispatcher(self);

 

-			t.dom = s.dom;

-			t.schema = s.schema;

+		onPostProcess = new tinymce.util.Dispatcher(self);

 

-			// Use raw entities if no entities are defined

-			if (s.entity_encoding == 'named' && !s.entities)

-				s.entity_encoding = 'raw';

+		htmlParser = new tinymce.html.DomParser(settings, schema);

 

-			if (s.remove_redundant_brs) {

-				t.onPostProcess.add(function(se, o) {

-					// Remove single BR at end of block elements since they get rendered

-					o.content = o.content.replace(/(<br \/>\s*)+<\/(p|h[1-6]|div|li)>/gi, function(a, b, c) {

-						// Check if it's a single element

-						if (/^<br \/>\s*<\//.test(a))

-							return '</' + c + '>';

+		// Convert move data-mce-src, data-mce-href and data-mce-style into nodes or process them if needed

+		htmlParser.addAttributeFilter('src,href,style', function(nodes, name) {

+			var i = nodes.length, node, value, internalName = 'data-mce-' + name, urlConverter = settings.url_converter, urlConverterScope = settings.url_converter_scope, undef;

 

-						return a;

-					});

-				});

-			}

+			while (i--) {

+				node = nodes[i];

 

-			// Remove XHTML element endings i.e. produce crap :) XHTML is better

-			if (s.element_format == 'html') {

-				t.onPostProcess.add(function(se, o) {

-					o.content = o.content.replace(/<([^>]+) \/>/g, '<$1>');

-				});

-			}

-

-			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;

+				value = node.attributes.map[internalName];

+				if (value !== undef) {

+					// Set external name to internal value and remove internal

+					node.attr(name, value.length > 0 ? value : null);

+					node.attr(internalName, null);

+				} else {

+					// No internal attribute found then convert the value we have in the DOM

+					value = node.attributes.map[name];

 

-							if (r.test(p.nodeName)) {

-								np = prevNode(n, 'LI');

+					if (name === "style")

+						value = dom.serializeStyle(dom.parseStyle(value), node.name);

+					else if (urlConverter)

+						value = urlConverter.call(urlConverterScope, value, name, node.name);

 

-								if (!np) {

-									np = t.dom.create('li');

-									np.innerHTML = '&nbsp;';

-									np.appendChild(n);

-									p.insertBefore(np, p.firstChild);

-								} else

-									np.appendChild(n);

-							}

-						}

-					}

-				});

+					node.attr(name, value.length > 0 ? value : null);

+				}

 			}

+		});

 

-			if (s.fix_table_elements) {

-				t.onPreProcess.add(function(se, o) {

-					// Since Opera will crash if you attach the node to a dynamic document we need to brrowser sniff a specific build

-					// so Opera users with an older version will have to live with less compaible output not much we can do here

-					if (!tinymce.isOpera || opera.buildNumber() >= 1767) {

-						each(t.dom.select('p table', o.node).reverse(), function(n) {

-							var parent = t.dom.getParent(n.parentNode, 'table,p');

+		// Remove internal classes mceItem<..>

+		htmlParser.addAttributeFilter('class', function(nodes, name) {

+			var i = nodes.length, node, value;

 

-							if (parent.nodeName != 'TABLE') {

-								try {

-									t.dom.split(parent, n);

-								} catch (ex) {

-									// IE can sometimes fire an unknown runtime error so we just ignore it

-								}

-							}

-						});

-					}

-				});

+			while (i--) {

+				node = nodes[i];

+				value = node.attr('class').replace(/\s*mce(Item\w+|Selected)\s*/g, '');

+				node.attr('class', value.length > 0 ? value : null);

 			}

-		},

-

-		setEntities : function(s) {

-			var t = this, a, i, l = {}, 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];

+		// Remove bookmark elements

+		htmlParser.addAttributeFilter('data-mce-type', function(nodes, name, args) {

+			var i = nodes.length, node;

 

-				// Don't add default &amp; &quot; etc.

-				if (v == 34 || v == 38 || v == 60 || v == 62)

-					continue;

+			while (i--) {

+				node = nodes[i];

 

-				l[String.fromCharCode(a[i])] = a[i + 1];

-

-				v = parseInt(a[i]).toString(16);

+				if (node.attributes.map['data-mce-type'] === 'bookmark' && !args.cleanup)

+					node.remove();

 			}

+		});

 

-			t.entityLookup = l;

-		},

-

-		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;

+		// Force script into CDATA sections and remove the mce- prefix also add comments around styles

+		htmlParser.addNodeFilter('script,style', function(nodes, name) {

+			var i = nodes.length, node, value;

 

-							// Add forced attrib values

-							case ':':

-								ar.forcedVal = s[4];

-								break;

+			function trim(value) {

+				return value.replace(/(<!--\[CDATA\[|\]\]-->)/g, '\n')

+						.replace(/^[\r\n]*|[\r\n]*$/g, '')

+						.replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g, '')

+						.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g, '');

+			};

 

-							// Add validation values

-							case '<':

-								ar.validVals = s[4].split('?');

-								break;

-						}

+			while (i--) {

+				node = nodes[i];

+				value = node.firstChild ? node.firstChild.value : '';

 

-						if (/[*.?]/.test(s[2])) {

-							wat = wat || [];

-							ar.nameRE = new RegExp('^' + wildcardToRE(s[2]) + '$');

-							wat.push(ar);

-						} else {

-							ar.name = s[2];

-							at.push(ar);

-						}

+				if (name === "script") {

+					// Remove mce- prefix from script elements

+					node.attr('type', (node.attr('type') || 'text/javascript').replace(/^mce\-/, ''));

 

-						va.push(s[2]);

-					});

+					if (value.length > 0)

+						node.firstChild.value = '// <![CDATA[\n' + trim(value) + '\n// ]]>';

+				} else {

+					if (value.length > 0)

+						node.firstChild.value = '<!--\n' + trim(value) + '\n-->';

 				}

-

-				// 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, doc, oldDoc, impl, selected;

-

-			t._setup();

-			o = o || {};

-			o.format = o.format || 'html';

-			t.processObj = o;

-

-			// IE looses the selected attribute on option elements so we need to store it

-			// See: http://support.microsoft.com/kb/829907

-			if (isIE) {

-				selected = [];

-				each(n.getElementsByTagName('option'), function(n) {

-					var v = t.dom.getAttrib(n, 'selected');

-

-					selected.push(v ? v : null);

-				});

-			}

-

-			n = n.cloneNode(true);

-

-			// IE looses the selected attribute on option elements so we need to restore it

-			if (isIE) {

-				each(n.getElementsByTagName('option'), function(n, i) {

-					t.dom.setAttrib(n, 'selected', selected[i]);

-				});

-			}

-

-			// Nodes needs to be attached to something in WebKit/Opera

-			// Older builds of Opera crashes if you attach the node to an document created dynamically

-			// and since we can't feature detect a crash we need to sniff the acutal build number

-			// This fix will make DOM ranges and make Sizzle happy!

-			impl = n.ownerDocument.implementation;

-			if (impl.createHTMLDocument && (tinymce.isOpera && opera.buildNumber() >= 1767)) {

-				// Create an empty HTML document

-				doc = impl.createHTMLDocument("");

-

-				// Add the element or it's children if it's a body element to the new document

-				each(n.nodeName == 'BODY' ? n.childNodes : [n], function(node) {

-					doc.body.appendChild(doc.importNode(node, true));

-				});

-

-				// Grab first child or body element for serialization

-				if (n.nodeName != 'BODY')

-					n = doc.body.firstChild;

-				else

-					n = doc.body;

-

-				// set the new document in DOMUtils so createElement etc works

-				oldDoc = t.dom.doc;

-				t.dom.doc = doc;

-			}

+		// Convert comments to cdata and handle protected comments

+		htmlParser.addNodeFilter('#comment', function(nodes, name) {

+			var i = nodes.length, node;

 

-			t.key = '' + (parseInt(t.key) + 1);

+			while (i--) {

+				node = nodes[i];

 

-			// Pre process

-			if (!o.no_events) {

-				o.node = n;

-				t.onPreProcess.dispatch(t, o);

+				if (node.value.indexOf('[CDATA[') === 0) {

+					node.name = '#cdata';

+					node.type = 4;

+					node.value = node.value.replace(/^\[CDATA\[|\]\]$/g, '');

+				} else if (node.value.indexOf('mce:protected ') === 0) {

+					node.name = "#text";

+					node.type = 3;

+					node.raw = true;

+					node.value = unescape(node.value).substr(14);

+				}

 			}

+		});

 

-			// Serialize HTML DOM into a string

-			t.writer.reset();

-			t._info = o;

-			t._serializeNode(n, o.getInner);

-

-			// Post process

-			o.content = t.writer.getContent();

-

-			// Restore the old document if it was changed

-			if (oldDoc)

-				t.dom.doc = oldDoc;

-

-			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 : /(<noscript[^>]*>)(.*?)(<\/noscript>)/g},

-						{pattern : /(<style[^>]*>)(.*?)(<\/style>)/g},

-						{pattern : /(<pre[^>]*>)(.*?)(<\/pre>)/g, encode : 1},

-						{pattern : /(<!--\[CDATA\[)(.*?)(\]\]-->)/g}

-					]

-				});

-

-				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

-					}

+		htmlParser.addNodeFilter('xml:namespace,input', function(nodes, name) {

+			var i = nodes.length, node;

 

-					// 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');

-					}

+			while (i--) {

+				node = nodes[i];

+				if (node.type === 7)

+					node.remove();

+				else if (node.type === 1) {

+					if (name === "input" && !("type" in node.attributes.map))

+						node.attr('type', 'text');

 				}

-

-				h = t._unprotect(h, p);

-

-				// Restore CDATA sections

-				h = h.replace(/<!--\[CDATA\[([\s\S]+)\]\]-->/g, '<![CDATA[$1]]>');

-

-				// 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>');

-

-				// Restore noscript elements

-				h = h.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g, function(v, attribs, text) {

-					return '<noscript' + attribs + '>' + t.dom.decode(text.replace(/<!--|-->/g, '')) + '</noscript>';

-				});

 			}

+		});

 

-			o.content = h;

-		},

-

-		_serializeNode : function(n, inner) {

-			var t = this, s = t.settings, w = t.writer, hc, el, cn, i, l, a, at, no, v, nn, ru, ar, iv, closed, keep, type;

-

-			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 = keep = false;

-						hc = n.hasChildNodes();

-						nn = n.getAttribute('_mce_name') || n.nodeName.toLowerCase();

-

-						// Get internal type

-						type = n.getAttribute('_mce_type');

-						if (type) {

-							if (!t._info.cleanup) {

-								iv = true;

-								return;

-							} else

-								keep = 1;

-						}

-

-						// 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 (!keep) {

-							if (!t.validElementsRE || !t.validElementsRE.test(nn) || (t.invalidElementsRE && t.invalidElementsRE.test(nn)) || inner) {

-								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 (s.validate_children) {

-							if (t.elementName && !t.schema.isValid(t.elementName, nn)) {

-								iv = true;

-								break;

-							}

-

-							t.elementName = nn;

-						}

-

-						ru = t.findRule(nn);

-						

-						// No valid rule for this element could be found then skip it

-						if (!ru) {

-							iv = true;

-							break;

-						}

-

-						nn = ru.name || nn;

-						closed = s.closed.test(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 = t.dom.getAttribs(n);

-							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);

-								}

-							}

-						}

-

-						// Keep type attribute

-						if (type && keep)

-							w.writeAttribute('_mce_type', type);

+		// Fix list elements, TODO: Replace this later

+		if (settings.fix_list_elements) {

+			htmlParser.addNodeFilter('ul,ol', function(nodes, name) {

+				var i = nodes.length, node, parentNode;

 

-						// Write text from script

-						if (nn === 'script' && tinymce.trim(n.innerHTML)) {

-							w.writeText('// '); // Padd it with a comment so it will parse on older browsers

-							w.writeCDATA(n.innerHTML.replace(/<!--|-->|<\[CDATA\[|\]\]>/g, '')); // Remove comments and cdata stuctures

-							hc = false;

-							break;

-						}

+				while (i--) {

+					node = nodes[i];

+					parentNode = node.parent;

 

-						// Padd empty nodes with a &nbsp;

-						if (ru.padd) {

-							// If it has only one bogus child, padd it anyway workaround for <td><br /></td> bug

-							if (hc && (cn = n.firstChild) && cn.nodeType === 1 && n.childNodes.length === 1) {

-								if (cn.hasAttribute ? cn.hasAttribute('_mce_bogus') : cn.getAttribute('_mce_bogus'))

-									w.writeText('\u00a0');

-							} else if (!hc)

-								w.writeText('\u00a0'); // No children then padd it

+					if (parentNode.name === 'ul' || parentNode.name === 'ol') {

+						if (node.prev && node.prev.name === 'li') {

+							node.prev.append(node);

 						}

-

-						break;

-

-					case 3: // Text

-						// Check if valid child

-						if (s.validate_children && t.elementName && !t.schema.isValid(t.elementName, '#text'))

-							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 && !closed) {

-				cn = n.firstChild;

-

-				while (cn) {

-					t._serializeNode(cn);

-					t.elementName = nn;

-					cn = cn.nextSibling;

+					}

 				}

-			}

-

-			// Write element end

-			if (!iv) {

-				if (!closed)

-					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(/[\u007E-\uFFFF]/g, function(a) {

-						var v;

-

-						if (v = l[a])

-							a = '&' + v + ';';

-

-						return a;

-					});

-				}

+		// Remove internal data attributes

+		htmlParser.addAttributeFilter('data-mce-src,data-mce-href,data-mce-style', function(nodes, name) {

+			var i = nodes.length;

 

-				if (s.entity_encoding.indexOf('numeric') != -1) {

-					h = h.replace(/[\u007E-\uFFFF]/g, function(a) {

-						return '&#' + a.charCodeAt(0) + ';';

-					});

-				}

+			while (i--) {

+				nodes[i].attr(name, null);

 			}

+		});

 

-			return h;

-		},

+		// Return public methods

+		return {

+			schema : schema,

 

-		_setup : function() {

-			var t = this, s = this.settings;

+			addNodeFilter : htmlParser.addNodeFilter,

 

-			if (t.done)

-				return;

+			addAttributeFilter : htmlParser.addAttributeFilter,

 

-			t.done = 1;

+			onPreProcess : onPreProcess,

 

-			t.setRules(s.valid_elements);

-			t.addRules(s.extended_valid_elements);

+			onPostProcess : onPostProcess,

 

-			if (s.invalid_elements)

-				t.invalidElementsRE = new RegExp('^(' + wildcardToRE(s.invalid_elements.replace(/,/g, '|').toLowerCase()) + ')$');

+			serialize : function(node, args) {

+				var impl, doc, oldDoc, htmlSerializer, content;

 

-			if (s.attrib_value_filter)

-				t.attribValueFilter = s.attribValueFilter;

-		},

+				// Explorer won't clone contents of script and style and the

+				// selected index of select elements are cleared on a clone operation.

+				if (isIE && dom.select('script,style,select').length > 0) {

+					content = node.innerHTML;

+					node = node.cloneNode(false);

+					dom.setHTML(node, content);

+				} else

+					node = node.cloneNode(true);

+

+				// Nodes needs to be attached to something in WebKit/Opera

+				// Older builds of Opera crashes if you attach the node to an document created dynamically

+				// and since we can't feature detect a crash we need to sniff the acutal build number

+				// This fix will make DOM ranges and make Sizzle happy!

+				impl = node.ownerDocument.implementation;

+				if (impl.createHTMLDocument) {

+					// Create an empty HTML document

+					doc = impl.createHTMLDocument("");

+

+					// Add the element or it's children if it's a body element to the new document

+					each(node.nodeName == 'BODY' ? node.childNodes : [node], function(node) {

+						doc.body.appendChild(doc.importNode(node, true));

+					});

 

-		_getAttrib : function(n, a, na) {

-			var i, v;

+					// Grab first child or body element for serialization

+					if (node.nodeName != 'BODY')

+						node = doc.body.firstChild;

+					else

+						node = doc.body;

 

-			na = na || a.name;

+					// set the new document in DOMUtils so createElement etc works

+					oldDoc = dom.doc;

+					dom.doc = doc;

+				}

 

-			if (a.forcedVal && (v = a.forcedVal)) {

-				if (v === '{$uid}')

-					return this.dom.uniqueId();

+				args = args || {};

+				args.format = args.format || 'html';

 

-				return v;

-			}

+				// Pre process

+				if (!args.no_events) {

+					args.node = node;

+					onPreProcess.dispatch(self, args);

+				}

 

-			v = this.dom.getAttrib(n, na);

+				// Setup serializer

+				htmlSerializer = new tinymce.html.Serializer(settings, schema);

 

-			switch (na) {

-				case 'rowspan':

-				case 'colspan':

-					// Whats the point? Remove usless attribute value

-					if (v == '1')

-						v = '';

+				// Parse and serialize HTML

+				args.content = htmlSerializer.serialize(

+					htmlParser.parse(args.getInner ? node.innerHTML : tinymce.trim(dom.getOuterHTML(node), args), args)

+				);

 

-					break;

-			}

+				// Replace all BOM characters for now until we can find a better solution

+				if (!args.cleanup)

+					args.content = args.content.replace(/\uFEFF/g, '');

 

-			if (this.attribValueFilter)

-				v = this.attribValueFilter(na, v, n);

+				// Post process

+				if (!args.no_events)

+					onPostProcess.dispatch(self, args);

 

-			if (a.validVals) {

-				for (i = a.validVals.length - 1; i >= 0; i--) {

-					if (v == a.validVals[i])

-						break;

-				}

+				// Restore the old document if it was changed

+				if (oldDoc)

+					dom.doc = oldDoc;

 

-				if (i == -1)

-					return null;

-			}

+				args.node = null;

 

-			if (v === '' && typeof(a.defaultVal) != 'undefined') {

-				v = a.defaultVal;

+				return args.content;

+			},

 

-				if (v === '{$uid}')

-					return this.dom.uniqueId();

+			addRules : function(rules) {

+				schema.addValidElements(rules);

+			},

 

-				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, '');

+			setRules : function(rules) {

+				schema.setValidElements(rules);

 			}

-

-			if (v === '')

-				return null;

-

-

-			return v;

-		}

-	});

+		};

+	};

 })(tinymce);

-

 (function(tinymce) {

 	tinymce.dom.ScriptLoader = function(settings) {

 		var QUEUED = 0,

@@ -6717,6 +7976,17 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 				callback();

 			};

+			

+			function error() {

+				// Report the error so it's easier for people to spot loading errors

+				if (typeof(console) !== "undefined" && console.log)

+					console.log("Failed to load: " + url);

+

+				// We can't mark it as done if there is a load error since

+				// A) We don't want to produce 404 errors on the server and

+				// B) the onerror event won't fire on all browsers.

+				// done();

+			};

 

 			id = dom.uniqueId();

 

@@ -6726,7 +7996,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 				// If script is from same domain and we

 				// use IE 6 then use XHR since it's more reliable

-				if (uri.host == loc.hostname && uri.port == loc.port && (uri.protocol + ':') == loc.protocol) {

+				if (uri.host == loc.hostname && uri.port == loc.port && (uri.protocol + ':') == loc.protocol && uri.protocol.toLowerCase() != 'file') {

 					tinymce.util.XHR.send({

 						url : tinymce._addVer(uri.getURI()),

 						success : function(content) {

@@ -6741,7 +8011,9 @@ window.tinymce.dom.Sizzle = Sizzle;
 							dom.remove(script);

 

 							done();

-						}

+						},

+						

+						error : error

 					});

 

 					return;

@@ -6755,17 +8027,26 @@ window.tinymce.dom.Sizzle = Sizzle;
 				src : tinymce._addVer(url)

 			});

 

-			// Add onload and readystate listeners

-			elm.onload = done;

-			elm.onreadystatechange = function() {

-				var state = elm.readyState;

+			// Add onload listener for non IE browsers since IE9

+			// fires onload event before the script is parsed and executed

+			if (!tinymce.isIE)

+				elm.onload = done;

 

-				// Loaded state is passed on IE 6 however there

-				// are known issues with this method but we can't use

-				// XHR in a cross domain loading

-				if (state == 'complete' || state == 'loaded')

-					done();

-			};

+			// Add onerror event will get fired on some browsers but not all of them

+			elm.onerror = error;

+

+			// Opera 9.60 doesn't seem to fire the onreadystate event at correctly

+			if (!tinymce.isOpera) {

+				elm.onreadystatechange = function() {

+					var state = elm.readyState;

+

+					// Loaded state is passed on IE 6 however there

+					// are known issues with this method but we can't use

+					// XHR in a cross domain loading

+					if (state == 'complete' || state == 'loaded')

+						done();

+				};

+			}

 

 			// Most browsers support this feature so we report errors

 			// for those at least to help users track their missing plugins etc

@@ -6913,164 +8194,10 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 	};

 

 	this.prev = function(shallow) {

-		return (node = findSibling(node, 'lastChild', 'lastSibling', shallow));

+		return (node = findSibling(node, 'lastChild', 'previousSibling', shallow));

 	};

 };

 

-(function() {

-	var transitional = {};

-

-	function unpack(lookup, data) {

-		var key;

-

-		function replace(value) {

-			return value.replace(/[A-Z]+/g, function(key) {

-				return replace(lookup[key]);

-			});

-		};

-

-		// Unpack lookup

-		for (key in lookup) {

-			if (lookup.hasOwnProperty(key))

-				lookup[key] = replace(lookup[key]);

-		}

-

-		// Unpack and parse data into object map

-		replace(data).replace(/#/g, '#text').replace(/(\w+)\[([^\]]+)\]/g, function(str, name, children) {

-			var i, map = {};

-

-			children = children.split(/\|/);

-

-			for (i = children.length - 1; i >= 0; i--)

-				map[children[i]] = 1;

-

-			transitional[name] = map;

-		});

-	};

-

-	// This is the XHTML 1.0 transitional elements with it's children packed to reduce it's size

-	// we will later include the attributes here and use it as a default for valid elements but it

-	// requires us to rewrite the serializer engine

-	unpack({

-		Z : '#|H|K|N|O|P',

-		Y : '#|X|form|R|Q',

-		X : 'p|T|div|U|W|isindex|fieldset|table',

-		W : 'pre|hr|blockquote|address|center|noframes',

-		U : 'ul|ol|dl|menu|dir',

-		ZC : '#|p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',

-		T : 'h1|h2|h3|h4|h5|h6',

-		ZB : '#|X|S|Q',

-		S : 'R|P',

-		ZA : '#|a|G|J|M|O|P',

-		R : '#|a|H|K|N|O',

-		Q : 'noscript|P',

-		P : 'ins|del|script',

-		O : 'input|select|textarea|label|button',

-		N : 'M|L',

-		M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',

-		L : 'sub|sup',

-		K : 'J|I',

-		J : 'tt|i|b|u|s|strike',

-		I : 'big|small|font|basefont',

-		H : 'G|F',

-		G : 'br|span|bdo',

-		F : 'object|applet|img|map|iframe'

-	}, 'script[]' + 

-		'style[]' + 

-		'object[#|param|X|form|a|H|K|N|O|Q]' + 

-		'param[]' + 

-		'p[S]' + 

-		'a[Z]' + 

-		'br[]' + 

-		'span[S]' + 

-		'bdo[S]' + 

-		'applet[#|param|X|form|a|H|K|N|O|Q]' + 

-		'h1[S]' + 

-		'img[]' + 

-		'map[X|form|Q|area]' + 

-		'h2[S]' + 

-		'iframe[#|X|form|a|H|K|N|O|Q]' + 

-		'h3[S]' + 

-		'tt[S]' + 

-		'i[S]' + 

-		'b[S]' + 

-		'u[S]' + 

-		's[S]' + 

-		'strike[S]' + 

-		'big[S]' + 

-		'small[S]' + 

-		'font[S]' + 

-		'basefont[]' + 

-		'em[S]' + 

-		'strong[S]' + 

-		'dfn[S]' + 

-		'code[S]' + 

-		'q[S]' + 

-		'samp[S]' + 

-		'kbd[S]' + 

-		'var[S]' + 

-		'cite[S]' + 

-		'abbr[S]' + 

-		'acronym[S]' + 

-		'sub[S]' + 

-		'sup[S]' + 

-		'input[]' + 

-		'select[optgroup|option]' + 

-		'optgroup[option]' + 

-		'option[]' + 

-		'textarea[]' + 

-		'label[S]' + 

-		'button[#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + 

-		'h4[S]' + 

-		'ins[#|X|form|a|H|K|N|O|Q]' + 

-		'h5[S]' + 

-		'del[#|X|form|a|H|K|N|O|Q]' + 

-		'h6[S]' + 

-		'div[#|X|form|a|H|K|N|O|Q]' + 

-		'ul[li]' + 

-		'li[#|X|form|a|H|K|N|O|Q]' + 

-		'ol[li]' + 

-		'dl[dt|dd]' + 

-		'dt[S]' + 

-		'dd[#|X|form|a|H|K|N|O|Q]' + 

-		'menu[li]' + 

-		'dir[li]' + 

-		'pre[ZA]' + 

-		'hr[]' + 

-		'blockquote[#|X|form|a|H|K|N|O|Q]' + 

-		'address[S|p]' + 

-		'center[#|X|form|a|H|K|N|O|Q]' + 

-		'noframes[#|X|form|a|H|K|N|O|Q]' + 

-		'isindex[]' + 

-		'fieldset[#|legend|X|form|a|H|K|N|O|Q]' + 

-		'legend[S]' + 

-		'table[caption|col|colgroup|thead|tfoot|tbody|tr]' + 

-		'caption[S]' + 

-		'col[]' + 

-		'colgroup[col]' + 

-		'thead[tr]' + 

-		'tr[th|td]' + 

-		'th[#|X|form|a|H|K|N|O|Q]' + 

-		'form[#|X|a|H|K|N|O|Q]' + 

-		'noscript[#|X|form|a|H|K|N|O|Q]' + 

-		'td[#|X|form|a|H|K|N|O|Q]' + 

-		'tfoot[tr]' + 

-		'tbody[tr]' + 

-		'area[]' + 

-		'base[]' + 

-		'body[#|X|form|a|H|K|N|O|Q]'

-	);

-

-	tinymce.dom.Schema = function() {

-		var t = this, elements = transitional;

-

-		t.isValid = function(name, child_name) {

-			var element = elements[name];

-

-			return !!(element && (!child_name || element[child_name]));

-		};

-	};

-})();

 (function(tinymce) {

 	tinymce.dom.RangeUtils = function(dom) {

 		var INVISIBLE_CHAR = '\uFEFF';

@@ -7134,7 +8261,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 

 			// If index based end position then resolve it

 			if (endContainer.nodeType == 1 && endContainer.hasChildNodes())

-				endContainer = endContainer.childNodes[Math.min(startOffset == endOffset ? endOffset : endOffset - 1, endContainer.childNodes.length - 1)];

+				endContainer = endContainer.childNodes[Math.min(endOffset - 1, endContainer.childNodes.length - 1)];

 

 			// Find common ancestor and end points

 			ancestor = dom.findCommonAncestor(startContainer, endContainer);

@@ -7255,11 +8382,157 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 })(tinymce);

 

 (function(tinymce) {

+	var Event = tinymce.dom.Event, each = tinymce.each;

+

+	tinymce.create('tinymce.ui.KeyboardNavigation', {

+		KeyboardNavigation: function(settings, dom) {

+			var t = this, root = settings.root, items = settings.items,

+					enableUpDown = settings.enableUpDown, enableLeftRight = settings.enableLeftRight || !settings.enableUpDown,

+					excludeFromTabOrder = settings.excludeFromTabOrder,

+					itemFocussed, itemBlurred, rootKeydown, rootFocussed, focussedId;

+

+			dom = dom || tinymce.DOM;

+

+			itemFocussed = function(evt) {

+				focussedId = evt.target.id;

+			};

+			

+			itemBlurred = function(evt) {

+				dom.setAttrib(evt.target.id, 'tabindex', '-1');

+			};

+			

+			rootFocussed = function(evt) {

+				var item = dom.get(focussedId);

+				dom.setAttrib(item, 'tabindex', '0');

+				item.focus();

+			};

+			

+			t.focus = function() {

+				dom.get(focussedId).focus();

+			};

+

+			t.destroy = function() {

+				each(items, function(item) {

+					dom.unbind(dom.get(item.id), 'focus', itemFocussed);

+					dom.unbind(dom.get(item.id), 'blur', itemBlurred);

+				});

+

+				dom.unbind(dom.get(root), 'focus', rootFocussed);

+				dom.unbind(dom.get(root), 'keydown', rootKeydown);

+

+				items = dom = root = t.focus = itemFocussed = itemBlurred = rootKeydown = rootFocussed = null;

+				t.destroy = function() {};

+			};

+			

+			t.moveFocus = function(dir, evt) {

+				var idx = -1, controls = t.controls, newFocus;

+

+				if (!focussedId)

+					return;

+

+				each(items, function(item, index) {

+					if (item.id === focussedId) {

+						idx = index;

+						return false;

+					}

+				});

+

+				idx += dir;

+				if (idx < 0) {

+					idx = items.length - 1;

+				} else if (idx >= items.length) {

+					idx = 0;

+				}

+				

+				newFocus = items[idx];

+				dom.setAttrib(focussedId, 'tabindex', '-1');

+				dom.setAttrib(newFocus.id, 'tabindex', '0');

+				dom.get(newFocus.id).focus();

+

+				if (settings.actOnFocus) {

+					settings.onAction(newFocus.id);

+				}

+

+				if (evt)

+					Event.cancel(evt);

+			};

+			

+			rootKeydown = function(evt) {

+				var DOM_VK_LEFT = 37, DOM_VK_RIGHT = 39, DOM_VK_UP = 38, DOM_VK_DOWN = 40, DOM_VK_ESCAPE = 27, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_SPACE = 32;

+				

+				switch (evt.keyCode) {

+					case DOM_VK_LEFT:

+						if (enableLeftRight) t.moveFocus(-1);

+						break;

+	

+					case DOM_VK_RIGHT:

+						if (enableLeftRight) t.moveFocus(1);

+						break;

+	

+					case DOM_VK_UP:

+						if (enableUpDown) t.moveFocus(-1);

+						break;

+

+					case DOM_VK_DOWN:

+						if (enableUpDown) t.moveFocus(1);

+						break;

+

+					case DOM_VK_ESCAPE:

+						if (settings.onCancel) {

+							settings.onCancel();

+							Event.cancel(evt);

+						}

+						break;

+

+					case DOM_VK_ENTER:

+					case DOM_VK_RETURN:

+					case DOM_VK_SPACE:

+						if (settings.onAction) {

+							settings.onAction(focussedId);

+							Event.cancel(evt);

+						}

+						break;

+				}

+			};

+

+			// Set up state and listeners for each item.

+			each(items, function(item, idx) {

+				var tabindex;

+

+				if (!item.id) {

+					item.id = dom.uniqueId('_mce_item_');

+				}

+

+				if (excludeFromTabOrder) {

+					dom.bind(item.id, 'blur', itemBlurred);

+					tabindex = '-1';

+				} else {

+					tabindex = (idx === 0 ? '0' : '-1');

+				}

+

+				dom.setAttrib(item.id, 'tabindex', tabindex);

+				dom.bind(dom.get(item.id), 'focus', itemFocussed);

+			});

+			

+			// Setup initial state for root element.

+			if (items[0]){

+				focussedId = items[0].id;

+			}

+

+			dom.setAttrib(root, 'tabindex', '-1');

+			

+			// Setup listeners for root element.

+			dom.bind(dom.get(root), 'focus', rootFocussed);

+			dom.bind(dom.get(root), 'keydown', rootKeydown);

+		}

+	});

+})(tinymce);

+(function(tinymce) {

 	// Shorten class names

 	var DOM = tinymce.DOM, is = tinymce.is;

 

 	tinymce.create('tinymce.ui.Control', {

-		Control : function(id, s) {

+		Control : function(id, s, editor) {

 			this.id = id;

 			this.settings = s = s || {};

 			this.rendered = false;

@@ -7268,22 +8541,23 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			this.scope = s.scope || this;

 			this.disabled = 0;

 			this.active = 0;

+			this.editor = editor;

+		},

+		

+		setAriaProperty : function(property, value) {

+			var element = DOM.get(this.id + '_aria') || DOM.get(this.id);

+			if (element) {

+				DOM.setAttrib(element, 'aria-' + property, !!value);

+			}

+		},

+		

+		focus : function() {

+			DOM.get(this.id).focus();

 		},

 

 		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.setAriaProperty('disabled', s);

 

 				this.setState('Disabled', s);

 				this.setState('Enabled', !s);

@@ -7299,6 +8573,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			if (s != this.active) {

 				this.setState('Active', s);

 				this.active = s;

+				this.setAriaProperty('pressed', s);

 			}

 		},

 

@@ -7356,8 +8631,8 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 	});

 })(tinymce);

 tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {

-	Container : function(id, s) {

-		this.parent(id, s);

+	Container : function(id, s, editor) {

+		this.parent(id, s, editor);

 

 		this.controls = [];

 

@@ -7381,10 +8656,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	Separator : function(id, s) {

 		this.parent(id, s);

 		this.classPrefix = 'mceSeparator';

+		this.setDisabled(true);

 	},

 

 	renderHTML : function() {

-		return tinymce.DOM.createHTML('span', {'class' : this.classPrefix});

+		return tinymce.DOM.createHTML('span', {'class' : this.classPrefix, role : 'separator', 'aria-orientation' : 'vertical', tabindex : '-1'});

 	}

 });

 

@@ -7399,6 +8675,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 

 		setSelected : function(s) {

 			this.setState('Selected', s);

+			this.setAriaProperty('checked', !!s);

 			this.selected = s;

 		},

 

@@ -7546,12 +8823,20 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			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;

+			s.keyboard_focus = cs.keyboard_focus;

 			m = new tinymce.ui.DropMenu(s.id || DOM.uniqueId(), s);

 

 			m.onAddItem.add(t.onAddItem.dispatch, t.onAddItem);

 

 			return m;

 		},

+		

+		focus : function() {

+			var t = this;

+			if (t.keyboardNav) {

+				t.keyboardNav.focus();

+			}

+		},

 

 		update : function() {

 			var t = this, s = t.settings, tb = DOM.get('menu_' + t.id + '_tbl'), co = DOM.get('menu_' + t.id + '_co'), tw, th;

@@ -7675,13 +8960,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 					}

 				});

 			}

+			

+			Event.add(co, 'keydown', t._keyHandler, t);

 

 			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;

+			if (s.keyboard_focus) { 

+				t._setupKeyboardNav(); 

 			}

 		},

 

@@ -7691,6 +8976,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			if (!t.isMenuVisible)

 				return;

 

+			if (t.keyboardNav) t.keyboardNav.destroy();

 			Event.remove(co, 'mouseover', t.mouseOverFunc);

 			Event.remove(co, 'click', t.mouseClickFunc);

 			Event.remove(co, 'keydown', t._keyHandler);

@@ -7735,8 +9021,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		destroy : function() {

 			var t = this, co = DOM.get('menu_' + t.id);

 

+			if (t.keyboardNav) t.keyboardNav.destroy();

 			Event.remove(co, 'mouseover', t.mouseOverFunc);

+			Event.remove(DOM.select('a', co), 'focus', t.mouseOverFunc);

 			Event.remove(co, 'click', t.mouseClickFunc);

+			Event.remove(co, 'keydown', t._keyHandler);

 

 			if (t.element)

 				t.element.remove();

@@ -7747,15 +9036,18 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		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'] : '')});

+			w = DOM.create('div', {role: 'listbox', id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000;outline:0'});

+			if (t.settings.parent) {

+				DOM.setAttrib(w, 'aria-parent', 'menu_' + t.settings.parent.id);

+			}

+			co = DOM.add(w, 'div', {role: 'presentation', 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});

+			n = DOM.add(co, 'table', {role: 'presentation', id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});

 			tb = DOM.add(n, 'tbody');

 

 			each(t.items, function(o) {

@@ -7768,33 +9060,36 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		},

 

 		// Internal functions

+		_setupKeyboardNav : function(){

+			var contextMenu, menuItems, t=this; 

+			contextMenu = DOM.select('#menu_' + t.id)[0];

+			menuItems = DOM.select('a[role=option]', 'menu_' + t.id);

+			menuItems.splice(0,0,contextMenu);

+			t.keyboardNav = new tinymce.ui.KeyboardNavigation({

+				root: 'menu_' + t.id,

+				items: menuItems,

+				onCancel: function() {

+					t.hideMenu();

+				},

+				enableUpDown: true

+			});

+			contextMenu.focus();

+		},

 

-		_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();

+		_keyHandler : function(evt) {

+			var t = this, e;

+			switch (evt.keyCode) {

+				case 37: // Left

+					if (t.settings.parent) {

+						t.hideMenu();

+						t.settings.parent.focus();

+						Event.cancel(evt);

+					}

+					break;

+				case 39: // Right

+					if (t.mouseOverFunc)

+						t.mouseOverFunc(evt);

+					break;

 			}

 		},

 

@@ -7812,8 +9107,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			}

 

 			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;'});

+			n = it = DOM.add(n, s.titleItem ? 'th' : 'td');

+			n = a = DOM.add(n, 'a', {id: o.id + '_aria',  role: s.titleItem ? 'presentation' : 'option', href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});

+

+			if (s.parent) {

+				DOM.setAttrib(a, 'aria-haspopup', 'true');

+				DOM.setAttrib(a, 'aria-owns', 'menu_' + o.id);

+			}

 

 			DOM.addClass(it, s['class']);

 //			n = DOM.add(n, 'span', {'class' : 'item'});

@@ -7848,8 +9148,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	var DOM = tinymce.DOM;

 

 	tinymce.create('tinymce.ui.Button:tinymce.ui.Control', {

-		Button : function(id, s) {

-			this.parent(id, s);

+		Button : function(id, s, ed) {

+			this.parent(id, s, ed);

 			this.classPrefix = 'mceButton';

 		},

 

@@ -7857,13 +9157,15 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			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) + '">';

+			h = '<a role="button" id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" aria-labelledby="' + this.id + '_voice" title="' + DOM.encode(s.title) + '">';

 

 			if (s.image)

-				h += '<img class="mceIcon" src="' + s.image + '" />' + l + '</a>';

+				h += '<img class="mceIcon" src="' + s.image + '" alt="' + DOM.encode(s.title) + '" />' + l;

 			else

-				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '') + '</a>';

+				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '');

 

+			h += '<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="' + this.id + '_voice">' + s.title + '</span>'; 

+			h += '</a>';

 			return h;

 		},

 

@@ -7882,10 +9184,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	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) {

+		ListBox : function(id, s, ed) {

 			var t = this;

 

-			t.parent(id, s);

+			t.parent(id, s, ed);

 

 			t.items = [];

 

@@ -7943,12 +9245,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 					t.selectedIndex = idx;

 					DOM.setHTML(e, DOM.encode(o.title));

 					DOM.removeClass(e, 'mceTitle');

+					DOM.setAttrib(t.id, 'aria-valuenow', o.title);

 				} else {

 					DOM.setHTML(e, DOM.encode(t.settings.title));

 					DOM.addClass(e, 'mceTitle');

 					t.selectedValue = t.selectedIndex = null;

+					DOM.setAttrib(t.id, 'aria-valuenow', t.settings.title);

 				}

-

 				e = 0;

 			}

 		},

@@ -7973,10 +9276,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		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>';

+			h = '<span role="button" aria-haspopup="true" aria-labelledby="' + t.id +'_text" aria-describedby="' + t.id + '_voiceDesc"><table role="presentation" tabindex="0" id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';

+			h += '<td>' + DOM.createHTML('span', {id: t.id + '_voiceDesc', 'class': 'voiceLabel', style:'display:none;'}, t.settings.title); 

+			h += DOM.createHTML('a', {id : t.id + '_text', tabindex : -1, 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 style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>') + '</td>';

+			h += '</tr></tbody></table></span>';

 

 			return h;

 		},

@@ -8026,6 +9330,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			var t = this;

 

 			if (t.menu && t.menu.isMenuVisible) {

+				DOM.removeClass(t.id, t.classPrefix + 'Selected');

+

 				// 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;

@@ -8048,7 +9354,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				max_height : 150

 			});

 

-			m.onHideMenu.add(t.hideMenu, t);

+			m.onHideMenu.add(function() {

+				t.hideMenu();

+				t.focus();

+			});

 

 			m.add({

 				title : t.settings.title,

@@ -8089,40 +9398,39 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			var t = this, cp = t.classPrefix;

 

 			Event.add(t.id, 'click', t.showMenu, t);

-			Event.add(t.id + '_text', 'focus', function(e) {

+			Event.add(t.id, 'keydown', function(evt) {

+				if (evt.keyCode == 32) { // Space

+					t.showMenu(evt);

+					Event.cancel(evt);

+				}

+			});

+			Event.add(t.id, 'focus', function() {

 				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) {

+					t.keyDownHandler = Event.add(t.id, 'keydown', function(e) {

+						if (e.keyCode == 40) {

+							t.showMenu();

+							Event.cancel(e);

+						}

+					});

+					t.keyPressHandler = Event.add(t.id, 'keypress', function(e) {

+						var v;

+						if (e.keyCode == 13) {

 							// Fake select on enter

 							v = t.selectedValue;

 							t.selectedValue = null; // Needs to be null to fake change

+							Event.cancel(e);

 							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;});

+			Event.add(t.id, 'blur', function() {

+				Event.remove(t.id, 'keydown', t.keyDownHandler);

+				Event.remove(t.id, 'keypress', t.keyPressHandler);

+				t._focused = 0;

+			});

 

 			// Old IE doesn't have hover on all elements

 			if (tinymce.isIE6 || !DOM.boxModel) {

@@ -8159,6 +9467,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 

 		setDisabled : function(s) {

 			DOM.get(this.id).disabled = s;

+			this.setAriaProperty('disabled', s);

 		},

 

 		isDisabled : function() {

@@ -8233,13 +9542,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				h += DOM.createHTML('option', {value : it.value}, it.title);

 			});

 

-			h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox'}, h);

-

+			h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox', 'aria-labelledby': t.id + '_aria'}, h);

+			h += DOM.createHTML('span', {id : t.id + '_aria', 'style': 'display: none'}, t.settings.title);

 			return h;

 		},

 

 		postRender : function() {

-			var t = this, ch;

+			var t = this, ch, changeListenerAdded = true;

 

 			t.rendered = true;

 

@@ -8261,8 +9570,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				var bf;

 

 				Event.remove(t.id, 'change', ch);

+				changeListenerAdded = false;

 

 				bf = Event.add(t.id, 'blur', function() {

+					if (changeListenerAdded) return;

+					changeListenerAdded = true;

 					Event.add(t.id, 'change', onChange);

 					Event.remove(t.id, 'blur', bf);

 				});

@@ -8281,8 +9593,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	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);

+		MenuButton : function(id, s, ed) {

+			this.parent(id, s, ed);

 

 			this.onRenderMenu = new tinymce.util.Dispatcher(this);

 

@@ -8329,7 +9641,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				icons : t.settings.icons

 			});

 

-			m.onHideMenu.add(t.hideMenu, t);

+			m.onHideMenu.add(function() {

+				t.hideMenu();

+				t.focus();

+			});

 

 			t.onRenderMenu.dispatch(t, m);

 			t.menu = m;

@@ -8371,8 +9686,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	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);

+		SplitButton : function(id, s, ed) {

+			this.parent(id, s, ed);

 			this.classPrefix = 'mceSplitButton';

 		},

 

@@ -8382,33 +9697,50 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			h = '<tbody><tr>';

 

 			if (s.image)

-				h1 = DOM.createHTML('img ', {src : s.image, 'class' : 'mceAction ' + s['class']});

+				h1 = DOM.createHTML('img ', {src : s.image, role: 'presentation', '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': 'mceVoiceLabel mceIconOnly', id: t.id + '_voice', style: 'display:none;'}, s.title);

+			h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_action', tabindex: '-1', 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>';

+			h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']}, '<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');

+			h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_open', tabindex: '-1', 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);

+			h = DOM.createHTML('table', {id : t.id, role: 'presentation', tabindex: '0',  'class' : 'mceSplitButton mceSplitButtonEnabled ' + s['class'], cellpadding : '0', cellspacing : '0', title : s.title}, h);

+			return DOM.createHTML('span', {role: 'button', 'aria-labelledby': t.id + '_voice', 'aria-haspopup': 'true'}, h);

 		},

 

 		postRender : function() {

-			var t = this, s = t.settings;

+			var t = this, s = t.settings, activate;

 

 			if (s.onclick) {

-				Event.add(t.id + '_action', 'click', function() {

-					if (!t.isDisabled())

+				activate = function(evt) {

+					if (!t.isDisabled()) {

 						s.onclick(t.value);

+						Event.cancel(evt);

+					}

+				};

+				Event.add(t.id + '_action', 'click', activate);

+				Event.add(t.id, ['click', 'keydown'], function(evt) {

+					var DOM_VK_SPACE = 32, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_UP = 38, DOM_VK_DOWN = 40;

+					if ((evt.keyCode === 32 || evt.keyCode === 13 || evt.keyCode === 14) && !evt.altKey && !evt.ctrlKey && !evt.metaKey) {

+						activate();

+						Event.cancel(evt);

+					} else if (evt.type === 'click' || evt.keyCode === DOM_VK_DOWN) {

+						t.showMenu();

+						Event.cancel(evt);

+					}

 				});

 			}

 

-			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;});

+			Event.add(t.id + '_open', 'click', function (evt) {

+				t.showMenu();

+				Event.cancel(evt);

+			});

+			Event.add([t.id, t.id + '_open'], 'focus', function() {t._focused = 1;});

+			Event.add([t.id, t.id + '_open'], 'blur', function() {t._focused = 0;});

 

 			// Old IE doesn't have hover on all elements

 			if (tinymce.isIE6 || !DOM.boxModel) {

@@ -8429,6 +9761,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 

 			Event.clear(this.id + '_action');

 			Event.clear(this.id + '_open');

+			Event.clear(this.id);

 		}

 	});

 })(tinymce);

@@ -8437,10 +9770,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	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) {

+		ColorSplitButton : function(id, s, ed) {

 			var t = this;

 

-			t.parent(id, s);

+			t.parent(id, s, ed);

 

 			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',

@@ -8498,30 +9831,30 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		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, '.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');

-			}

+			if (t.isMenuVisible) {

+				// 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;

 

-			t.onHideMenu.dispatch(t);

+				if (!e || !DOM.getParent(e.target, '.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.isMenuVisible = 0;

+				t.isMenuVisible = 0;

+			}

 		},

 

 		renderMenu : function() {

-			var t = this, m, i = 0, s = t.settings, n, tb, tr, w;

+			var t = this, m, i = 0, s = t.settings, n, tb, tr, w, context;

 

-			w = DOM.add(s.menu_container, 'div', {id : t.id + '_menu', 'class' : s['menu_class'] + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});

+			w = DOM.add(s.menu_container, 'div', {role: 'listbox', 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'});

+			n = DOM.add(m, 'table', {role: 'presentation', 'class' : 'mceColorSplitMenu'});

 			tb = DOM.add(n, 'tbody');

 

 			// Generate color grid

@@ -8535,20 +9868,32 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				}

 

 				n = DOM.add(tr, 'td');

-

 				n = DOM.add(n, 'a', {

+					role : 'option',

 					href : 'javascript:;',

 					style : {

 						backgroundColor : '#' + c

 					},

-					_mce_color : '#' + c

+					'title': t.editor.getLang('colors.' + c, c),

+					'data-mce-color' : '#' + c

 				});

+

+				if (t.editor.forcedHighContrastMode) {

+					n = DOM.add(n, 'canvas', { width: 16, height: 16, 'aria-hidden': 'true' });

+					if (n.getContext && (context = n.getContext("2d"))) {

+						context.fillStyle = '#' + c;

+						context.fillRect(0, 0, 16, 16);

+					} else {

+						// No point leaving a canvas element around if it's not supported for drawing on anyway.

+						DOM.remove(n);

+					}

+				}

 			});

 

 			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);

+				n = DOM.add(n, 'a', {role: 'option', 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);

@@ -8557,13 +9902,25 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			}

 

 			DOM.addClass(m, 'mceColorSplitMenu');

+			

+			new tinymce.ui.KeyboardNavigation({

+				root: t.id + '_menu',

+				items: DOM.select('a', t.id + '_menu'),

+				onCancel: function() {

+					t.hideMenu();

+					t.focus();

+				}

+			});

+

+			// Prevent IE from scrolling and hindering click to occur #4019

+			Event.add(t.id + '_menu', 'mousedown', function(e) {return Event.cancel(e);});

 

 			Event.add(t.id + '_menu', 'click', function(e) {

 				var c;

 

-				e = e.target;

+				e = DOM.getParent(e.target, 'a', tb);

 

-				if (e.nodeName == 'A' && (c = e.getAttribute('_mce_color')))

+				if (e && e.nodeName.toLowerCase() == 'a' && (c = e.getAttribute('data-mce-color')))

 					t.setColor(c);

 

 				return Event.cancel(e); // Prevent IE auto save warning

@@ -8573,13 +9930,17 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		},

 

 		setColor : function(c) {

+			this.displayColor(c);

+			this.hideMenu();

+			this.settings.onselect(c);

+		},

+		

+		displayColor : function(c) {

 			var t = this;

 

 			DOM.setStyle(t.id + '_preview', 'backgroundColor', c);

 

 			t.value = c;

-			t.hideMenu();

-			t.settings.onselect(c);

 		},

 

 		postRender : function() {

@@ -8600,9 +9961,67 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	});

 })(tinymce);

 

+(function(tinymce) {

+// Shorten class names

+var dom = tinymce.DOM, each = tinymce.each, Event = tinymce.dom.Event;

+tinymce.create('tinymce.ui.ToolbarGroup:tinymce.ui.Container', {

+	renderHTML : function() {

+		var t = this, h = [], controls = t.controls, each = tinymce.each, settings = t.settings;

+

+		h.push('<div id="' + t.id + '" role="group" aria-labelledby="' + t.id + '_voice">');

+		//TODO: ACC test this out - adding a role = application for getting the landmarks working well.

+		h.push("<span role='application'>");

+		h.push('<span id="' + t.id + '_voice" class="mceVoiceLabel" style="display:none;">' + dom.encode(settings.name) + '</span>');

+		each(controls, function(toolbar) {

+			h.push(toolbar.renderHTML());

+		});

+		h.push("</span>");

+		h.push('</div>');

+

+		return h.join('');

+	},

+	

+	focus : function() {

+		this.keyNav.focus();

+	},

+	

+	postRender : function() {

+		var t = this, items = [];

+

+		each(t.controls, function(toolbar) {

+			each (toolbar.controls, function(control) {

+				if (control.id) {

+					items.push(control);

+				}

+			});

+		});

+

+		t.keyNav = new tinymce.ui.KeyboardNavigation({

+			root: t.id,

+			items: items,

+			onCancel: function() {

+				t.editor.focus();

+			},

+			excludeFromTabOrder: !t.settings.tab_focus_toolbar

+		});

+	},

+	

+	destroy : function() {

+		var self = this;

+

+		self.parent();

+		self.keyNav.destroy();

+		Event.clear(self.id);

+	}

+});

+})(tinymce);

+

+(function(tinymce) {

+// Shorten class names

+var dom = tinymce.DOM, each = tinymce.each;

 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;

+		var t = this, h = '', c, co, s = t.settings, i, pr, nx, cl;

 

 		cl = t.controls;

 		for (i=0; i<cl.length; i++) {

@@ -8659,19 +10078,23 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 		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>');

+		return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || '', role: 'presentation', tabindex: '-1'}, '<tbody><tr>' + h + '</tr></tbody>');

 	}

 });

+})(tinymce);

 

 (function(tinymce) {

 	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each;

 

 	tinymce.create('tinymce.AddOnManager', {

-		items : [],

-		urls : {},

-		lookup : {},

+		AddOnManager : function() {

+			var self = this;

 

-		onAdd : new Dispatcher(this),

+			self.items = [];

+			self.urls = {};

+			self.lookup = {};

+			self.onAdd = new Dispatcher(self);

+		},

 

 		get : function(n) {

 			return this.lookup[n];

@@ -8680,7 +10103,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		requireLangPack : function(n) {

 			var s = tinymce.settings;

 

-			if (s && s.language)

+			if (s && s.language && s.language_load !== false)

 				tinymce.ScriptLoader.add(this.urls[n] + '/langs/' + s.language + '.js');

 		},

 

@@ -8699,10 +10122,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return;

 

 			if (u.indexOf('/') != 0 && u.indexOf('://') == -1)

-				u = tinymce.baseURL + '/' +  u;

+				u = tinymce.baseURL + '/' + u;

 

 			t.urls[n] = u.substring(0, u.lastIndexOf('/'));

-			tinymce.ScriptLoader.add(u, cb, s);

+

+			if (!t.lookup[n])

+				tinymce.ScriptLoader.add(u, cb, s);

 		}

 	});

 

@@ -9159,7 +10584,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				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,-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|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|tabindex|accesskey],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,

@@ -9169,7 +10593,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				keep_styles : 1,

 				fix_table_elements : 1,

 				inline_styles : 1,

-				convert_fonts_to_spans : true

+				convert_fonts_to_spans : true,

+				indent : 'simple',

+				indent_before : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr',

+				indent_after : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr',

+				validate : true,

+				entity_encoding : 'named',

+				url_converter : t.convertURL,

+				url_converter_scope : t,

+				ie7_compat : true

 			}, s);

 

 			t.documentBaseURI = new tinymce.util.URI(s.document_base_url || tinymce.documentBaseURL, {

@@ -9178,6 +10610,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			t.baseURI = tinymce.baseURI;

 

+			t.contentCSS = [];

+

 			// Call setup

 			t.execCallback('setup', t);

 		},

@@ -9267,7 +10701,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			// Load scripts

 			function loadScripts() {

-				if (s.language)

+				if (s.language && s.language_load !== false)

 					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');

 

 				if (s.theme && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])

@@ -9294,10 +10728,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		},

 

 		init : function() {

-			var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re;

+			var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re, i;

 

 			tinymce.add(t);

 

+			s.aria_label = s.aria_label || DOM.getAttrib(e, 'aria-label', t.getLang('aria.rich_text_area'));

+

 			if (s.theme) {

 				s.theme = s.theme.replace(/-/, '');

 				o = ThemeManager.get(s.theme);

@@ -9335,12 +10771,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.controlManager = new tinymce.ControlManager(t);

 

 			if (s.custom_undo_redo) {

-				// Add initial undo level

 				t.onBeforeExecCommand.add(function(ed, cmd, ui, val, a) {

-					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo)) {

-						if (!t.undoManager.hasUndo())

-							t.undoManager.add();

-					}

+					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo))

+						t.undoManager.beforeChange();

 				});

 

 				t.onExecCommand.add(function(ed, cmd, ui, val, a) {

@@ -9406,6 +10839,13 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				height : h

 			});

 

+			// Load specified content CSS last

+			if (s.content_css) {

+				tinymce.each(explode(s.content_css), function(u) {

+					t.contentCSS.push(t.documentBaseURI.toAbsolute(u));

+				});

+			}

+

 			h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');

 			if (h < 100)

 				h = 100;

@@ -9417,10 +10857,21 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (s.document_base_url != tinymce.documentBaseURL)

 				t.iframeHTML += '<base href="' + t.documentBaseURI.getURI() + '" />';

 

-			t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=7" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';

+			// IE8 doesn't support carets behind images setting ie7_compat would force IE8+ to run in IE7 compat mode.

+			if (s.ie7_compat)

+				t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=7" />';

+			else

+				t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=edge" />';

+

+			t.iframeHTML += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';

+

+			// Firefox 2 doesn't load stylesheets correctly this way

+			if (!isGecko || !/Firefox\/2/.test(navigator.userAgent)) {

+				for (i = 0; i < t.contentCSS.length; i++)

+					t.iframeHTML += '<link type="text/css" rel="stylesheet" href="' + t.contentCSS[i] + '" />';

 

-			if (tinymce.relaxedDomain)

-				t.iframeHTML += '<script type="text/javascript">document.domain = "' + tinymce.relaxedDomain + '";</script>';

+				t.contentCSS = [];

+			}

 

 			bi = s.body_id || 'tinymce';

 			if (bi.indexOf('=') != -1) {

@@ -9437,19 +10888,18 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '"></body></html>';

 

 			// Domain relaxing enabled, then set document domain

-			if (tinymce.relaxedDomain) {

+			if (tinymce.relaxedDomain && (isIE || (tinymce.isOpera && parseFloat(opera.version()) < 11))) {

 				// We need to write the contents here in IE since multiple writes messes up refresh button and back button

-				if (isIE || (tinymce.isOpera && parseFloat(opera.version()) >= 9.5))

-					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();})()';					

+				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();})()';				

 			}

 

 			// Create iframe

-			n = DOM.add(o.iframeContainer, 'iframe', {

+			// TODO: ACC add the appropriate description on this.

+			n = DOM.add(o.iframeContainer, 'iframe', { 

 				id : t.id + "_ifr",

 				src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7

-				frameBorder : '0',

+				frameBorder : '0', 

+				title : s.aria_label,

 				style : {

 					width : '100%',

 					height : h

@@ -9459,8 +10909,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.contentAreaContainer = o.iframeContainer;

 			DOM.get(o.editorContainer).style.display = t.orgDisplay;

 			DOM.get(t.id).style.display = 'none';

+			DOM.setAttrib(t.id, 'aria-hidden', true);

 

-			if (!isIE || !tinymce.relaxedDomain)

+			if (!tinymce.relaxedDomain || !u)

 				t.setupIframe();

 

 			e = n = o = null; // Cleanup

@@ -9474,6 +10925,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				d.open();

 				d.write(t.iframeHTML);

 				d.close();

+

+				if (tinymce.relaxedDomain)

+					d.domain = tinymce.relaxedDomain;

 			}

 

 			// Design mode needs to be added here Ctrl+A will fail otherwise

@@ -9499,6 +10953,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				DOM.show(b);

 			}

 

+			t.schema = new tinymce.html.Schema(s);

+

 			t.dom = new tinymce.dom.DOMUtils(t.getDoc(), {

 				keep_values : true,

 				url_converter : t.convertURL,

@@ -9507,16 +10963,77 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				class_filter : s.class_filter,

 				update_styles : 1,

 				fix_ie_paragraphs : 1,

-				valid_styles : s.valid_styles

+				schema : t.schema

 			});

 

-			t.schema = new tinymce.dom.Schema();

+			t.parser = new tinymce.html.DomParser(s, t.schema);

 

-			t.serializer = new tinymce.dom.Serializer(extend(s, {

-				valid_elements : s.verify_html === false ? '*[*]' : s.valid_elements,

-				dom : t.dom,

-				schema : t.schema

-			}));

+			// Force anchor names closed

+			t.parser.addAttributeFilter('name', function(nodes, name) {

+				var i = nodes.length, sibling, prevSibling, parent, node;

+

+				while (i--) {

+					node = nodes[i];

+					if (node.name === 'a' && node.firstChild) {

+						parent = node.parent;

+

+						// Move children after current node

+						sibling = node.lastChild;

+						do {

+							prevSibling = sibling.prev;

+							parent.insert(sibling, node);

+							sibling = prevSibling;

+						} while (sibling);

+					}

+				}

+			});

+

+			// Convert src and href into data-mce-src, data-mce-href and data-mce-style

+			t.parser.addAttributeFilter('src,href,style', function(nodes, name) {

+				var i = nodes.length, node, dom = t.dom, value;

+

+				while (i--) {

+					node = nodes[i];

+					value = node.attr(name);

+

+					if (name === "style")

+						node.attr('data-mce-style', dom.serializeStyle(dom.parseStyle(value), node.name));

+					else

+						node.attr('data-mce-' + name, t.convertURL(value, name, node.name));

+				}

+			});

+

+			// Keep scripts from executing

+			t.parser.addNodeFilter('script', function(nodes, name) {

+				var i = nodes.length;

+

+				while (i--)

+					nodes[i].attr('type', 'mce-text/javascript');

+			});

+

+			t.parser.addNodeFilter('#cdata', function(nodes, name) {

+				var i = nodes.length, node;

+

+				while (i--) {

+					node = nodes[i];

+					node.type = 8;

+					node.name = '#comment';

+					node.value = '[CDATA[' + node.value + ']]';

+				}

+			});

+

+			t.parser.addNodeFilter('p,h1,h2,h3,h4,h5,h6,div', function(nodes, name) {

+				var i = nodes.length, node, nonEmptyElements = t.schema.getNonEmptyElements();

+

+				while (i--) {

+					node = nodes[i];

+

+					if (node.isEmpty(nonEmptyElements))

+						node.empty().append(new tinymce.html.Node('br', 1)).shortEnded = true;

+				}

+			});

+

+			t.serializer = new tinymce.dom.Serializer(s, t.dom, t.schema);

 

 			t.selection = new tinymce.dom.Selection(t.dom, t.getWin(), t.serializer);

 

@@ -9526,18 +11043,18 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.formatter.register({

 				alignleft : [

 					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}},

-					{selector : 'img,table', styles : {'float' : 'left'}}

+					{selector : 'img,table', collapsed : false, styles : {'float' : 'left'}}

 				],

 

 				aligncenter : [

 					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}},

-					{selector : 'img', styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}},

-					{selector : 'table', styles : {marginLeft : 'auto', marginRight : 'auto'}}

+					{selector : 'img', collapsed : false, styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}},

+					{selector : 'table', collapsed : false, styles : {marginLeft : 'auto', marginRight : 'auto'}}

 				],

 

 				alignright : [

 					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}},

-					{selector : 'img,table', styles : {'float' : 'right'}}

+					{selector : 'img,table', collapsed : false, styles : {'float' : 'right'}}

 				],

 

 				alignfull : [

@@ -9545,33 +11062,35 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				],

 

 				bold : [

-					{inline : 'strong'},

+					{inline : 'strong', remove : 'all'},

 					{inline : 'span', styles : {fontWeight : 'bold'}},

-					{inline : 'b'}

+					{inline : 'b', remove : 'all'}

 				],

 

 				italic : [

-					{inline : 'em'},

+					{inline : 'em', remove : 'all'},

 					{inline : 'span', styles : {fontStyle : 'italic'}},

-					{inline : 'i'}

+					{inline : 'i', remove : 'all'}

 				],

 

 				underline : [

 					{inline : 'span', styles : {textDecoration : 'underline'}, exact : true},

-					{inline : 'u'}

+					{inline : 'u', remove : 'all'}

 				],

 

 				strikethrough : [

 					{inline : 'span', styles : {textDecoration : 'line-through'}, exact : true},

-					{inline : 'u'}

+					{inline : 'strike', remove : 'all'}

 				],

 

-				forecolor : {inline : 'span', styles : {color : '%value'}},

-				hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}},

+				forecolor : {inline : 'span', styles : {color : '%value'}, wrap_links : false},

+				hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}, wrap_links : false},

 				fontname : {inline : 'span', styles : {fontFamily : '%value'}},

 				fontsize : {inline : 'span', styles : {fontSize : '%value'}},

 				fontsize_class : {inline : 'span', attributes : {'class' : '%value'}},

 				blockquote : {block : 'blockquote', wrapper : 1, remove : 'all'},

+				subscript : {inline : 'sub'},

+				superscript : {inline : 'sup'},

 

 				removeformat : [

 					{selector : 'b,strong,em,i,font,u,strike', remove : 'all', split : true, expand : false, block_expand : true, deep : true},

@@ -9592,7 +11111,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			// Pass through

 			t.undoManager.onAdd.add(function(um, l) {

-				if (!l.initial)

+				if (um.hasUndo())

 					return t.onChange.dispatch(t, l, um);

 			});

 

@@ -9636,29 +11155,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (s.nowrap)

 				t.getBody().style.whiteSpace = "nowrap";

 

-			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());

@@ -9680,16 +11176,22 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				});

 			}

 

-			if (s.convert_newlines_to_brs) {

+			if (s.protect) {

 				t.onBeforeSetContent.add(function(ed, o) {

-					if (o.initial)

-						o.content = o.content.replace(/\r?\n/g, '<br />');

+					if (s.protect) {

+						each(s.protect, function(pattern) {

+							o.content = o.content.replace(pattern, function(str) {

+								return '<!--mce:protected ' + escape(str) + '-->';

+							});

+						});

+					}

 				});

 			}

 

-			if (s.fix_nesting && isIE) {

+			if (s.convert_newlines_to_brs) {

 				t.onBeforeSetContent.add(function(ed, o) {

-					o.content = t._fixNesting(o.content);

+					if (o.initial)

+						o.content = o.content.replace(/\r?\n/g, '<br />');

 				});

 			}

 

@@ -9786,7 +11288,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						var pn = n.parentNode;

 

 						if (ed.dom.isBlock(pn) && pn.lastChild === n)

-							ed.dom.add(pn, 'br', {'_mce_bogus' : 1});

+							ed.dom.add(pn, 'br', {'data-mce-bogus' : 1});

 					});

 				};

 

@@ -9815,8 +11317,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				if (t.removed)

 					return;

 

-				t.load({initial : true, format : (s.cleanup_on_startup ? 'html' : 'raw')});

+				t.load({initial : true, format : 'html'});

 				t.startContent = t.getContent({format : 'raw'});

+				t.undoManager.add();

 				t.initialized = true;

 

 				t.onInit.dispatch(t);

@@ -9826,11 +11329,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				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));

-					});

-				}

+				each(t.contentCSS, function(u) {

+					t.dom.loadCSS(u);

+				});

 

 				// Handle auto focus

 				if (s.auto_focus) {

@@ -9946,7 +11447,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		},

 

 		nodeChanged : function(o) {

-			var t = this, s = t.selection, n = (isIE ? s.getNode() : s.getStart()) || t.getBody();

+			var t = this, s = t.selection, n = s.getStart() || t.getBody();

 

 			// Fix for bug #1896577 it seems that this can not be fired while the editor is loading

 			if (t.initialized) {

@@ -9979,16 +11480,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.buttons[n] = s;

 		},

 

-		addCommand : function(n, f, s) {

-			this.execCommands[n] = {func : f, scope : s || this};

+		addCommand : function(name, callback, scope) {

+			this.execCommands[name] = {func : callback, scope : scope || this};

 		},

 

-		addQueryStateHandler : function(n, f, s) {

-			this.queryStateCommands[n] = {func : f, scope : s || this};

+		addQueryStateHandler : function(name, callback, scope) {

+			this.queryStateCommands[name] = {func : callback, scope : scope || this};

 		},

 

-		addQueryValueHandler : function(n, f, s) {

-			this.queryValueCommands[n] = {func : f, scope : s || this};

+		addQueryValueHandler : function(name, callback, scope) {

+			this.queryValueCommands[name] = {func : callback, scope : scope || this};

 		},

 

 		addShortcut : function(pa, desc, cmd_func, sc) {

@@ -10091,12 +11592,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return true;

 			}

 

-			// Execute global commands

-			if (tinymce.GlobalCommands.execCommand(t, 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);

@@ -10228,7 +11723,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			// Add undo level will trigger onchange event

 			if (!o.no_events) {

-				t.undoManager.typing = 0;

+				t.undoManager.typing = false;

 				t.undoManager.add();

 			}

 

@@ -10260,66 +11755,77 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			return h;

 		},

 

-		setContent : function(h, o) {

-			var t = this;

+		setContent : function(content, args) {

+			var self = this, rootNode, body = self.getBody();

 

-			o = o || {};

-			o.format = o.format || 'html';

-			o.set = true;

-			o.content = h;

+			// Setup args object

+			args = args || {};

+			args.format = args.format || 'html';

+			args.set = true;

+			args.content = content;

 

-			if (!o.no_events)

-				t.onBeforeSetContent.dispatch(t, o);

+			// Do preprocessing

+			if (!args.no_events)

+				self.onBeforeSetContent.dispatch(self, args);

+

+			content = args.content;

 

 			// 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';

+			if (!tinymce.isIE && (content.length === 0 || /^\s+$/.test(content))) {

+				body.innerHTML = '<br data-mce-bogus="1" />';

+				return;

 			}

 

-			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));

+			// Parse and serialize the html

+			if (args.format !== 'raw') {

+				content = new tinymce.html.Serializer({}, self.schema).serialize(

+					self.parser.parse(content)

+				);

 			}

 

-			if (!o.no_events)

-				t.onSetContent.dispatch(t, o);

+			// Set the new cleaned contents to the editor

+			args.content = tinymce.trim(content);

+			self.dom.setHTML(body, args.content);

 

-			return o.content;

+			// Do post processing

+			if (!args.no_events)

+				self.onSetContent.dispatch(self, args);

+

+			return args.content;

 		},

 

-		getContent : function(o) {

-			var t = this, h;

+		getContent : function(args) {

+			var self = this, content;

 

-			o = o || {};

-			o.format = o.format || 'html';

-			o.get = true;

+			// Setup args object

+			args = args || {};

+			args.format = args.format || 'html';

+			args.get = true;

 

-			if (!o.no_events)

-				t.onBeforeGetContent.dispatch(t, o);

+			// Do preprocessing

+			if (!args.no_events)

+				self.onBeforeGetContent.dispatch(self, args);

 

-			if (o.format != 'raw' && t.settings.cleanup) {

-				o.getInner = true;

-				h = t.serializer.serialize(t.getBody(), o);

-			} else

-				h = t.getBody().innerHTML;

+			// Get raw contents or by default the cleaned contents

+			if (args.format == 'raw')

+				content = self.getBody().innerHTML;

+			else

+				content = self.serializer.serialize(self.getBody(), args);

 

-			h = h.replace(/^\s*|\s*$/g, '');

-			o.content = h;

+			args.content = tinymce.trim(content);

 

-			if (!o.no_events)

-				t.onGetContent.dispatch(t, o);

+			// Do post processing

+			if (!args.no_events)

+				self.onGetContent.dispatch(self, args);

 

-			return o.content;

+			return args.content;

 		},

 

 		isDirty : function() {

-			var t = this;

+			var self = this;

 

-			return tinymce.trim(t.startContent) != tinymce.trim(t.getContent({format : 'raw', no_events : 1})) && !t.isNotDirty;

+			return tinymce.trim(self.startContent) != tinymce.trim(self.getContent({format : 'raw', no_events : 1})) && !self.isNotDirty;

 		},

 

 		getContainer : function() {

@@ -10497,7 +12003,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 		_addEvents : function() {

 			// 'focus', 'blur', 'dblclick', 'beforedeactivate', submit, reset

-			var t = this, i, s = t.settings, lo = {

+			var t = this, i, s = t.settings, dom = t.dom, lo = {

 				mouseup : 'onMouseUp',

 				mousedown : 'onMouseDown',

 				click : 'onClick',

@@ -10529,35 +12035,26 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			each(lo, function(v, k) {

 				switch (k) {

 					case 'contextmenu':

-						if (tinymce.isOpera) {

-							// Fake contextmenu on Opera

-							t.dom.bind(t.getBody(), 'mousedown', function(e) {

-								if (e.ctrlKey) {

-									e.fakeType = 'contextmenu';

-									eventHandler(e);

-								}

-							});

-						} else

-							t.dom.bind(t.getBody(), k, eventHandler);

+						dom.bind(t.getDoc(), k, eventHandler);

 						break;

 

 					case 'paste':

-						t.dom.bind(t.getBody(), k, function(e) {

+						dom.bind(t.getBody(), k, function(e) {

 							eventHandler(e);

 						});

 						break;

 

 					case 'submit':

 					case 'reset':

-						t.dom.bind(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);

+						dom.bind(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);

 						break;

 

 					default:

-						t.dom.bind(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);

+						dom.bind(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);

 				}

 			});

 

-			t.dom.bind(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {

+			dom.bind(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {

 				t.focus(true);

 			});

 

@@ -10565,22 +12062,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// 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);

-					})

-				});*/

-

-				t.dom.bind(t.getDoc(), 'DOMNodeInserted', function(e) {

+				dom.bind(t.getDoc(), 'DOMNodeInserted', function(e) {

 					var v;

 

 					e = e.target;

 

-					if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('_mce_src')))

+					if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('data-mce-src')))

 						e.src = t.documentBaseURI.toAbsolute(v);

 				});

 			}

@@ -10629,14 +12116,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					e = e.target;

 

 					// Needs tobe the setBaseAndExtend or it will fail to select floated images

-					if (e.nodeName == 'IMG' || (e.nodeName == 'A' && t.dom.hasClass(e, 'mceItemAnchor')))

+					if (e.nodeName == 'IMG' || (e.nodeName == 'A' && dom.hasClass(e, 'mceItemAnchor'))) {

 						t.selection.getSel().setBaseAndExtent(e, 0, e, 1);

+						t.nodeChanged();

+					}

 				});

 			}

 

 			// Add node change handlers

 			t.onMouseUp.add(t.nodeChanged);

-			t.onClick.add(t.nodeChanged);

+			//t.onClick.add(t.nodeChanged);

 			t.onKeyUp.add(function(ed, e) {

 				var c = e.keyCode;

 

@@ -10723,7 +12212,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			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

-				t.dom.bind(t.getDoc(), 'controlselect', function(e) {

+				dom.bind(t.getDoc(), 'controlselect', function(e) {

 					var re = t.resizeInfo, cb;

 

 					e = e.target;

@@ -10733,28 +12222,28 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						return;

 

 					if (re)

-						t.dom.unbind(re.node, re.ev, re.cb);

+						dom.unbind(re.node, re.ev, re.cb);

 

-					if (!t.dom.hasClass(e, 'mceItemNoResize')) {

+					if (!dom.hasClass(e, 'mceItemNoResize')) {

 						ev = 'resizeend';

-						cb = t.dom.bind(e, ev, function(e) {

+						cb = dom.bind(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 = dom.getStyle(e, 'width')) {

+								dom.setAttrib(e, 'width', v.replace(/[^0-9%]+/g, ''));

+								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', '');

+							if (v = dom.getStyle(e, 'height')) {

+								dom.setAttrib(e, 'height', v.replace(/[^0-9%]+/g, ''));

+								dom.setStyle(e, 'height', '');

 							}

 						});

 					} else {

 						ev = 'resizestart';

-						cb = t.dom.bind(e, 'resizestart', Event.cancel, Event);

+						cb = dom.bind(e, 'resizestart', Event.cancel, Event);

 					}

 

 					re = t.resizeInfo = {

@@ -10765,25 +12254,19 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				});

 

 				t.onKeyDown.add(function(ed, e) {

+					var sel;

+

 					switch (e.keyCode) {

 						case 8:

+							sel = t.getDoc().selection;

+

 							// Fix IE control + backspace browser bug

-							if (t.selection.getRng().item) {

-								ed.dom.remove(t.selection.getRng().item(0));

+							if (sel.createRange && sel.createRange().item) {

+								ed.dom.remove(sel.createRange().item(0));

 								return Event.cancel(e);

 							}

 					}

 				});

-

-				/*if (t.dom.boxModel) {

-					t.getBody().style.height = '100%';

-

-					Event.add(t.getWin(), 'resize', function(e) {

-						var docElm = t.getDoc().documentElement;

-

-						docElm.style.height = (docElm.offsetHeight - 10) + 'px';

-					});

-				}*/

 			}

 

 			if (tinymce.isOpera) {

@@ -10795,32 +12278,105 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// Add custom undo/redo handlers

 			if (s.custom_undo_redo) {

 				function addUndo() {

-					t.undoManager.typing = 0;

+					t.undoManager.typing = false;

 					t.undoManager.add();

 				};

 

-				t.dom.bind(t.getDoc(), 'focusout', function(e) {

+				dom.bind(t.getDoc(), 'focusout', function(e) {

 					if (!t.removed && t.undoManager.typing)

 						addUndo();

 				});

 

+				// Add undo level when contents is drag/dropped within the editor

+				t.dom.bind(t.dom.getRoot(), 'dragend', function(e) {

+					addUndo();

+				});

+

 				t.onKeyUp.add(function(ed, e) {

+					var rng, parent, bookmark;

+

+					// Fix for bug #3168, to remove odd ".." nodes from the DOM we need to get/set the HTML of the parent node.

+					if (isIE && e.keyCode == 8) {

+						rng = t.selection.getRng();

+						if (rng.parentElement) {

+							parent = rng.parentElement();

+							bookmark = t.selection.getBookmark();

+							parent.innerHTML = parent.innerHTML;

+							t.selection.moveToBookmark(bookmark);

+						}

+					}

+

 					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45 || e.ctrlKey)

 						addUndo();

 				});

 

 				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) {

+					var rng, parent, bookmark, keyCode = e.keyCode;

+

+					// IE has a really odd bug where the DOM might include an node that doesn't have

+					// a proper structure. If you try to access nodeValue it would throw an illegal value exception.

+					// This seems to only happen when you delete contents and it seems to be avoidable if you refresh the element

+					// after you delete contents from it. See: #3008923

+					if (isIE && keyCode == 46) {

+						rng = t.selection.getRng();

+

+						if (rng.parentElement) {

+							parent = rng.parentElement();

+

+							if (!t.undoManager.typing) {

+								t.undoManager.beforeChange();

+								t.undoManager.typing = true;

+								t.undoManager.add();

+							}

+

+							// Select next word when ctrl key is used in combo with delete

+							if (e.ctrlKey) {

+								rng.moveEnd('word', 1);

+								rng.select();

+							}

+

+							// Delete contents

+							t.selection.getSel().clear();

+

+							// Check if we are within the same parent

+							if (rng.parentElement() == parent) {

+								bookmark = t.selection.getBookmark();

+

+								try {

+									// Update the HTML and hopefully it will remove the artifacts

+									parent.innerHTML = parent.innerHTML;

+								} catch (ex) {

+									// And since it's IE it can sometimes produce an unknown runtime error

+								}

+

+								// Restore the caret position

+								t.selection.moveToBookmark(bookmark);

+							}

+

+							// Block the default delete behavior since it might be broken

+							e.preventDefault();

+							return;

+						}

+					}

+

+					// Is caracter positon keys left,right,up,down,home,end,pgdown,pgup,enter

+					if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 13 || keyCode == 45) {

+						// Add position before enter key is pressed, used by IE since it still uses the default browser behavior

+						// Todo: Remove this once we normalize enter behavior on IE

+						if (tinymce.isIE && keyCode == 13)

+							t.undoManager.beforeChange();

+

 						if (t.undoManager.typing)

 							addUndo();

 

 						return;

 					}

 

-					if (!t.undoManager.typing) {

+					// If key isn't shift,ctrl,alt,capslock,metakey

+					if ((keyCode < 16 || keyCode > 20) && keyCode != 224 && keyCode != 91 && !t.undoManager.typing) {

+						t.undoManager.beforeChange();

 						t.undoManager.add();

-						t.undoManager.typing = 1;

+						t.undoManager.typing = true;

 					}

 				});

 

@@ -10829,68 +12385,64 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						addUndo();

 				});

 			}

-		},

+			

+			// Bug fix for FireFox keeping styles from end of selection instead of start.

+			if (tinymce.isGecko) {

+				function getAttributeApplyFunction() {

+					var template = t.dom.getAttribs(t.selection.getStart().cloneNode(false));

+

+					return function() {

+						var target = t.selection.getStart();

+						t.dom.removeAllAttribs(target);

+						each(template, function(attr) {

+							target.setAttributeNode(attr.cloneNode(true));

+						});

+					};

+				}

 

-		_isHidden : function() {

-			var s;

+				function isSelectionAcrossElements() {

+					var s = t.selection;

 

-			if (!isGecko)

-				return 0;

-

-			// Weird, wheres that cursor selection?

-			s = this.selection.getSel();

-			return (!s || !s.rangeCount || s.rangeCount == 0);

-		},

+					return !s.isCollapsed() && s.getStart() != s.getEnd();

+				}

 

-		// Fix for bug #1867292

-		_fixNesting : function(s) {

-			var d = [], i;

+				t.onKeyPress.add(function(ed, e) {

+					var applyAttributes;

 

-			s = s.replace(/<(\/)?([^\s>]+)[^>]*?>/g, function(a, b, c) {

-				var e;

+					if ((e.keyCode == 8 || e.keyCode == 46) && isSelectionAcrossElements()) {

+						applyAttributes = getAttributeApplyFunction();

+						t.getDoc().execCommand('delete', false, null);

+						applyAttributes();

 

-				// Handle end element

-				if (b === '/') {

-					if (!d.length)

-						return '';

+						return Event.cancel(e);

+					}

+				});

 

-					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;

-							}

-						}

+				t.dom.bind(t.getDoc(), 'cut', function(e) {

+					var applyAttributes;

 

-						return '';

-					} else {

-						d.pop();

+					if (isSelectionAcrossElements()) {

+						applyAttributes = getAttributeApplyFunction();

+						t.onKeyUp.addToTop(Event.cancel, Event);

 

-						if (d.length && d[d.length - 1].close) {

-							a = a + '</' + d[d.length - 1].tag + '>';

-							d.pop();

-						}

+						setTimeout(function() {

+							applyAttributes();

+							t.onKeyUp.remove(Event.cancel, Event);

+						}, 0);

 					}

-				} 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;

-			});

+		_isHidden : function() {

+			var s;

 

-			// End all open tags

-			for (i=d.length - 1; i>=0; i--)

-				s += '</' + d[i].tag + '>';

+			if (!isGecko)

+				return 0;

 

-			return s;

+			// Weird, wheres that cursor selection?

+			s = this.selection.getSel();

+			return (!s || !s.rangeCount || s.rangeCount == 0);

 		}

 	});

 })(tinymce);

@@ -11037,6 +12589,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				});

 

 				toggleFormat('align' + align);

+				execCommand('mceRepaint');

 			},

 

 			// Override list commands to fix WebKit bug

@@ -11062,7 +12615,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},

 

 			// Override commands to use the text formatter engine

-			'Bold,Italic,Underline,Strikethrough' : function(command) {

+			'Bold,Italic,Underline,Strikethrough,Superscript,Subscript' : function(command) {

 				toggleFormat(command);

 			},

 

@@ -11097,13 +12650,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},

 

 			FormatBlock : function(command, ui, value) {

-				return toggleFormat(value);

+				return toggleFormat(value || 'p');

 			},

 

 			mceCleanup : function() {

-				storeSelection();

+				var bookmark = selection.getBookmark();

+

 				editor.setContent(editor.getContent({cleanup : TRUE}), {cleanup : TRUE});

-				restoreSelection();

+

+				selection.moveToBookmark(bookmark);

 			},

 

 			mceRemoveNode : function(command, ui, value) {

@@ -11133,12 +12688,120 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},

 

 			mceInsertContent : function(command, ui, value) {

-				selection.setContent(value);

+				var caretNode, rng, rootNode, parent, node, rng, nodeRect, viewPortRect, args;

+

+				function findSuitableCaretNode(node, root_node, next) {

+					var walker = new tinymce.dom.TreeWalker(next ? node.nextSibling : node.previousSibling, root_node);

+

+					while ((node = walker.current())) {

+						if ((node.nodeType == 3 && tinymce.trim(node.nodeValue).length) || node.nodeName == 'BR' || node.nodeName == 'IMG')

+							return node;

+

+						if (next)

+							walker.next();

+						else

+							walker.prev();

+					}

+				};

+

+				args = {content: value, format: 'html'};

+				selection.onBeforeSetContent.dispatch(selection, args);

+				value = args.content;

+

+				// Add caret at end of contents if it's missing

+				if (value.indexOf('{$caret}') == -1)

+					value += '{$caret}';

+

+				// Set the content at selection to a span and replace it's contents with the value

+				selection.setContent('<span id="__mce">\uFEFF</span>', {no_events : false});

+				dom.setOuterHTML('__mce', value.replace(/\{\$caret\}/, '<span data-mce-type="bookmark" id="__mce">\uFEFF</span>'));

+

+				caretNode = dom.select('#__mce')[0];

+				rootNode = dom.getRoot();

+

+				// Move the caret into the last suitable location within the previous sibling if it's a block since the block might be split

+				if (caretNode.previousSibling && dom.isBlock(caretNode.previousSibling) || caretNode.parentNode == rootNode) {

+					node = findSuitableCaretNode(caretNode, rootNode);

+					if (node) {

+						if (node.nodeName == 'BR')

+							node.parentNode.insertBefore(caretNode, node);

+						else

+							dom.insertAfter(caretNode, node);

+					}

+				}

+

+				// Find caret root parent and clean it up using the serializer to avoid nesting

+				while (caretNode) {

+					if (caretNode === rootNode) {

+						// Clean up the parent element by parsing and serializing it

+						// This will remove invalid elements/attributes and fix nesting issues

+						dom.setOuterHTML(parent, 

+							new tinymce.html.Serializer({}, editor.schema).serialize(

+								editor.parser.parse(dom.getOuterHTML(parent))

+							)

+						);

+

+						break;

+					}

+

+					parent = caretNode;

+					caretNode = caretNode.parentNode;

+				}

+

+				// Find caret after cleanup and move selection to that location

+				caretNode = dom.select('#__mce')[0];

+				if (caretNode) {

+					node = findSuitableCaretNode(caretNode, rootNode) || findSuitableCaretNode(caretNode, rootNode, true);

+					dom.remove(caretNode);

+

+					if (node) {

+						rng = dom.createRng();

+

+						if (node.nodeType == 3) {

+							rng.setStart(node, node.length);

+							rng.setEnd(node, node.length);

+						} else {

+							if (node.nodeName == 'BR') {

+								rng.setStartBefore(node);

+								rng.setEndBefore(node);

+							} else {

+								rng.setStartAfter(node);

+								rng.setEndAfter(node);

+							}

+						}

+

+						selection.setRng(rng);

+

+						// Scroll range into view scrollIntoView on element can't be used since it will scroll the main view port as well

+						if (!tinymce.isIE) {

+							node = dom.create('span', null, '\u00a0');

+							rng.insertNode(node);

+							nodeRect = dom.getRect(node);

+							viewPortRect = dom.getViewPort(editor.getWin());

+

+							// Check if node is out side the viewport if it is then scroll to it

+							if ((nodeRect.y > viewPortRect.y + viewPortRect.h || nodeRect.y < viewPortRect.y) ||

+								(nodeRect.x > viewPortRect.x + viewPortRect.w || nodeRect.x < viewPortRect.x)) {

+								editor.getBody().scrollLeft = nodeRect.x;

+								editor.getBody().scrollTop = nodeRect.y;

+							}

+

+							dom.remove(node);

+						}

+

+						// Make sure that the selection is collapsed after we removed the node fixes a WebKit bug

+						// where WebKit would place the endContainer/endOffset at a different location than the startContainer/startOffset

+						selection.collapse(true);

+					}

+				}

+

+				selection.onSetContent.dispatch(selection, args);

+				editor.addVisual();

 			},

 

 			mceInsertRawHTML : function(command, ui, value) {

 				selection.setContent('tiny_mce_marker');

-				editor.setContent(editor.getContent().replace(/tiny_mce_marker/g, value));

+				editor.setContent(editor.getContent().replace(/tiny_mce_marker/g, function() { return value }));

 			},

 

 			mceSetContent : function(command, ui, value) {

@@ -11188,7 +12851,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},

 

 			InsertHorizontalRule : function() {

-				selection.setContent('<hr />');

+				editor.execCommand('mceInsertContent', false, '<hr />');

 			},

 

 			mceToggleVisualAid : function() {

@@ -11197,18 +12860,36 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},

 

 			mceReplaceContent : function(command, ui, value) {

-				selection.setContent(value.replace(/\{\$selection\}/g, selection.getContent({format : 'text'})));

+				editor.execCommand('mceInsertContent', false, value.replace(/\{\$selection\}/g, selection.getContent({format : 'text'})));

 			},

 

 			mceInsertLink : function(command, ui, value) {

-				var link = dom.getParent(selection.getNode(), 'a');

+				var link = dom.getParent(selection.getNode(), 'a'), img, floatVal;

 

 				if (tinymce.is(value, 'string'))

 					value = {href : value};

 

+				// Spaces are never valid in URLs and it's a very common mistake for people to make so we fix it here.

+				value.href = value.href.replace(' ', '%20');

+

 				if (!link) {

+					// WebKit can't create links on float images for some odd reason so just remove it and restore it later

+					if (tinymce.isWebKit) {

+						img = dom.getParent(selection.getNode(), 'img');

+

+						if (img) {

+							floatVal = img.style.cssFloat;

+							img.style.cssFloat = null;

+						}

+					}

+

 					execNativeCommand('CreateLink', FALSE, 'javascript:mctmp(0);');

-					each(dom.select('a[href=javascript:mctmp(0);]'), function(link) {

+

+					// Restore float value

+					if (floatVal)

+						img.style.cssFloat = floatVal;

+

+					each(dom.select("a[href='javascript:mctmp(0);']"), function(link) {

 						dom.setAttribs(link, value);

 					});

 				} else {

@@ -11220,10 +12901,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},

 			

 			selectAll : function() {

-				var root = dom.getRoot();

-				var rng = dom.createRng();

+				var root = dom.getRoot(), rng = dom.createRng();

+

 				rng.setStart(root, 0);

 				rng.setEnd(root, root.childNodes.length);

+

 				editor.selection.setRng(rng);

 			}

 		});

@@ -11235,7 +12917,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return isFormatMatch('align' + command.substring(7));

 			},

 

-			'Bold,Italic,Underline,Strikethrough' : function(command) {

+			'Bold,Italic,Underline,Strikethrough,Superscript,Subscript' : function(command) {

 				return isFormatMatch(command);

 			},

 

@@ -11292,6 +12974,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		}

 	};

 })(tinymce);

+

 (function(tinymce) {

 	var Dispatcher = tinymce.util.Dispatcher;

 

@@ -11303,12 +12986,20 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		return self = {

-			typing : 0,

+			typing : false,

 

 			onAdd : new Dispatcher(self),

+

 			onUndo : new Dispatcher(self),

+

 			onRedo : new Dispatcher(self),

 

+			beforeChange : function() {

+				// Set before bookmark on previous level

+				if (data[index])

+					data[index].beforeBookmark = editor.selection.getBookmark(2, true);

+			},

+

 			add : function(level) {

 				var i, settings = editor.settings, lastLevel;

 

@@ -11317,10 +13008,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 				// Add undo level if needed

 				lastLevel = data[index];

-				if (lastLevel && lastLevel.content == level.content) {

-					if (index > 0 || data.length == 1)

-						return null;

-				}

+				if (lastLevel && lastLevel.content == level.content)

+					return null;

 

 				// Time to compress

 				if (settings.custom_undo_redo_levels) {

@@ -11337,13 +13026,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				level.bookmark = editor.selection.getBookmark(2, true);

 

 				// Crop array if needed

-				if (index < data.length - 1) {

-					// Treat first level as initial

-					if (index == 0)

-						data = [];

-					else

-						data.length = index + 1;

-				}

+				if (index < data.length - 1)

+					data.length = index + 1;

 

 				data.push(level);

 				index = data.length - 1;

@@ -11359,14 +13043,14 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 				if (self.typing) {

 					self.add();

-					self.typing = 0;

+					self.typing = false;

 				}

 

 				if (index > 0) {

 					level = data[--index];

 

 					editor.setContent(level.content, {format : 'raw'});

-					editor.selection.moveToBookmark(level.bookmark);

+					editor.selection.moveToBookmark(level.beforeBookmark);

 

 					self.onUndo.dispatch(self, level);

 				}

@@ -11391,15 +13075,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			clear : function() {

 				data = [];

-				index = self.typing = 0;

+				index = 0;

+				self.typing = false;

 			},

 

 			hasUndo : function() {

-				return index > 0 || self.typing;

+				return index > 0 || this.typing;

 			},

 

 			hasRedo : function() {

-				return index < data.length - 1;

+				return index < data.length - 1 && !this.typing;

 			}

 		};

 	};

@@ -11416,6 +13101,27 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		TRUE = true,

 		FALSE = false;

 

+	function cloneFormats(node) {

+		var clone, temp, inner;

+

+		do {

+			if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(node.nodeName)) {

+				if (clone) {

+					temp = node.cloneNode(false);

+					temp.appendChild(clone);

+					clone = temp;

+				} else {

+					clone = inner = node.cloneNode(false);

+				}

+

+				clone.removeAttribute('id');

+			}

+		} while (node = node.parentNode);

+

+		if (clone)

+			return {wrapper : clone, inner : inner};

+	};

+

 	// Checks if the selection/caret is at the end of the specified block element

 	function isAtEnd(rng, par) {

 		var rng2 = par.ownerDocument.createRange();

@@ -11427,24 +13133,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		return rng2.cloneContents().textContent.length == 0;

 	};

 

-	function isEmpty(n) {

-		n = n.innerHTML;

-

-		n = n.replace(/<(img|hr|table|input|select|textarea)[ \>]/gi, '-'); // Keep these convert them to - chars

-		n = n.replace(/<[^>]+>/g, ''); // Remove all tags

-

-		return n.replace(/[ \u00a0\t\r\n]+/g, '') == '';

-	};

-

 	function splitList(selection, dom, li) {

 		var listBlock, block;

 

-		if (isEmpty(li)) {

+		if (dom.isEmpty(li)) {

 			listBlock = dom.getParent(li, 'ul,ol');

 

 			if (!dom.getParent(listBlock.parentNode, 'ul,ol')) {

 				dom.split(listBlock, li);

-				block = dom.create('p', 0, '<br _mce_bogus="1" />');

+				block = dom.create('p', 0, '<br data-mce-bogus="1" />');

 				dom.replace(block, li);

 				selection.select(block, 1);

 			}

@@ -11466,33 +13163,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			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');

-

-			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 + '>');

-			};

-

-			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);

+				ed.onExecCommand.add(function(ed, cmd) {

+					if (cmd == 'mceInsertContent') {

+						t.forceRoots();

+						ed.nodeChanged();

+					}

+				});

 			}

 		},

 

@@ -11524,11 +13204,56 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				}

 			}

 

-			if (!isIE && s.force_p_newlines) {

-				ed.onKeyPress.add(function(ed, e) {

-					if (e.keyCode == 13 && !e.shiftKey && !t.insertPara(e))

-						Event.cancel(e);

-				});

+			if (s.force_p_newlines) {

+				if (!isIE) {

+					ed.onKeyPress.add(function(ed, e) {

+						if (e.keyCode == 13 && !e.shiftKey && !t.insertPara(e))

+							Event.cancel(e);

+					});

+				} else {

+					// Ungly hack to for IE to preserve the formatting when you press

+					// enter at the end of a block element with formatted contents

+					// This logic overrides the browsers default logic with

+					// custom logic that enables us to control the output

+					tinymce.addUnload(function() {

+						t._previousFormats = 0; // Fix IE leak

+					});

+

+					ed.onKeyPress.add(function(ed, e) {

+						t._previousFormats = 0;

+

+						// Clone the current formats, this will later be applied to the new block contents

+						if (e.keyCode == 13 && !e.shiftKey && ed.selection.isCollapsed() && s.keep_styles)

+							t._previousFormats = cloneFormats(ed.selection.getStart());

+					});

+

+					ed.onKeyUp.add(function(ed, e) {

+						// Let IE break the element and the wrap the new caret location in the previous formats

+						if (e.keyCode == 13 && !e.shiftKey) {

+							var parent = ed.selection.getStart(), fmt = t._previousFormats;

+

+							// Parent is an empty block

+							if (!parent.hasChildNodes() && fmt) {

+								parent = dom.getParent(parent, dom.isBlock);

+

+								if (parent && parent.nodeName != 'LI') {

+									parent.innerHTML = '';

+

+									if (t._previousFormats) {

+										parent.appendChild(fmt.wrapper);

+										fmt.inner.innerHTML = '\uFEFF';

+									} else

+										parent.innerHTML = '\uFEFF';

+

+									selection.select(parent, 1);

+									selection.collapse(true);

+									ed.getDoc().execCommand('Delete', false, null);

+									t._previousFormats = 0;

+								}

+							}

+						}

+					});

+				}

 

 				if (isGecko) {

 					ed.onKeyDown.add(function(ed, e) {

@@ -11576,21 +13301,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				});

 			}

 

-			// Padd empty inline elements within block elements

-			// For example: <p><strong><em></em></strong></p> becomes <p><strong><em>&nbsp;</em></strong></p>

-			ed.onPreProcess.add(function(ed, o) {

-				each(dom.select('p,h1,h2,h3,h4,h5,h6,div', o.node), function(p) {

-					if (isEmpty(p)) {

-						each(dom.select('span,em,strong,b,i', o.node), function(n) {

-							if (!n.hasChildNodes()) {

-								n.appendChild(ed.getDoc().createTextNode('\u00a0'));

-								return FALSE; // Break the loop one padding is enough

-							}

-						});

-					}

-				});

-			});

-

 			// IE specific fixes

 			if (isIE) {

 				// Replaces IE:s auto generated paragraphs with the specified element name

@@ -11651,7 +13361,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				nx = nl[i];

 

 				// Ignore internal elements

-				if (nx.nodeType === 1 && nx.getAttribute('_mce_type')) {

+				if (nx.nodeType === 1 && nx.getAttribute('data-mce-type')) {

 					bl = null;

 					continue;

 				}

@@ -11663,7 +13373,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						if (nx.nodeType != 3 || /[^\s]/g.test(nx.nodeValue)) {

 							// Store selection

 							if (si == -2 && r) {

-								if (!isIE) {

+								if (!isIE || r.setStart) {

 									// If selection is element then mark it

 									if (r.startContainer.nodeType == 1 && (n = r.startContainer.childNodes[r.startOffset]) && n.nodeType == 1) {

 										// Save the id of the selected element

@@ -11722,7 +13432,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			// Restore selection

 			if (si != -2) {

-				if (!isIE) {

+				if (!isIE || r.setStart) {

 					bl = b.getElementsByTagName(ed.settings.element)[0];

 					r = d.createRange();

 

@@ -11754,7 +13464,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						// Ignore

 					}

 				}

-			} else if (!isIE && (n = ed.dom.get('__mce'))) {

+			} else if ((!isIE || r.setStart) && (n = ed.dom.get('__mce'))) {

 				// Restore the id of the selected element

 				if (eid)

 					n.setAttribute('id', eid);

@@ -11779,6 +13489,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			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, car;

 

+			ed.undoManager.beforeChange();

+

 			// 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)

@@ -11955,7 +13667,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				aft.innerHTML = aft.firstChild.innerHTML;

 

 			// Padd empty blocks

-			if (isEmpty(bef))

+			if (dom.isEmpty(bef))

 				bef.innerHTML = '<br />';

 

 			function appendStyles(e, en) {

@@ -11982,14 +13694,14 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						nn = nn.appendChild(nl[i]);

 

 					// Padd most inner style element

-					nl[0].innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there

+					nl[0].innerHTML = isOpera ? '\u00a0' : '<br />'; // Extra space for Opera so that the caret can move there

 					return nl[0]; // Move caret to most inner element

 				} else

-					e.innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there

+					e.innerHTML = isOpera ? '\u00a0' : '<br />'; // Extra space for Opera so that the caret can move there

 			};

 

 			// Fill empty afterblook with current style

-			if (isEmpty(aft))

+			if (dom.isEmpty(aft))

 				car = appendStyles(aft, en);

 

 			// Opera needs this one backwards for older versions

@@ -12018,19 +13730,40 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			// 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;

+			//ch = aft.clientHeight;

 

 			// Is element within viewport

-			if (y < vp.y || y + ch > vp.y + vp.h) {

+			if (y < vp.y || y + 25 > vp.y + vp.h) {

 				ed.getWin().scrollTo(0, y < vp.y ? y : y - vp.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks

-				//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));

+

+				/*console.debug(

+					'Element: y=' + y + ', h=' + ch + ', ' +

+					'Viewport: y=' + vp.y + ", h=" + vp.h + ', bottom=' + (vp.y + vp.h)

+				);*/

 			}

 

+			ed.undoManager.add();

+

 			return FALSE;

 		},

 

 		backspaceDelete : function(e, bs) {

-			var t = this, ed = t.editor, b = ed.getBody(), dom = ed.dom, n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn;

+			var t = this, ed = t.editor, b = ed.getBody(), dom = ed.dom, n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn, walker;

+

+			// Delete when caret is behind a element doesn't work correctly on Gecko see #3011651

+			if (!bs && r.collapsed && sc.nodeType == 1 && r.startOffset == sc.childNodes.length) {

+				walker = new tinymce.dom.TreeWalker(sc.lastChild, sc);

+

+				// Walk the dom backwards until we find a text node

+				for (n = sc.lastChild; n; n = walker.prev()) {

+					if (n.nodeType == 3) {

+						r.setStart(n, n.nodeValue.length);

+						r.collapse(true);

+						se.setRng(r);

+						return;

+					}

+				}

+			}

 

 			// 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

@@ -12061,37 +13794,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					}

 				}

 			}

-

-			// Gecko generates BR elements here and there, we don't like those so lets remove them

-			function handler(e) {

-				var pr;

-

-				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))) {

-					pr = e.previousSibling;

-

-					Event.remove(b, 'DOMNodeInserted', handler);

-

-					// Is there whitespace at the end of the node before then we might need the pesky BR

-					// to place the caret at a correct location see bug: #2013943

-					if (pr && pr.nodeType == 3 && /\s+$/.test(pr.nodeValue))

-						return;

-

-					// 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);

 		}

 	});

 })(tinymce);

@@ -12256,7 +13958,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				c = new tinymce.ui.NativeListBox(id, s);

 			else {

 				cls = cc || t._cls.listbox || tinymce.ui.ListBox;

-				c = new cls(id, s);

+				c = new cls(id, s, ed);

 			}

 

 			t.controls[id] = c;

@@ -12311,7 +14013,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			if (s.menu_button) {

 				cls = cc || t._cls.menubutton || tinymce.ui.MenuButton;

-				c = new cls(id, s);

+				c = new cls(id, s, ed);

 				ed.onMouseDown.add(c.hideMenu, c);

 			} else {

 				cls = t._cls.button || tinymce.ui.Button;

@@ -12358,7 +14060,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			id = t.prefix + id;

 			cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton;

-			c = t.add(new cls(id, s));

+			c = t.add(new cls(id, s, ed));

 			ed.onMouseDown.add(c.hideMenu, c);

 

 			return c;

@@ -12398,7 +14100,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			id = t.prefix + id;

 			cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton;

-			c = new cls(id, s);

+			c = new cls(id, s, ed);

 			ed.onMouseDown.add(c.hideMenu, c);

 

 			// Remove the menu element when the editor is removed

@@ -12430,13 +14132,25 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			id = t.prefix + id;

 			cls = cc || t._cls.toolbar || tinymce.ui.Toolbar;

-			c = new cls(id, s);

+			c = new cls(id, s, t.editor);

 

 			if (t.get(id))

 				return null;

 

 			return t.add(c);

 		},

+		

+		createToolbarGroup : function(id, s, cc) {

+			var c, t = this, cls;

+			id = t.prefix + id;

+			cls = cc || this._cls.toolbarGroup || tinymce.ui.ToolbarGroup;

+			c = new cls(id, s, t.editor);

+			

+			if (t.get(id))

+				return null;

+			

+			return t.add(c);

+		},

 

 		createSeparator : function(cc) {

 			var cls = cc || this._cls.separator || tinymce.ui.Separator;

@@ -12574,53 +14288,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 	});

 }(tinymce));

 (function(tinymce) {

-	function CommandManager() {

-		var execCommands = {}, queryStateCommands = {}, queryValueCommands = {};

-

-		function add(collection, cmd, func, scope) {

-			if (typeof(cmd) == 'string')

-				cmd = [cmd];

-

-			tinymce.each(cmd, function(cmd) {

-				collection[cmd.toLowerCase()] = {func : func, scope : scope};

-			});

-		};

-

-		tinymce.extend(this, {

-			add : function(cmd, func, scope) {

-				add(execCommands, cmd, func, scope);

-			},

-

-			addQueryStateHandler : function(cmd, func, scope) {

-				add(queryStateCommands, cmd, func, scope);

-			},

-

-			addQueryValueHandler : function(cmd, func, scope) {

-				add(queryValueCommands, cmd, func, scope);

-			},

-

-			execCommand : function(scope, cmd, ui, value, args) {

-				if (cmd = execCommands[cmd.toLowerCase()]) {

-					if (cmd.func.call(scope || cmd.scope, ui, value, args) !== false)

-						return true;

-				}

-			},

-

-			queryCommandValue : function() {

-				if (cmd = queryValueCommands[cmd.toLowerCase()])

-					return cmd.func.call(scope || cmd.scope, ui, value, args);

-			},

-

-			queryCommandState : function() {

-				if (cmd = queryStateCommands[cmd.toLowerCase()])

-					return cmd.func.call(scope || cmd.scope, ui, value, args);

-			}

-		});

-	};

-

-	tinymce.GlobalCommands = new CommandManager();

-})(tinymce);

-(function(tinymce) {

 	tinymce.Formatter = function(ed) {

 		var formats = {},

 			each = tinymce.each,

@@ -12628,7 +14295,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			selection = ed.selection,

 			TreeWalker = tinymce.dom.TreeWalker,

 			rangeUtils = new tinymce.dom.RangeUtils(dom),

-			isValid = ed.schema.isValid,

+			isValid = ed.schema.isValidChild,

 			isBlock = dom.isBlock,

 			forcedRootBlock = ed.settings.forced_root_block,

 			nodeIndex = dom.nodeIndex,

@@ -12697,8 +14364,31 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			}

 		};

 

+		var getTextDecoration = function(node) {

+			var decoration;

+

+			ed.dom.getParent(node, function(n) {

+				decoration = ed.dom.getStyle(n, 'text-decoration');

+				return decoration && decoration !== 'none';

+			});

+

+			return decoration;

+		};

+

+		var processUnderlineAndColor = function(node) {

+			var textDecoration;

+			if (node.nodeType === 1 && node.parentNode && node.parentNode.nodeType === 1) {

+				textDecoration = getTextDecoration(node.parentNode);

+				if (ed.dom.getStyle(node, 'color') && textDecoration) {

+					ed.dom.setStyle(node, 'text-decoration', textDecoration);

+				} else if (ed.dom.getStyle(node, 'textdecoration') === textDecoration) {

+					ed.dom.setStyle(node, 'text-decoration', null);

+				}

+			}

+		};

+

 		function apply(name, vars, node) {

-			var formatList = get(name), format = formatList[0], bookmark, rng, i;

+			var formatList = get(name), format = formatList[0], bookmark, rng, i, isCollapsed = selection.isCollapsed();

 

 			function moveStart(rng) {

 				var container = rng.startContainer,

@@ -12708,11 +14398,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				// Move startContainer/startOffset in to a suitable node

 				if (container.nodeType == 1 || container.nodeValue === "") {

 					container = container.nodeType == 1 ? container.childNodes[offset] : container;

-					walker = new TreeWalker(container, container.parentNode);

-					for (node = walker.current(); node; node = walker.next()) {

-						if (node.nodeType == 3 && !isBlock(node.parentNode) && !isWhiteSpaceNode(node)) {

-							rng.setStart(node, 0);

-							break;

+

+					// Might fail if the offset is behind the last element in it's container

+					if (container) {

+						walker = new TreeWalker(container, container.parentNode);

+						for (node = walker.current(); node; node = walker.next()) {

+							if (node.nodeType == 3 && !isWhiteSpaceNode(node)) {

+								rng.setStart(node, 0);

+								break;

+							}

 						}

 					}

 				}

@@ -12785,6 +14479,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						if (format.selector) {

 							// Look for matching formats

 							each(formatList, function(format) {

+								// Check collapsed state if it exists

+								if ('collapsed' in format && format.collapsed !== isCollapsed) {

+									return;

+								}

+

 								if (dom.is(node, format.selector) && !isCaretNode(node)) {

 									setElementFormat(node, format);

 									found = true;

@@ -12799,7 +14498,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						}

 

 						// Is it valid to wrap this item

-						if (isValid(wrapName, nodeName) && isValid(parentName, wrapName)) {

+						if (isValid(wrapName, nodeName) && isValid(parentName, wrapName) &&

+								!(node.nodeType === 3 && node.nodeValue.length === 1 && node.nodeValue.charCodeAt(0) === 65279)) {

 							// Start wrapping

 							if (!currentWrapElm) {

 								// Wrap the node

@@ -12824,6 +14524,30 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					each(nodes, process);

 				});

 

+				// Wrap links inside as well, for example color inside a link when the wrapper is around the link

+				if (format.wrap_links === false) {

+					each(newWrappers, function(node) {

+						function process(node) {

+							var i, currentWrapElm, children;

+

+							if (node.nodeName === 'A') {

+								currentWrapElm = wrapElm.cloneNode(FALSE);

+								newWrappers.push(currentWrapElm);

+

+								children = tinymce.grep(node.childNodes);

+								for (i = 0; i < children.length; i++)

+									currentWrapElm.appendChild(children[i]);

+

+								node.appendChild(currentWrapElm);

+							}

+

+							each(tinymce.grep(node.childNodes), process);

+						};

+

+						process(node);

+					});

+				}

+

 				// Cleanup

 				each(newWrappers, function(node) {

 					var childCount;

@@ -12863,8 +14587,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 					childCount = getChildCount(node);

 

-					// Remove empty nodes

-					if (childCount === 0) {

+					// Remove empty nodes but only if there is multiple wrappers and they are not block

+					// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at

+					if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {

 						dom.remove(node, 1);

 						return;

 					}

@@ -12880,6 +14605,19 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 							// this: <span style="color:red"><b><span style="color:red; font-size:10px">text</span></b></span>

 							// will become: <span style="color:red"><b><span style="font-size:10px">text</span></b></span>

 							each(dom.select(format.inline, node), function(child) {

+								var parent;

+

+								// When wrap_links is set to false we don't want

+								// to remove the format on children within links

+								if (format.wrap_links === false) {

+									parent = child.parentNode;

+

+									do {

+										if (parent.nodeName === 'A')

+											return;

+									} while (parent = parent.parentNode);

+								}

+

 								removeFormat(format, vars, child, format.exact ? child : null);

 							});

 						});

@@ -12918,13 +14656,22 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					rng.setStartBefore(node);

 					rng.setEndAfter(node);

 

-					applyRngStyle(rng);

+					applyRngStyle(expandRng(rng, formatList));

 				} else {

-					if (!selection.isCollapsed() || !format.inline) {

+					if (!isCollapsed || !format.inline || dom.select('td.mceSelected,th.mceSelected').length) {

+						// Obtain selection node before selection is unselected by applyRngStyle()

+						var curSelNode = ed.selection.getNode();

+

 						// Apply formatting to selection

 						bookmark = selection.getBookmark();

 						applyRngStyle(expandRng(selection.getRng(TRUE), formatList));

 

+						// Colored nodes should be underlined so that the color of the underline matches the text color.

+						if (format.styles && (format.styles.color || format.styles.textDecoration)) {

+							tinymce.walk(curSelNode, processUnderlineAndColor, 'childNodes');

+							processUnderlineAndColor(curSelNode);

+						}

+

 						selection.moveToBookmark(bookmark);

 						selection.setRng(moveStart(selection.getRng(TRUE)));

 						ed.nodeChanged();

@@ -12937,6 +14684,45 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		function remove(name, vars, node) {

 			var formatList = get(name), format = formatList[0], bookmark, i, rng;

 

+			function moveStart(rng) {

+				var container = rng.startContainer,

+					offset = rng.startOffset,

+					walker, node, nodes, tmpNode;

+

+				// Convert text node into index if possible

+				if (container.nodeType == 3 && offset >= container.nodeValue.length - 1) {

+					container = container.parentNode;

+					offset = nodeIndex(container) + 1;

+				}

+

+				// Move startContainer/startOffset in to a suitable node

+				if (container.nodeType == 1) {

+					nodes = container.childNodes;

+					container = nodes[Math.min(offset, nodes.length - 1)];

+					walker = new TreeWalker(container);

+

+					// If offset is at end of the parent node walk to the next one

+					if (offset > nodes.length - 1)

+						walker.next();

+

+					for (node = walker.current(); node; node = walker.next()) {

+						if (node.nodeType == 3 && !isWhiteSpaceNode(node)) {

+							// IE has a "neat" feature where it moves the start node into the closest element

+							// we can avoid this by inserting an element before it and then remove it after we set the selection

+							tmpNode = dom.create('a', null, INVISIBLE_CHAR);

+							node.parentNode.insertBefore(tmpNode, node);

+

+							// Set selection and remove tmpNode

+							rng.setStart(node, 0);

+							selection.setRng(rng);

+							dom.remove(tmpNode);

+

+							return;

+						}

+					}

+				}

+			};

+

 			// Merges the styles for each node

 			function process(node) {

 				var children, i, l;

@@ -13049,8 +14835,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 					if (startContainer != endContainer) {

 						// Wrap start/end nodes in span element since these might be cloned/moved

-						startContainer = wrap(startContainer, 'span', {id : '_start', _mce_type : 'bookmark'});

-						endContainer = wrap(endContainer, 'span', {id : '_end', _mce_type : 'bookmark'});

+						startContainer = wrap(startContainer, 'span', {id : '_start', 'data-mce-type' : 'bookmark'});

+						endContainer = wrap(endContainer, 'span', {id : '_end', 'data-mce-type' : 'bookmark'});

 

 						// Split start/end

 						splitToFormatRoot(startContainer);

@@ -13073,6 +14859,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				rangeUtils.walk(rng, function(nodes) {

 					each(nodes, function(node) {

 						process(node);

+

+						// Remove parent span if it only contains text-decoration: underline, yet a parent node is also underlined.

+						if (node.nodeType === 1 && ed.dom.getStyle(node, 'text-decoration') === 'underline' && node.parentNode && getTextDecoration(node.parentNode) === 'underline') {

+							removeFormat({'deep': false, 'exact': true, 'inline': 'span', 'styles': {'textDecoration' : 'underline'}}, null, node);

+						}

 					});

 				});

 			};

@@ -13086,17 +14877,25 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return;

 			}

 

-			if (!selection.isCollapsed() || !format.inline) {

+			if (!selection.isCollapsed() || !format.inline || dom.select('td.mceSelected,th.mceSelected').length) {

 				bookmark = selection.getBookmark();

 				removeRngStyle(selection.getRng(TRUE));

 				selection.moveToBookmark(bookmark);

+

+				// Check if start element still has formatting then we are at: "<b>text|</b>text" and need to move the start into the next text node

+				if (match(name, vars, selection.getStart())) {

+					moveStart(selection.getRng(true));

+				}

+

 				ed.nodeChanged();

 			} else

 				performCaretAction('remove', name, vars);

 		};

 

 		function toggle(name, vars, node) {

-			if (match(name, vars, node))

+			var fmt = get(name);

+

+			if (match(name, vars, node) && (!('toggle' in fmt[0]) || fmt[0]['toggle']))

 				remove(name, vars, node);

 			else

 				apply(name, vars, node);

@@ -13344,7 +15143,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function isWhiteSpaceNode(node) {

-			return node && node.nodeType === 3 && /^\s*$/.test(node.nodeValue);

+			return node && node.nodeType === 3 && /^([\s\r\n]+|)$/.test(node.nodeValue);

 		};

 

 		function wrap(node, name, attrs) {

@@ -13360,7 +15159,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			var startContainer = rng.startContainer,

 				startOffset = rng.startOffset,

 				endContainer = rng.endContainer,

-				endOffset = rng.endOffset, sibling, lastIdx;

+				endOffset = rng.endOffset, sibling, lastIdx, leaf;

 

 			// This function walks up the tree if there is no siblings before/after the node

 			function findParentContainer(container, child_name, sibling_name, root) {

@@ -13390,6 +15189,19 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return container;

 			};

 

+			// This function walks down the tree to find the leaf at the selection.

+			// The offset is also returned as if node initially a leaf, the offset may be in the middle of the text node.

+			function findLeaf(node, offset) {

+				if (offset === undefined)

+					offset = node.nodeType === 3 ? node.length : node.childNodes.length;

+				while (node && node.hasChildNodes()) {

+					node = node.childNodes[offset];

+					if (node)

+						offset = node.nodeType === 3 ? node.length : node.childNodes.length;

+				}

+				return { node: node, offset: offset };

+			}

+

 			// If index based start position then resolve it

 			if (startContainer.nodeType == 1 && startContainer.hasChildNodes()) {

 				lastIdx = startContainer.childNodes.length - 1;

@@ -13415,12 +15227,36 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (isBookmarkNode(startContainer))

 				startContainer = startContainer.nextSibling || startContainer;

 

-			if (isBookmarkNode(endContainer.parentNode))

+			if (isBookmarkNode(endContainer.parentNode)) {

+				endOffset = dom.nodeIndex(endContainer);

 				endContainer = endContainer.parentNode;

+			}

 

-			if (isBookmarkNode(endContainer))

-				endContainer = endContainer.previousSibling || endContainer;

+			if (isBookmarkNode(endContainer) && endContainer.previousSibling) {

+				endContainer = endContainer.previousSibling;

+				endOffset = endContainer.length;

+			}

 

+			if (format[0].inline) {

+				// Avoid applying formatting to a trailing space.

+				leaf = findLeaf(endContainer, endOffset);

+				if (leaf.node) {

+					while (leaf.node && leaf.offset === 0 && leaf.node.previousSibling)

+						leaf = findLeaf(leaf.node.previousSibling);

+

+					if (leaf.node && leaf.offset > 0 && leaf.node.nodeType === 3 &&

+							leaf.node.nodeValue.charAt(leaf.offset - 1) === ' ') {

+

+						if (leaf.offset > 1) {

+							endContainer = leaf.node;

+							endContainer.splitText(leaf.offset - 1);

+						} else if (leaf.node.previousSibling) {

+							endContainer = leaf.node.previousSibling;

+						}

+					}

+				}

+			}

+			

 			// Move start/end point up the tree if the leaves are sharp and if we are in different containers

 			// Example * becomes !: !<p><b><i>*text</i><i>text*</i></b></p>!

 			// This will reduce the number of wrapper elements that needs to be created

@@ -13433,7 +15269,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// Expand start/end container to matching selector

 			if (format[0].selector && format[0].expand !== FALSE && !format[0].inline) {

 				function findSelectorEndPoint(container, sibling_name) {

-					var parents, i, y;

+					var parents, i, y, curFormat;

 

 					if (container.nodeType == 3 && container.nodeValue.length == 0 && container[sibling_name])

 						container = container[sibling_name];

@@ -13441,7 +15277,13 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					parents = getParents(container);

 					for (i = 0; i < parents.length; i++) {

 						for (y = 0; y < format.length; y++) {

-							if (dom.is(parents[i], format[y].selector))

+							curFormat = format[y];

+

+							// If collapsed state is set then skip formats that doesn't match that

+							if ("collapsed" in curFormat && curFormat.collapsed !== rng.collapsed)

+								continue;

+

+							if (dom.is(parents[i], curFormat.selector))

 								return parents[i];

 						}

 					}

@@ -13551,7 +15393,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				// Remove style attribute if it's empty

 				if (stylesModified && dom.getAttrib(node, 'style') == '') {

 					node.removeAttribute('style');

-					node.removeAttribute('_mce_style');

+					node.removeAttribute('data-mce-style');

 				}

 

 				// Remove attributes

@@ -13592,7 +15434,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 						// Remove mce prefixed attributes

 						if (MCE_ATTR_RE.test(name))

-							node.removeAttribute('_mce_' + name);

+							node.removeAttribute('data-mce-' + name);

 

 						node.removeAttribute(name);

 					}

@@ -13677,7 +15519,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function isBookmarkNode(node) {

-			return node && node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark';

+			return node && node.nodeType == 1 && node.getAttribute('data-mce-type') == 'bookmark';

 		};

 

 		function mergeSiblings(prev, next) {

@@ -13748,7 +15590,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (prev && next) {

 				function findElementSibling(node, sibling_name) {

 					for (sibling = node; sibling; sibling = sibling[sibling_name]) {

-						if (sibling.nodeType == 3 && !isWhiteSpaceNode(sibling))

+						if (sibling.nodeType == 3 && sibling.nodeValue.length !== 0)

 							return node;

 

 						if (sibling.nodeType == 1 && !isBookmarkNode(sibling))

@@ -13825,6 +15667,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				// Apply pending formats

 				each(pendingFormats.apply.reverse(), function(item) {

 					apply(item.name, item.vars, caret_node);

+

+					// Colored nodes should be underlined so that the color of the underline matches the text color.

+					if (item.name === 'forecolor' && item.vars.value)

+						processUnderlineAndColor(caret_node.parentNode);

 				});

 

 				// Remove pending formats

@@ -13882,13 +15728,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 									if (isCaretNode(node)) {

 										textNode = node.firstChild;

 

-										perform(node);

+										if (textNode) {

+											perform(node);

 

-										rng = dom.createRng();

-										rng.setStart(textNode, textNode.nodeValue.length);

-										rng.setEnd(textNode, textNode.nodeValue.length);

-										selection.setRng(rng);

-										ed.nodeChanged();

+											rng = dom.createRng();

+											rng.setStart(textNode, textNode.nodeValue.length);

+											rng.setEnd(textNode, textNode.nodeValue.length);

+											selection.setRng(rng);

+											ed.nodeChanged();

+										} else

+											dom.remove(node);

 									}

 								});

 

@@ -13911,9 +15760,12 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 		fontSizes = tinymce.explode(settings.font_size_style_values);

 

 		function replaceWithSpan(node, styles) {

-			dom.replace(dom.create('span', {

-				style : styles

-			}), node, 1);

+			tinymce.each(styles, function(value, name) {

+				if (value)

+					dom.setStyle(node, name, value);

+			});

+

+			dom.rename(node, 'span');

 		};

 

 		filters = {

@@ -13950,6 +15802,7 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 		};

 

 		ed.onPreProcess.add(convert);

+		ed.onSetContent.add(convert);

 

 		ed.onInit.add(function() {

 			ed.selection.onSetContent.add(convert);

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js
index 2617a26ed..59da01399 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js
@@ -11,10 +11,14 @@
 var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));

 

 function getColorPickerHTML(id, target_form_element) {

-	var h = "";

+	var h = "", dom = tinyMCEPopup.dom;

 

-	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') + '">&nbsp;</span></a>';

+	if (label = dom.select('label[for=' + target_form_element + ']')[0]) {

+		label.id = label.id || dom.uniqueId();

+	}

+

+	h += '<a role="button" aria-labelledby="' + id + '_label" 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') + '">&nbsp;<span id="' + id + '_label" class="mceVoiceLabel mceIconOnly" style="display:none;">' + tinyMCEPopup.getLang('browse') + '</span></span></a>';

 

 	return h;

 }

@@ -67,6 +71,9 @@ function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
 	if (!form_obj || !form_obj.elements[field_name])

 		return;

 

+	if (!value)

+		value = "";

+

 	var sel = form_obj.elements[field_name];

 

 	var found = false;

@@ -171,7 +178,7 @@ function convertHexToRGB(col) {
 }

 

 function trimSize(size) {

-	return size.replace(/([0-9\.]+)px|(%|in|cm|mm|em|ex|pt|pc)/, '$1$2');

+	return size.replace(/([0-9\.]+)(px|%|in|cm|mm|em|ex|pt|pc)/i, '$1$2');

 }

 

 function getCSSSize(size) {

@@ -183,6 +190,9 @@ function getCSSSize(size) {
 	// Add px

 	if (/^[0-9]+$/.test(size))

 		size += 'px';

+	// Sanity check, IE doesn't like broken values

+	else if (!(/^[0-9\.]+(px|%|in|cm|mm|em|ex|pt|pc)$/i.test(size)))

+		return "";

 

 	return size;

 }

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js
index 825d4c143..458ec86da 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js
@@ -10,6 +10,7 @@
 

 function MCTabs() {

 	this.settings = [];

+	this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.util.Dispatcher');

 };

 

 MCTabs.prototype.init = function(settings) {

@@ -28,26 +29,62 @@ MCTabs.prototype.getParam = function(name, default_value) {
 	return value;

 };

 

-MCTabs.prototype.displayTab = function(tab_id, panel_id) {

-	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i;

+MCTabs.prototype.showTab =function(tab){

+	tab.className = 'current';

+	tab.setAttribute("aria-selected", true);

+	tab.setAttribute("aria-expanded", true);

+	tab.tabIndex = 0;

+};

+

+MCTabs.prototype.hideTab =function(tab){

+	var t=this;

+

+	tab.className = '';

+	tab.setAttribute("aria-selected", false);

+	tab.setAttribute("aria-expanded", false);

+	tab.tabIndex = -1;

+};

+

+MCTabs.prototype.showPanel = function(panel) {

+	panel.className = 'current'; 

+	panel.setAttribute("aria-hidden", false);

+};

+

+MCTabs.prototype.hidePanel = function(panel) {

+	panel.className = 'panel';

+	panel.setAttribute("aria-hidden", true);

+}; 

+

+MCTabs.prototype.getPanelForTab = function(tabElm) {

+	return tinyMCEPopup.dom.getAttrib(tabElm, "aria-controls");

+};

+

+MCTabs.prototype.displayTab = function(tab_id, panel_id, avoid_focus) {

+	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i, t = this;

+

+	tabElm = document.getElementById(tab_id);

+

+	if (panel_id === undefined) {

+		panel_id = t.getPanelForTab(tabElm);

+	}

 

 	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');

+	selectionClass = t.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 = '';

+			if (nodes[i].nodeName == "LI") {

+				t.hideTab(nodes[i]);

+			}

 		}

 

 		// Show selected tab

-		tabElm.className = 'current';

+		t.showTab(tabElm);

 	}

 

 	if (panelElm && panelContainerElm) {

@@ -56,11 +93,15 @@ MCTabs.prototype.displayTab = function(tab_id, panel_id) {
 		// Hide all other panels

 		for (i = 0; i < nodes.length; i++) {

 			if (nodes[i].nodeName == "DIV")

-				nodes[i].className = 'panel';

+				t.hidePanel(nodes[i]);

+		}

+

+		if (!avoid_focus) { 

+			tabElm.focus();

 		}

 

 		// Show selected panel

-		panelElm.className = 'current';

+		t.showPanel(panelElm);

 	}

 };

 

@@ -73,5 +114,49 @@ MCTabs.prototype.getAnchor = function() {
 	return "";

 };

 

-// Global instance

+

+//Global instance

 var mcTabs = new MCTabs();

+

+tinyMCEPopup.onInit.add(function() {

+	var tinymce = tinyMCEPopup.getWin().tinymce, dom = tinyMCEPopup.dom, each = tinymce.each;

+

+	each(dom.select('div.tabs'), function(tabContainerElm) {

+		var keyNav;

+

+		dom.setAttrib(tabContainerElm, "role", "tablist"); 

+

+		var items = tinyMCEPopup.dom.select('li', tabContainerElm);

+		var action = function(id) {

+			mcTabs.displayTab(id, mcTabs.getPanelForTab(id));

+			mcTabs.onChange.dispatch(id);

+		};

+

+		each(items, function(item) {

+			dom.setAttrib(item, 'role', 'tab');

+			dom.bind(item, 'click', function(evt) {

+				action(item.id);

+			});

+		});

+

+		dom.bind(dom.getRoot(), 'keydown', function(evt) {

+			if (evt.keyCode === 9 && evt.ctrlKey && !evt.altKey) { // Tab

+				keyNav.moveFocus(evt.shiftKey ? -1 : 1);

+				tinymce.dom.Event.cancel(evt);

+			}

+		});

+

+		each(dom.select('a', tabContainerElm), function(a) {

+			dom.setAttrib(a, 'tabindex', '-1');

+		});

+

+		keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {

+			root: tabContainerElm,

+			items: items,

+			onAction: action,

+			actOnFocus: true,

+			enableLeftRight: true,

+			enableUpDown: true

+		}, tinyMCEPopup.dom);

+	});

+});
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/utils/validate.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/utils/validate.js
index a6fcf9701..27cbfab81 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/utils/validate.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/utils/validate.js
@@ -32,7 +32,7 @@ var Validator = {
 	},

 

 	isSize : function(s) {

-		return this.test(s, '^[0-9]+(%|in|cm|mm|em|ex|pt|pc|px)?$');

+		return this.test(s, '^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)?$');

 	},

 

 	isId : function(s) {

@@ -96,8 +96,10 @@ var AutoValidator = {
 		var i, nl, s = this.settings, c = 0;

 

 		nl = this.tags(f, 'label');

-		for (i=0; i<nl.length; i++)

+		for (i=0; i<nl.length; i++) {

 			this.removeClass(nl[i], s.invalid_cls);

+			nl[i].setAttribute('aria-invalid', false);

+		}

 

 		c += this.validateElms(f, 'input');

 		c += this.validateElms(f, 'select');

@@ -109,6 +111,33 @@ var AutoValidator = {
 	invalidate : function(n) {

 		this.mark(n.form, n);

 	},

+	

+	getErrorMessages : function(f) {

+		var nl, i, s = this.settings, field, msg, values, messages = [], ed = tinyMCEPopup.editor;

+		nl = this.tags(f, "label");

+		for (i=0; i<nl.length; i++) {

+			if (this.hasClass(nl[i], s.invalid_cls)) {

+				field = document.getElementById(nl[i].getAttribute("for"));

+				values = { field: nl[i].textContent };

+				if (this.hasClass(field, s.min_cls, true)) {

+					message = ed.getLang('invalid_data_min');

+					values.min = this.getNum(field, s.min_cls);

+				} else if (this.hasClass(field, s.number_cls)) {

+					message = ed.getLang('invalid_data_number');

+				} else if (this.hasClass(field, s.size_cls)) {

+					message = ed.getLang('invalid_data_size');

+				} else {

+					message = ed.getLang('invalid_data');

+				}

+				

+				message = message.replace(/{\#([^}]+)\}/g, function(a, b) {

+					return values[b] || '{#' + b + '}';

+				});

+				messages.push(message);

+			}

+		}

+		return messages;

+	},

 

 	reset : function(e) {

 		var t = ['label', 'input', 'select', 'textarea'];

@@ -119,8 +148,10 @@ var AutoValidator = {
 

 		for (i=0; i<t.length; i++) {

 			nl = this.tags(e.form ? e.form : e, t[i]);

-			for (j=0; j<nl.length; j++)

+			for (j=0; j<nl.length; j++) {

 				this.removeClass(nl[j], s.invalid_cls);

+				nl[j].setAttribute('aria-invalid', false);

+			}

 		}

 	},

 

@@ -201,6 +232,7 @@ var AutoValidator = {
 		var s = this.settings;

 

 		this.addClass(n, s.invalid_cls);

+		n.setAttribute('aria-invalid', 'true');

 		this.markLabels(f, n, s.invalid_cls);

 

 		return false;

diff --git a/mod/tinymce/views/default/js/tinymce.php b/mod/tinymce/views/default/js/tinymce.php
index 9809aa841..092983d1d 100644
--- a/mod/tinymce/views/default/js/tinymce.php
+++ b/mod/tinymce/views/default/js/tinymce.php
@@ -50,6 +50,7 @@ elgg.tinymce.init = function() {
 		theme_advanced_statusbar_location : "bottom",
 		theme_advanced_resizing : true,
 		theme_advanced_path : true,
+		width : "100%",
 		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]",
 		setup : function(ed) {
 			//show the number of words
diff --git a/mod/tinymce/views/default/tinymce/embed_custom_insert_js.php b/mod/tinymce/views/default/tinymce/embed_custom_insert_js.php
index 84f98c405..d5513cef1 100644
--- a/mod/tinymce/views/default/tinymce/embed_custom_insert_js.php
+++ b/mod/tinymce/views/default/tinymce/embed_custom_insert_js.php
@@ -1,5 +1,5 @@
 	if (window.tinyMCE) {
-		var editor = window.tinyMCE.get(textAreaName);
+		var editor = window.tinyMCE.get(textAreaId);
 		
 		if (editor) {
 			editor.execCommand("mceInsertContent", true, content);
diff --git a/mod/twitter/manifest.xml b/mod/twitter/manifest.xml
index b198aa0e9..bd7176620 100644
--- a/mod/twitter/manifest.xml
+++ b/mod/twitter/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.7</version>
 	<category>bundled</category>
+	<category>widget</category>
 	<description>Elgg simple twitter widget</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/twitter/start.php b/mod/twitter/start.php
index c40f933c7..b793eadf0 100644
--- a/mod/twitter/start.php
+++ b/mod/twitter/start.php
@@ -6,7 +6,7 @@
  * @package ElggTwitter
  */
 
-register_elgg_event_handler('init', 'system', 'twitter_init');
+elgg_register_event_handler('init', 'system', 'twitter_init');
 
 function twitter_init() {
 	elgg_extend_view('css/elgg', 'twitter/css');
diff --git a/mod/twitter/views/default/twitter/css.php b/mod/twitter/views/default/twitter/css.php
index ffabdf98c..cb58e8fb1 100644
--- a/mod/twitter/views/default/twitter/css.php
+++ b/mod/twitter/views/default/twitter/css.php
@@ -14,13 +14,16 @@
 	padding:0;
 }
 #twitter_widget li {
-	background: url(<?php echo elgg_get_site_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;
+	border: 2px solid #dedede;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
 }
 #twitter_widget li span {
 	color:#666666;
diff --git a/mod/twitter_api/languages/en.php b/mod/twitter_api/languages/en.php
index b63cebcf8..940a49d9b 100644
--- a/mod/twitter_api/languages/en.php
+++ b/mod/twitter_api/languages/en.php
@@ -23,7 +23,7 @@ $english = array(
 	'twitter_api:revoke:success' => 'Twitter access has been revoked.',
 
 	'twitter_api:login' => 'Allow existing users who have connected their Twitter account to sign in with Twitter?',
-	'twitter_api:new_users' => 'Allow new users to sign up using their Twitter account even if manual registration is disabled?',
+	'twitter_api:new_users' => 'Allow new users to sign up using their Twitter account even if user registration is disabled?',
 	'twitter_api:login:success' => 'You have been logged in.',
 	'twitter_api:login:error' => 'Unable to login with Twitter.',
 	'twitter_api:login:email' => "You must enter a valid email address for your new %s account.",
diff --git a/mod/twitter_api/manifest.xml b/mod/twitter_api/manifest.xml
index 51306c98e..38b1dc9a7 100644
--- a/mod/twitter_api/manifest.xml
+++ b/mod/twitter_api/manifest.xml
@@ -4,7 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<description>Allows users to authenticate their Elgg account with Twitter.</description>
-	<category>service</category>
+	<category>api</category>
 	<category>bundled</category>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml
index 5fffb0d2b..df0a7cb58 100644
--- a/mod/uservalidationbyemail/manifest.xml
+++ b/mod/uservalidationbyemail/manifest.xml
@@ -4,6 +4,7 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
+	<category>security</category>
 	<description>Simple user account validation via email.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml
index 0384df743..ecbff85fe 100644
--- a/mod/zaudio/manifest.xml
+++ b/mod/zaudio/manifest.xml
@@ -4,7 +4,8 @@
 	<author>Core developers</author>
 	<version>1.8</version>
 	<category>bundled</category>
-	<category>extension</category>
+	<category>enhancement</category>
+	<category>multimedia</category>
 	<description>This simple plugin lets users play mp3's in the page.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
diff --git a/pages/account/forgotten_password.php b/pages/account/forgotten_password.php
index 93d786e22..bf6ef87e0 100644
--- a/pages/account/forgotten_password.php
+++ b/pages/account/forgotten_password.php
@@ -6,8 +6,6 @@
  * @subpackage Registration
  */
 
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
 if (elgg_is_logged_in()) {
 	forward();
 }
@@ -15,7 +13,9 @@ if (elgg_is_logged_in()) {
 $title = elgg_echo("user:password:lost");
 $content = elgg_view_title($title);
 
-$content .= elgg_view_form('user/requestnewpassword');
+$content .= elgg_view_form('user/requestnewpassword', array(
+	'class' => 'elgg-form-account',
+));
 
 $body = elgg_view_layout("one_column", array('content' => $content));
 
diff --git a/pages/account/register.php b/pages/account/register.php
index 58544ef49..5eb2b4001 100644
--- a/pages/account/register.php
+++ b/pages/account/register.php
@@ -35,7 +35,10 @@ $register_url = elgg_get_site_url() . 'action/register';
 if (elgg_get_config('https_login')) {
 	$register_url = str_replace("http:", "https:", $register_url);
 }
-$form_params = array('action' => $register_url);
+$form_params = array(
+	'action' => $register_url,
+	'class' => 'elgg-form-account float',
+);
 
 $body_params = array(
 	'friend_guid' => $friend_guid,
@@ -43,6 +46,8 @@ $body_params = array(
 );
 $content .= elgg_view_form('register', $form_params, $body_params);
 
+$content .= elgg_view('help/register');
+
 $body = elgg_view_layout("one_column", array('content' => $content));
 
 echo elgg_view_page($title, $body);
diff --git a/pages/account/reset_password.php b/pages/account/reset_password.php
new file mode 100644
index 000000000..6515bfc5d
--- /dev/null
+++ b/pages/account/reset_password.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Page for resetting a forgotten password
+ *
+ * @package Elgg.Core
+ * @subpackage Registration
+ */
+
+if (elgg_is_logged_in()) {
+	forward();
+}
+
+$user_guid = get_input('u');
+$code = get_input('c');
+
+$user = get_entity($user_guid);
+
+// don't check code here to avoid automated attacks
+if (!$user instanceof ElggUser) {
+	register_error(elgg_echo('user:passwordreset:unknown_user'));
+	forward();
+}
+
+$params = array(
+	'guid' => $user_guid,
+	'code' => $code,
+);
+$form = elgg_view_form('user/passwordreset', array('class' => 'elgg-form-account'), $params);
+
+$title = elgg_echo('resetpassword');
+$content = elgg_view_title(elgg_echo('resetpassword')) . $form;
+
+$body = elgg_view_layout('one_column', array('content' => $content));
+
+echo elgg_view_page($title, $body);
diff --git a/pages/dashboard.php b/pages/dashboard.php
deleted file mode 100644
index 31cc9087d..000000000
--- a/pages/dashboard.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Elgg dashboard
- *
- * @package Elgg
- * @subpackage Core
- */
-
-// Ensure that only logged-in users can see this page
-gatekeeper();
-
-// Set context and title
-elgg_set_context('dashboard');
-elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
-$title = elgg_echo('dashboard');
-
-// wrap intro message in a div
-$intro_message = elgg_view('core/dashboard/blurb');
-
-$params = array(
-	'content' => $intro_message,
-	'num_columns' => 3,
-	'show_access' => false,
-);
-$widgets = elgg_view_layout('widgets', $params);
-
-$body = elgg_view_layout('one_column', array('content' => $widgets));
-
-echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/upgrade.php b/upgrade.php
index eee26e793..ab769f542 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -29,7 +29,7 @@ if (get_input('upgrade') == 'upgrade') {
 } else {
 	// if upgrading from < 1.8.0, check for the core view 'welcome' and bail if it's found.
 	// see http://trac.elgg.org/ticket/3064
-	// we're checking the exact view location because it's likely themes will have this view.
+	// we're not checking the exact view location because it's likely themes will have this view.
 	// we're only concerned with core.
 	$welcome = dirname(__FILE__) . '/views/default/welcome.php';
 	if (file_exists($welcome)) {
diff --git a/vendors/jquery/jquery.form.js b/vendors/jquery/jquery.form.js
index c027f19c0..c0fba53cf 100644
--- a/vendors/jquery/jquery.form.js
+++ b/vendors/jquery/jquery.form.js
@@ -1,7 +1,7 @@
-/*
+/*!
  * jQuery Form Plugin
- * version: 2.28 (10-MAY-2009)
- * @requires jQuery v1.2.2 or later
+ * version: 2.73 (03-MAY-2011)
+ * @requires jQuery v1.3.2 or later
  *
  * Examples and documentation at: http://malsup.com/jquery/form/
  * Dual licensed under the MIT and GPL licenses:
@@ -11,32 +11,32 @@
 ;(function($) {
 
 /*
-    Usage Note:
-    -----------
-    Do not use both ajaxSubmit and ajaxForm on the same form.  These
-    functions are intended to be exclusive.  Use ajaxSubmit if you want
-    to bind your own submit handler to the form.  For example,
-
-    $(document).ready(function() {
-        $('#myForm').bind('submit', function() {
-            $(this).ajaxSubmit({
-                target: '#output'
-            });
-            return false; // <-- important!
-        });
-    });
-
-    Use ajaxForm when you want the plugin to manage all the event binding
-    for you.  For example,
-
-    $(document).ready(function() {
-        $('#myForm').ajaxForm({
-            target: '#output'
-        });
-    });
-
-    When using ajaxForm, the ajaxSubmit function will be invoked for you
-    at the appropriate time.
+	Usage Note:
+	-----------
+	Do not use both ajaxSubmit and ajaxForm on the same form.  These
+	functions are intended to be exclusive.  Use ajaxSubmit if you want
+	to bind your own submit handler to the form.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').bind('submit', function(e) {
+			e.preventDefault(); // <-- important
+			$(this).ajaxSubmit({
+				target: '#output'
+			});
+		});
+	});
+
+	Use ajaxForm when you want the plugin to manage all the event binding
+	for you.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').ajaxForm({
+			target: '#output'
+		});
+	});
+
+	When using ajaxForm, the ajaxSubmit function will be invoked for you
+	at the appropriate time.
 */
 
 /**
@@ -44,304 +44,426 @@
  * an HTML form using AJAX.
  */
 $.fn.ajaxSubmit = function(options) {
-    // fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
-    if (!this.length) {
-        log('ajaxSubmit: skipping submit process - no element selected');
-        return this;
-    }
-
-    if (typeof options == 'function')
-        options = { success: options };
-
-    var url = $.trim(this.attr('action'));
-    if (url) {
-	    // clean url (don't include hash vaue)
-	    url = (url.match(/^([^#]+)/)||[])[1];
-   	}
-   	url = url || window.location.href || ''
-
-    options = $.extend({
-        url:  url,
-        type: this.attr('method') || 'GET'
-    }, options || {});
-
-    // hook for manipulating the form data before it is extracted;
-    // convenient for use with rich editors like tinyMCE or FCKEditor
-    var veto = {};
-    this.trigger('form-pre-serialize', [this, options, veto]);
-    if (veto.veto) {
-        log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
-        return this;
-    }
-
-    // provide opportunity to alter form data before it is serialized
-    if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
-        log('ajaxSubmit: submit aborted via beforeSerialize callback');
-        return this;
-    }
-
-    var a = this.formToArray(options.semantic);
-    if (options.data) {
-        options.extraData = options.data;
-        for (var n in options.data) {
-          if(options.data[n] instanceof Array) {
-            for (var k in options.data[n])
-              a.push( { name: n, value: options.data[n][k] } );
-          }
-          else
-             a.push( { name: n, value: options.data[n] } );
-        }
-    }
-
-    // give pre-submit callback an opportunity to abort the submit
-    if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
-        log('ajaxSubmit: submit aborted via beforeSubmit callback');
-        return this;
-    }
-
-    // fire vetoable 'validate' event
-    this.trigger('form-submit-validate', [a, this, options, veto]);
-    if (veto.veto) {
-        log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
-        return this;
-    }
-
-    var q = $.param(a);
-
-    if (options.type.toUpperCase() == 'GET') {
-        options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
-        options.data = null;  // data is null for 'get'
-    }
-    else
-        options.data = q; // data is the query string for 'post'
-
-    var $form = this, callbacks = [];
-    if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
-    if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
-
-    // perform a load on the target only if dataType is not provided
-    if (!options.dataType && options.target) {
-        var oldSuccess = options.success || function(){};
-        callbacks.push(function(data) {
-            $(options.target).html(data).each(oldSuccess, arguments);
-        });
-    }
-    else if (options.success)
-        callbacks.push(options.success);
-
-    options.success = function(data, status) {
-        for (var i=0, max=callbacks.length; i < max; i++)
-            callbacks[i].apply(options, [data, status, $form]);
-    };
-
-    // are there files to upload?
-    var files = $('input:file', this).fieldValue();
-    var found = false;
-    for (var j=0; j < files.length; j++)
-        if (files[j])
-            found = true;
-
-	var multipart = false;
-//	var mp = 'multipart/form-data';
-//	multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
-
-    // options.iframe allows user to force iframe mode
-   if (options.iframe || found || multipart) {
-       // hack to fix Safari hang (thanks to Tim Molendijk for this)
-       // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
-       if (options.closeKeepAlive)
-           $.get(options.closeKeepAlive, fileUpload);
-       else
-           fileUpload();
-       }
-   else
-       $.ajax(options);
-
-    // fire 'notify' event
-    this.trigger('form-submit-notify', [this, options]);
-    return this;
-
-
-    // private function for handling file uploads (hat tip to YAHOO!)
-    function fileUpload() {
-        var form = $form[0];
-
-        if ($(':input[name=submit]', form).length) {
-            alert('Error: Form elements must not be named "submit".');
-            return;
-        }
-
-        var opts = $.extend({}, $.ajaxSettings, options);
-		var s = $.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
-
-        var id = 'jqFormIO' + (new Date().getTime());
-        var $io = $('<iframe id="' + id + '" name="' + id + '" src="about:blank" />');
-        var io = $io[0];
-
-        $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
-
-        var xhr = { // mock object
-            aborted: 0,
-            responseText: null,
-            responseXML: null,
-            status: 0,
-            statusText: 'n/a',
-            getAllResponseHeaders: function() {},
-            getResponseHeader: function() {},
-            setRequestHeader: function() {},
-            abort: function() {
-                this.aborted = 1;
-                $io.attr('src','about:blank'); // abort op in progress
-            }
-        };
-
-        var g = opts.global;
-        // trigger ajax global events so that activity/block indicators work like normal
-        if (g && ! $.active++) $.event.trigger("ajaxStart");
-        if (g) $.event.trigger("ajaxSend", [xhr, opts]);
-
-		if (s.beforeSend && s.beforeSend(xhr, s) === false) {
-			s.global && $.active--;
+	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+	if (!this.length) {
+		log('ajaxSubmit: skipping submit process - no element selected');
+		return this;
+	}
+
+	if (typeof options == 'function') {
+		options = { success: options };
+	}
+
+	var action = this.attr('action');
+	var url = (typeof action === 'string') ? $.trim(action) : '';
+	if (url) {
+		// clean url (don't include hash vaue)
+		url = (url.match(/^([^#]+)/)||[])[1];
+	}
+	url = url || window.location.href || '';
+
+	options = $.extend(true, {
+		url:  url,
+		success: $.ajaxSettings.success,
+		type: this[0].getAttribute('method') || 'GET', // IE7 massage (see issue 57)
+		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+	}, options);
+
+	// hook for manipulating the form data before it is extracted;
+	// convenient for use with rich editors like tinyMCE or FCKEditor
+	var veto = {};
+	this.trigger('form-pre-serialize', [this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+		return this;
+	}
+
+	// provide opportunity to alter form data before it is serialized
+	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSerialize callback');
+		return this;
+	}
+
+	var n,v,a = this.formToArray(options.semantic);
+	if (options.data) {
+		options.extraData = options.data;
+		for (n in options.data) {
+			if(options.data[n] instanceof Array) {
+				for (var k in options.data[n]) {
+					a.push( { name: n, value: options.data[n][k] } );
+				}
+			}
+			else {
+				v = options.data[n];
+				v = $.isFunction(v) ? v() : v; // if value is fn, invoke it
+				a.push( { name: n, value: v } );
+			}
+		}
+	}
+
+	// give pre-submit callback an opportunity to abort the submit
+	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSubmit callback');
+		return this;
+	}
+
+	// fire vetoable 'validate' event
+	this.trigger('form-submit-validate', [a, this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+		return this;
+	}
+
+	var q = $.param(a);
+
+	if (options.type.toUpperCase() == 'GET') {
+		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+		options.data = null;  // data is null for 'get'
+	}
+	else {
+		options.data = q; // data is the query string for 'post'
+	}
+
+	var $form = this, callbacks = [];
+	if (options.resetForm) {
+		callbacks.push(function() { $form.resetForm(); });
+	}
+	if (options.clearForm) {
+		callbacks.push(function() { $form.clearForm(); });
+	}
+
+	// perform a load on the target only if dataType is not provided
+	if (!options.dataType && options.target) {
+		var oldSuccess = options.success || function(){};
+		callbacks.push(function(data) {
+			var fn = options.replaceTarget ? 'replaceWith' : 'html';
+			$(options.target)[fn](data).each(oldSuccess, arguments);
+		});
+	}
+	else if (options.success) {
+		callbacks.push(options.success);
+	}
+
+	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+		var context = options.context || options;   // jQuery 1.4+ supports scope context 
+		for (var i=0, max=callbacks.length; i < max; i++) {
+			callbacks[i].apply(context, [data, status, xhr || $form, $form]);
+		}
+	};
+
+	// are there files to upload?
+	var fileInputs = $('input:file', this).length > 0;
+	var mp = 'multipart/form-data';
+	var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+	// options.iframe allows user to force iframe mode
+	// 06-NOV-09: now defaulting to iframe mode if file input is detected
+   if (options.iframe !== false && (fileInputs || options.iframe || multipart)) {
+	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
+	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+	   if (options.closeKeepAlive) {
+		   $.get(options.closeKeepAlive, fileUpload);
+		}
+	   else {
+		   fileUpload();
+		}
+   }
+   else {
+		$.ajax(options);
+   }
+
+	// fire 'notify' event
+	this.trigger('form-submit-notify', [this, options]);
+	return this;
+
+
+	// private function for handling file uploads (hat tip to YAHOO!)
+	function fileUpload() {
+		var form = $form[0];
+
+		if ($(':input[name=submit],:input[id=submit]', form).length) {
+			// if there is an input with a name or id of 'submit' then we won't be
+			// able to invoke the submit fn on the form (at least not x-browser)
+			alert('Error: Form elements must not have name or id of "submit".');
+			return;
+		}
+		
+		var s = $.extend(true, {}, $.ajaxSettings, options);
+		s.context = s.context || s;
+		var id = 'jqFormIO' + (new Date().getTime()), fn = '_'+id;
+		var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ s.iframeSrc +'" />');
+		var io = $io[0];
+
+		$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+
+		var xhr = { // mock object
+			aborted: 0,
+			responseText: null,
+			responseXML: null,
+			status: 0,
+			statusText: 'n/a',
+			getAllResponseHeaders: function() {},
+			getResponseHeader: function() {},
+			setRequestHeader: function() {},
+			abort: function(status) {
+				var e = (status === 'timeout' ? 'timeout' : 'aborted');
+				log('aborting upload... ' + e);
+				this.aborted = 1;
+				$io.attr('src', s.iframeSrc); // abort op in progress
+				xhr.error = e;
+				s.error && s.error.call(s.context, xhr, e, e);
+				g && $.event.trigger("ajaxError", [xhr, s, e]);
+				s.complete && s.complete.call(s.context, xhr, e);
+			}
+		};
+
+		var g = s.global;
+		// trigger ajax global events so that activity/block indicators work like normal
+		if (g && ! $.active++) {
+			$.event.trigger("ajaxStart");
+		}
+		if (g) {
+			$.event.trigger("ajaxSend", [xhr, s]);
+		}
+
+		if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
+			if (s.global) { 
+				$.active--;
+			}
 			return;
-        }
-        if (xhr.aborted)
-            return;
-
-        var cbInvoked = 0;
-        var timedOut = 0;
-
-        // add submitting element to data if we know it
-        var sub = form.clk;
-        if (sub) {
-            var n = sub.name;
-            if (n && !sub.disabled) {
-                options.extraData = options.extraData || {};
-                options.extraData[n] = sub.value;
-                if (sub.type == "image") {
-                    options.extraData[name+'.x'] = form.clk_x;
-                    options.extraData[name+'.y'] = form.clk_y;
-                }
-            }
-        }
-
-        // take a breath so that pending repaints get some cpu time before the upload starts
-        setTimeout(function() {
-            // make sure form attrs are set
-            var t = $form.attr('target'), a = $form.attr('action');
+		}
+		if (xhr.aborted) {
+			return;
+		}
+
+		var timedOut = 0, timeoutHandle;
+
+		// add submitting element to data if we know it
+		var sub = form.clk;
+		if (sub) {
+			var n = sub.name;
+			if (n && !sub.disabled) {
+				s.extraData = s.extraData || {};
+				s.extraData[n] = sub.value;
+				if (sub.type == "image") {
+					s.extraData[n+'.x'] = form.clk_x;
+					s.extraData[n+'.y'] = form.clk_y;
+				}
+			}
+		}
+
+		// take a breath so that pending repaints get some cpu time before the upload starts
+		function doSubmit() {
+			// make sure form attrs are set
+			var t = $form.attr('target'), a = $form.attr('action');
 
 			// update form attrs in IE friendly way
 			form.setAttribute('target',id);
-			if (form.getAttribute('method') != 'POST')
+			if (form.getAttribute('method') != 'POST') {
 				form.setAttribute('method', 'POST');
-			if (form.getAttribute('action') != opts.url)
-				form.setAttribute('action', opts.url);
-
-            // ie borks in some cases when setting encoding
-            if (! options.skipEncodingOverride) {
-                $form.attr({
-                    encoding: 'multipart/form-data',
-                    enctype:  'multipart/form-data'
-                });
-            }
-
-            // support timout
-            if (opts.timeout)
-                setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
-
-            // add "extra" data to form if provided in options
-            var extraInputs = [];
-            try {
-                if (options.extraData)
-                    for (var n in options.extraData)
-                        extraInputs.push(
-                            $('<input type="hidden" name="'+n+'" value="'+options.extraData[n]+'" />')
-                                .appendTo(form)[0]);
-
-                // add iframe to doc and submit the form
-                $io.appendTo('body');
+			}
+			if (form.getAttribute('action') != s.url) {
+				form.setAttribute('action', s.url);
+			}
+
+			// ie borks in some cases when setting encoding
+			if (! s.skipEncodingOverride) {
+				$form.attr({
+					encoding: 'multipart/form-data',
+					enctype:  'multipart/form-data'
+				});
+			}
+
+			// support timout
+			if (s.timeout) {
+				timeoutHandle = setTimeout(function() { timedOut = true; cb(true); }, s.timeout);
+			}
+
+			// add "extra" data to form if provided in options
+			var extraInputs = [];
+			try {
+				if (s.extraData) {
+					for (var n in s.extraData) {
+						extraInputs.push(
+							$('<input type="hidden" name="'+n+'" value="'+s.extraData[n]+'" />')
+								.appendTo(form)[0]);
+					}
+				}
+
+				// add iframe to doc and submit the form
+				$io.appendTo('body');
                 io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
-                form.submit();
-            }
-            finally {
-                // reset attrs and remove "extra" input elements
+				form.submit();
+			}
+			finally {
+				// reset attrs and remove "extra" input elements
 				form.setAttribute('action',a);
-                t ? form.setAttribute('target', t) : $form.removeAttr('target');
-                $(extraInputs).remove();
-            }
-        }, 10);
-
-        var nullCheckFlag = 0;
-
-        function cb() {
-            if (cbInvoked++) return;
-
+				if(t) {
+					form.setAttribute('target', t);
+				} else {
+					$form.removeAttr('target');
+				}
+				$(extraInputs).remove();
+			}
+		}
+
+		if (s.forceSync) {
+			doSubmit();
+		}
+		else {
+			setTimeout(doSubmit, 10); // this lets dom updates render
+		}
+	
+		var data, doc, domCheckCount = 50, callbackProcessed;
+
+		function cb(e) {
+			if (xhr.aborted || callbackProcessed) {
+				return;
+			}
+			if (e === true && xhr) {
+				xhr.abort('timeout');
+				return;
+			}
+			
+			var doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+			if (!doc || doc.location.href == s.iframeSrc) {
+				// response not received yet
+				if (!timedOut)
+					return;
+			}
             io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
 
-            var ok = true;
-            try {
-                if (timedOut) throw 'timeout';
-                // extract the server response from the iframe
-                var data, doc;
-
-                doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
-
-                if ((doc.body == null || doc.body.innerHTML == '') && !nullCheckFlag) {
-                    // in some browsers (cough, Opera 9.2.x) the iframe DOM is not always traversable when
-                    // the onload callback fires, so we give them a 2nd chance
-                    nullCheckFlag = 1;
-                    cbInvoked--;
-                    setTimeout(cb, 100);
-                    return;
-                }
-
-                xhr.responseText = doc.body ? doc.body.innerHTML : null;
-                xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
-                xhr.getResponseHeader = function(header){
-                    var headers = {'content-type': opts.dataType};
-                    return headers[header];
-                };
-
-                if (opts.dataType == 'json' || opts.dataType == 'script') {
-                    var ta = doc.getElementsByTagName('textarea')[0];
-                    xhr.responseText = ta ? ta.value : xhr.responseText;
-                }
-                else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
-                    xhr.responseXML = toXml(xhr.responseText);
-                }
-                data = $.httpData(xhr, opts.dataType);
-            }
-            catch(e){
-                ok = false;
-                $.handleError(opts, xhr, 'error', e);
-            }
-
-            // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
-            if (ok) {
-                opts.success(data, 'success');
-                if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
-            }
-            if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
-            if (g && ! --$.active) $.event.trigger("ajaxStop");
-            if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
-
-            // clean up
-            setTimeout(function() {
-                $io.remove();
-                xhr.responseXML = null;
-            }, 100);
-        };
-
-        function toXml(s, doc) {
-            if (window.ActiveXObject) {
-                doc = new ActiveXObject('Microsoft.XMLDOM');
-                doc.async = 'false';
-                doc.loadXML(s);
-            }
-            else
-                doc = (new DOMParser()).parseFromString(s, 'text/xml');
-            return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
-        };
-    };
+			var ok = true;
+			try {
+				if (timedOut) {
+					throw 'timeout';
+				}
+
+				var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+				log('isXml='+isXml);
+				if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
+					if (--domCheckCount) {
+						// in some browsers (Opera) the iframe DOM is not always traversable when
+						// the onload callback fires, so we loop a bit to accommodate
+						log('requeing onLoad callback, DOM not available');
+						setTimeout(cb, 250);
+						return;
+					}
+					// let this fall through because server response could be an empty document
+					//log('Could not access iframe DOM after mutiple tries.');
+					//throw 'DOMException: not available';
+				}
+
+				//log('response detected');
+				xhr.responseText = doc.body ? doc.body.innerHTML : doc.documentElement ? doc.documentElement.innerHTML : null; 
+				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+				if (isXml)
+					s.dataType = 'xml';
+				xhr.getResponseHeader = function(header){
+					var headers = {'content-type': s.dataType};
+					return headers[header];
+				};
+
+				var scr = /(json|script|text)/.test(s.dataType);
+				if (scr || s.textarea) {
+					// see if user embedded response in textarea
+					var ta = doc.getElementsByTagName('textarea')[0];
+					if (ta) {
+						xhr.responseText = ta.value;
+					}
+					else if (scr) {
+						// account for browsers injecting pre around json response
+						var pre = doc.getElementsByTagName('pre')[0];
+						var b = doc.getElementsByTagName('body')[0];
+						if (pre) {
+							xhr.responseText = pre.textContent;
+						}
+						else if (b) {
+							xhr.responseText = b.innerHTML;
+						}
+					}			  
+				}
+				else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+					xhr.responseXML = toXml(xhr.responseText);
+				}
+				
+				data = httpData(xhr, s.dataType, s);
+			}
+			catch(e){
+				log('error caught:',e);
+				ok = false;
+				xhr.error = e;
+				s.error && s.error.call(s.context, xhr, 'error', e);
+				g && $.event.trigger("ajaxError", [xhr, s, e]);
+			}
+			
+			if (xhr.aborted) {
+				log('upload aborted');
+				ok = false;
+			}
+
+			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+			if (ok) {
+				s.success && s.success.call(s.context, data, 'success', xhr);
+				g && $.event.trigger("ajaxSuccess", [xhr, s]);
+			}
+			
+			g && $.event.trigger("ajaxComplete", [xhr, s]);
+
+			if (g && ! --$.active) {
+				$.event.trigger("ajaxStop");
+			}
+			
+			s.complete && s.complete.call(s.context, xhr, ok ? 'success' : 'error');
+
+			callbackProcessed = true;
+			if (s.timeout)
+				clearTimeout(timeoutHandle);
+
+			// clean up
+			setTimeout(function() {
+				$io.removeData('form-plugin-onload');
+				$io.remove();
+				xhr.responseXML = null;
+			}, 100);
+		}
+
+		var toXml = $.parseXML || function(s, doc) { // use parseXML if available (jQuery 1.5+)
+			if (window.ActiveXObject) {
+				doc = new ActiveXObject('Microsoft.XMLDOM');
+				doc.async = 'false';
+				doc.loadXML(s);
+			}
+			else {
+				doc = (new DOMParser()).parseFromString(s, 'text/xml');
+			}
+			return (doc && doc.documentElement && doc.documentElement.nodeName != 'parsererror') ? doc : null;
+		};
+		var parseJSON = $.parseJSON || function(s) {
+			return window['eval']('(' + s + ')');
+		};
+		
+		var httpData = function( xhr, type, s ) { // mostly lifted from jq1.4.4
+			var ct = xhr.getResponseHeader('content-type') || '',
+				xml = type === 'xml' || !type && ct.indexOf('xml') >= 0,
+				data = xml ? xhr.responseXML : xhr.responseText;
+
+			if (xml && data.documentElement.nodeName === 'parsererror') {
+				$.error && $.error('parsererror');
+			}
+			if (s && s.dataFilter) {
+				data = s.dataFilter(data, type);
+			}
+			if (typeof data === 'string') {
+				if (type === 'json' || !type && ct.indexOf('json') >= 0) {
+					data = parseJSON(data);
+				} else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
+					$.globalEval(data);
+				}
+			}
+			return data;
+		};
+	}
 };
 
 /**
@@ -350,9 +472,9 @@ $.fn.ajaxSubmit = function(options) {
  * The advantages of using this method instead of ajaxSubmit() are:
  *
  * 1: This method will include coordinates for <input type="image" /> elements (if the element
- *    is used to submit the form).
+ *	is used to submit the form).
  * 2. This method will include the submit element's name/value data (for the element that was
- *    used to submit the form).
+ *	used to submit the form).
  * 3. This method binds the submit() method to the form for you.
  *
  * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
@@ -360,40 +482,60 @@ $.fn.ajaxSubmit = function(options) {
  * the form itself.
  */
 $.fn.ajaxForm = function(options) {
-    return this.ajaxFormUnbind().bind('submit.form-plugin',function() {
-        $(this).ajaxSubmit(options);
-        return false;
-    }).each(function() {
-        // store options in hash
-        $(":submit,input:image", this).bind('click.form-plugin',function(e) {
-            var form = this.form;
-            form.clk = this;
-            if (this.type == 'image') {
-                if (e.offsetX != undefined) {
-                    form.clk_x = e.offsetX;
-                    form.clk_y = e.offsetY;
-                } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
-                    var offset = $(this).offset();
-                    form.clk_x = e.pageX - offset.left;
-                    form.clk_y = e.pageY - offset.top;
-                } else {
-                    form.clk_x = e.pageX - this.offsetLeft;
-                    form.clk_y = e.pageY - this.offsetTop;
-                }
-            }
-            // clear form vars
-            setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 10);
-        });
-    });
+	// in jQuery 1.3+ we can fix mistakes with the ready state
+	if (this.length === 0) {
+		var o = { s: this.selector, c: this.context };
+		if (!$.isReady && o.s) {
+			log('DOM not ready, queuing ajaxForm');
+			$(function() {
+				$(o.s,o.c).ajaxForm(options);
+			});
+			return this;
+		}
+		// is your DOM ready?  http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
+		log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
+		return this;
+	}
+	
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
+		if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
+			e.preventDefault();
+			$(this).ajaxSubmit(options);
+		}
+	}).bind('click.form-plugin', function(e) {
+		var target = e.target;
+		var $el = $(target);
+		if (!($el.is(":submit,input:image"))) {
+			// is this a child element of the submit el?  (ex: a span within a button)
+			var t = $el.closest(':submit');
+			if (t.length == 0) {
+				return;
+			}
+			target = t[0];
+		}
+		var form = this;
+		form.clk = target;
+		if (target.type == 'image') {
+			if (e.offsetX != undefined) {
+				form.clk_x = e.offsetX;
+				form.clk_y = e.offsetY;
+			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+				var offset = $el.offset();
+				form.clk_x = e.pageX - offset.left;
+				form.clk_y = e.pageY - offset.top;
+			} else {
+				form.clk_x = e.pageX - target.offsetLeft;
+				form.clk_y = e.pageY - target.offsetTop;
+			}
+		}
+		// clear form vars
+		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
+	});
 };
 
 // ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
 $.fn.ajaxFormUnbind = function() {
-    this.unbind('submit.form-plugin');
-    return this.each(function() {
-        $(":submit,input:image", this).unbind('click.form-plugin');
-    });
-
+	return this.unbind('submit.form-plugin click.form-plugin');
 };
 
 /**
@@ -408,44 +550,55 @@ $.fn.ajaxFormUnbind = function() {
  * ajaxSubmit() and ajaxForm() methods.
  */
 $.fn.formToArray = function(semantic) {
-    var a = [];
-    if (this.length == 0) return a;
-
-    var form = this[0];
-    var els = semantic ? form.getElementsByTagName('*') : form.elements;
-    if (!els) return a;
-    for(var i=0, max=els.length; i < max; i++) {
-        var el = els[i];
-        var n = el.name;
-        if (!n) continue;
-
-        if (semantic && form.clk && el.type == "image") {
-            // handle image inputs on the fly when semantic == true
-            if(!el.disabled && form.clk == el) {
-            	a.push({name: n, value: $(el).val()});
-                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
-            }
-            continue;
-        }
-
-        var v = $.fieldValue(el, true);
-        if (v && v.constructor == Array) {
-            for(var j=0, jmax=v.length; j < jmax; j++)
-                a.push({name: n, value: v[j]});
-        }
-        else if (v !== null && typeof v != 'undefined')
-            a.push({name: n, value: v});
-    }
-
-    if (!semantic && form.clk) {
-        // input type=='image' are not found in elements array! handle it here
-        var $input = $(form.clk), input = $input[0], n = input.name;
-        if (n && !input.disabled && input.type == 'image') {
-        	a.push({name: n, value: $input.val()});
-            a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
-        }
-    }
-    return a;
+	var a = [];
+	if (this.length === 0) {
+		return a;
+	}
+
+	var form = this[0];
+	var els = semantic ? form.getElementsByTagName('*') : form.elements;
+	if (!els) {
+		return a;
+	}
+	
+	var i,j,n,v,el,max,jmax;
+	for(i=0, max=els.length; i < max; i++) {
+		el = els[i];
+		n = el.name;
+		if (!n) {
+			continue;
+		}
+
+		if (semantic && form.clk && el.type == "image") {
+			// handle image inputs on the fly when semantic == true
+			if(!el.disabled && form.clk == el) {
+				a.push({name: n, value: $(el).val()});
+				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+			}
+			continue;
+		}
+
+		v = $.fieldValue(el, true);
+		if (v && v.constructor == Array) {
+			for(j=0, jmax=v.length; j < jmax; j++) {
+				a.push({name: n, value: v[j]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: n, value: v});
+		}
+	}
+
+	if (!semantic && form.clk) {
+		// input type=='image' are not found in elements array! handle it here
+		var $input = $(form.clk), input = $input[0];
+		n = input.name;
+		if (n && !input.disabled && input.type == 'image') {
+			a.push({name: n, value: $input.val()});
+			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+		}
+	}
+	return a;
 };
 
 /**
@@ -453,8 +606,8 @@ $.fn.formToArray = function(semantic) {
  * in the format: name1=value1&amp;name2=value2
  */
 $.fn.formSerialize = function(semantic) {
-    //hand off to jQuery.param for proper encoding
-    return $.param(this.formToArray(semantic));
+	//hand off to jQuery.param for proper encoding
+	return $.param(this.formToArray(semantic));
 };
 
 /**
@@ -462,32 +615,36 @@ $.fn.formSerialize = function(semantic) {
  * This method will return a string in the format: name1=value1&amp;name2=value2
  */
 $.fn.fieldSerialize = function(successful) {
-    var a = [];
-    this.each(function() {
-        var n = this.name;
-        if (!n) return;
-        var v = $.fieldValue(this, successful);
-        if (v && v.constructor == Array) {
-            for (var i=0,max=v.length; i < max; i++)
-                a.push({name: n, value: v[i]});
-        }
-        else if (v !== null && typeof v != 'undefined')
-            a.push({name: this.name, value: v});
-    });
-    //hand off to jQuery.param for proper encoding
-    return $.param(a);
+	var a = [];
+	this.each(function() {
+		var n = this.name;
+		if (!n) {
+			return;
+		}
+		var v = $.fieldValue(this, successful);
+		if (v && v.constructor == Array) {
+			for (var i=0,max=v.length; i < max; i++) {
+				a.push({name: n, value: v[i]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: this.name, value: v});
+		}
+	});
+	//hand off to jQuery.param for proper encoding
+	return $.param(a);
 };
 
 /**
  * Returns the value(s) of the element in the matched set.  For example, consider the following form:
  *
  *  <form><fieldset>
- *      <input name="A" type="text" />
- *      <input name="A" type="text" />
- *      <input name="B" type="checkbox" value="B1" />
- *      <input name="B" type="checkbox" value="B2"/>
- *      <input name="C" type="radio" value="C1" />
- *      <input name="C" type="radio" value="C2" />
+ *	  <input name="A" type="text" />
+ *	  <input name="A" type="text" />
+ *	  <input name="B" type="checkbox" value="B1" />
+ *	  <input name="B" type="checkbox" value="B2"/>
+ *	  <input name="C" type="radio" value="C1" />
+ *	  <input name="C" type="radio" value="C2" />
  *  </fieldset></form>
  *
  *  var v = $(':text').fieldValue();
@@ -514,51 +671,60 @@ $.fn.fieldSerialize = function(successful) {
  * for each element is returned.
  *
  * Note: This method *always* returns an array.  If no valid value can be determined the
- *       array will be empty, otherwise it will contain one or more values.
+ *	   array will be empty, otherwise it will contain one or more values.
  */
 $.fn.fieldValue = function(successful) {
-    for (var val=[], i=0, max=this.length; i < max; i++) {
-        var el = this[i];
-        var v = $.fieldValue(el, successful);
-        if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
-            continue;
-        v.constructor == Array ? $.merge(val, v) : val.push(v);
-    }
-    return val;
+	for (var val=[], i=0, max=this.length; i < max; i++) {
+		var el = this[i];
+		var v = $.fieldValue(el, successful);
+		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
+			continue;
+		}
+		v.constructor == Array ? $.merge(val, v) : val.push(v);
+	}
+	return val;
 };
 
 /**
  * Returns the value of the field element.
  */
 $.fieldValue = function(el, successful) {
-    var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
-    if (typeof successful == 'undefined') successful = true;
-
-    if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
-        (t == 'checkbox' || t == 'radio') && !el.checked ||
-        (t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
-        tag == 'select' && el.selectedIndex == -1))
-            return null;
-
-    if (tag == 'select') {
-        var index = el.selectedIndex;
-        if (index < 0) return null;
-        var a = [], ops = el.options;
-        var one = (t == 'select-one');
-        var max = (one ? index+1 : ops.length);
-        for(var i=(one ? index : 0); i < max; i++) {
-            var op = ops[i];
-            if (op.selected) {
+	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+	if (successful === undefined) {
+		successful = true;
+	}
+
+	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+		(t == 'checkbox' || t == 'radio') && !el.checked ||
+		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+		tag == 'select' && el.selectedIndex == -1)) {
+			return null;
+	}
+
+	if (tag == 'select') {
+		var index = el.selectedIndex;
+		if (index < 0) {
+			return null;
+		}
+		var a = [], ops = el.options;
+		var one = (t == 'select-one');
+		var max = (one ? index+1 : ops.length);
+		for(var i=(one ? index : 0); i < max; i++) {
+			var op = ops[i];
+			if (op.selected) {
 				var v = op.value;
-				if (!v) // extra pain for IE...
-                	v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
-                if (one) return v;
-                a.push(v);
-            }
-        }
-        return a;
-    }
-    return el.value;
+				if (!v) { // extra pain for IE...
+					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+				}
+				if (one) {
+					return v;
+				}
+				a.push(v);
+			}
+		}
+		return a;
+	}
+	return $(el).val();
 };
 
 /**
@@ -570,46 +736,52 @@ $.fieldValue = function(el, successful) {
  *  - button elements will *not* be effected
  */
 $.fn.clearForm = function() {
-    return this.each(function() {
-        $('input,select,textarea', this).clearFields();
-    });
+	return this.each(function() {
+		$('input,select,textarea', this).clearFields();
+	});
 };
 
 /**
  * Clears the selected form elements.
  */
 $.fn.clearFields = $.fn.clearInputs = function() {
-    return this.each(function() {
-        var t = this.type, tag = this.tagName.toLowerCase();
-        if (t == 'text' || t == 'password' || tag == 'textarea')
-            this.value = '';
-        else if (t == 'checkbox' || t == 'radio')
-            this.checked = false;
-        else if (tag == 'select')
-            this.selectedIndex = -1;
-    });
+	return this.each(function() {
+		var t = this.type, tag = this.tagName.toLowerCase();
+		if (t == 'text' || t == 'password' || tag == 'textarea') {
+			this.value = '';
+		}
+		else if (t == 'checkbox' || t == 'radio') {
+			this.checked = false;
+		}
+		else if (tag == 'select') {
+			this.selectedIndex = -1;
+		}
+	});
 };
 
 /**
  * Resets the form data.  Causes all form elements to be reset to their original value.
  */
 $.fn.resetForm = function() {
-    return this.each(function() {
-        // guard against an input with the name of 'reset'
-        // note that IE reports the reset function as an 'object'
-        if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
-            this.reset();
-    });
+	return this.each(function() {
+		// guard against an input with the name of 'reset'
+		// note that IE reports the reset function as an 'object'
+		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
+			this.reset();
+		}
+	});
 };
 
 /**
  * Enables or disables any matching elements.
  */
 $.fn.enable = function(b) {
-    if (b == undefined) b = true;
-    return this.each(function() {
-        this.disabled = !b;
-    });
+	if (b === undefined) {
+		b = true;
+	}
+	return this.each(function() {
+		this.disabled = !b;
+	});
 };
 
 /**
@@ -617,27 +789,37 @@ $.fn.enable = function(b) {
  * selects/deselects and matching option elements.
  */
 $.fn.selected = function(select) {
-    if (select == undefined) select = true;
-    return this.each(function() {
-        var t = this.type;
-        if (t == 'checkbox' || t == 'radio')
-            this.checked = select;
-        else if (this.tagName.toLowerCase() == 'option') {
-            var $sel = $(this).parent('select');
-            if (select && $sel[0] && $sel[0].type == 'select-one') {
-                // deselect all other options
-                $sel.find('option').selected(false);
-            }
-            this.selected = select;
-        }
-    });
+	if (select === undefined) {
+		select = true;
+	}
+	return this.each(function() {
+		var t = this.type;
+		if (t == 'checkbox' || t == 'radio') {
+			this.checked = select;
+		}
+		else if (this.tagName.toLowerCase() == 'option') {
+			var $sel = $(this).parent('select');
+			if (select && $sel[0] && $sel[0].type == 'select-one') {
+				// deselect all other options
+				$sel.find('option').selected(false);
+			}
+			this.selected = select;
+		}
+	});
 };
 
 // helper fn for console logging
 // set $.fn.ajaxSubmit.debug to true to enable debug logging
 function log() {
-    if ($.fn.ajaxSubmit.debug && window.console && window.console.log)
-        window.console.log('[jquery.form] ' + Array.prototype.join.call(arguments,''));
+	if ($.fn.ajaxSubmit.debug) {
+		var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
+		if (window.console && window.console.log) {
+			window.console.log(msg);
+		}
+		else if (window.opera && window.opera.postError) {
+			window.opera.postError(msg);
+		}
+	}
 };
 
 })(jQuery);
diff --git a/vendors/markdown/UPSTREAM_WARNING b/vendors/markdown/UPSTREAM_WARNING
new file mode 100644
index 000000000..d0a664f2a
--- /dev/null
+++ b/vendors/markdown/UPSTREAM_WARNING
@@ -0,0 +1,5 @@
+This file has been modified from its upstream. When upgrading, be sure to check the following mods:
+
+* Headers can be created with =, ==, etc instead of just #, ##.
+* @todo Autolink (f|ht)tp(s)?://link.com.
+* @todo GFM improvement for newlines:  http://github.github.com/github-flavored-markdown/
\ No newline at end of file
diff --git a/vendors/markdown/markdown.php b/vendors/markdown/markdown.php
index ee3dddbf9..3f1f3a715 100755
--- a/vendors/markdown/markdown.php
+++ b/vendors/markdown/markdown.php
@@ -2246,12 +2246,13 @@ class MarkdownExtra_Parser extends Markdown_Parser {
 		#	...
 		#	###### Header 6   {#header2}
 		#
+		#	@note Added for Elgg: You can use = in place of hashes for atx-style.
 		$text = preg_replace_callback('{
-				^(\#{1,6})	# $1 = string of #\'s
+				^([\#=]{1,6})	# $1 = string of #\'s
 				[ ]*
 				(.+?)		# $2 = Header text
 				[ ]*
-				\#*			# optional closing #\'s (not counted)
+				[\#=]*			# optional closing #\'s (not counted)
 				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})? # id attribute
 				[ ]*
 				\n+
diff --git a/version.php b/version.php
index ae4e01091..9d3bf43e3 100644
--- a/version.php
+++ b/version.php
@@ -11,7 +11,7 @@
 
 // YYYYMMDD = Elgg Date
 // XX = Interim incrementer
-$version = 2011032200;
+$version = 2011061200;
 
 // Human-friendly version name
-$release = '1.8-svn';
+$release = '1.8b1';
diff --git a/views/default/admin/plugin_settings.php b/views/default/admin/plugin_settings.php
index 7473768c0..c75492270 100644
--- a/views/default/admin/plugin_settings.php
+++ b/views/default/admin/plugin_settings.php
@@ -17,7 +17,7 @@ $vars['entity'] = $plugin;
 $settings = false;
 
 if (elgg_view_exists("settings/$plugin_id/edit") || elgg_view_exists("plugins/$plugin_id/settings")) {
-	$title = $plugin->manifest->getName();
+	$title = $plugin->getManifest()->getName();
 
 	$params = array('id' => "$plugin_id-settings");
 	$body = elgg_view_form("plugins/settings/save", $params, $vars);
diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
new file mode 100644
index 000000000..1aa899fcc
--- /dev/null
+++ b/views/default/admin/plugins.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Elgg administration plugin screen
+ *
+ * Shows a list of plugins that can be sorted and filtered.
+ *
+ * @package Elgg.Core
+ * @subpackage Admin.Plugins
+ */
+
+elgg_generate_plugin_entities();
+$installed_plugins = elgg_get_plugins('any');
+$show_category = get_input('category', 'all');
+$sort = get_input('sort', 'priority');
+
+// Get a list of the all categories
+// and trim down the plugin list if we're not viewing all categories.
+// @todo this could be cached somewhere after have the manifest loaded
+$categories = array();
+
+foreach ($installed_plugins as $id => $plugin) {
+	if (!$plugin->isValid()) {
+		continue;
+	}
+
+	$plugin_categories = $plugin->getManifest()->getCategories();
+
+	// handle plugins that don't declare categories
+	// unset them here because this is the list we foreach
+	switch ($show_category) {
+		case 'all':
+			break;
+		case 'active':
+			if (!$plugin->isActive()) {
+				unset($installed_plugins[$id]);
+			}
+			break;
+		case 'inactive':
+			if ($plugin->isActive()) {
+				unset($installed_plugins[$id]);
+			}
+			break;
+		default:
+			if (!in_array($show_category, $plugin_categories)) {
+				unset($installed_plugins[$id]);
+			}
+			break;
+	}
+
+	if (isset($plugin_categories)) {
+		foreach ($plugin_categories as $category) {
+			if (!array_key_exists($category, $categories)) {
+				$categories[$category] = elgg_echo("admin:plugins:category:$category");
+			}
+		}
+	}
+}
+
+$guids = array();
+foreach ($installed_plugins as $plugin) {
+	$guids[] = $plugin->getGUID();
+}
+
+// sort plugins
+switch ($sort) {
+	case 'date':
+		$plugin_list = array();
+		foreach ($installed_plugins as $plugin) {
+			$create_date = $plugin->getTimeCreated();
+			while (isset($plugin_list[$create_date])) {
+				$create_date++;
+			}
+			$plugin_list[$create_date] = $plugin;
+		}
+		krsort($plugin_list);
+		break;
+	case 'alpha':
+		$plugin_list = array();
+		foreach ($installed_plugins as $plugin) {
+			$plugin_list[$plugin->getManifest()->getName()] = $plugin;
+		}
+		ksort($plugin_list);
+		break;
+	case 'priority':
+	default:
+		$plugin_list = $installed_plugins;
+		break;
+}
+
+
+
+asort($categories);
+
+$common_categories = array(
+	'all' => elgg_echo('admin:plugins:category:all'),
+	'active' => elgg_echo('admin:plugins:category:active'),
+	'inactive' => elgg_echo('admin:plugins:category:inactive'),
+);
+
+$categories = array_merge($common_categories, $categories);
+// security - only want a defined option
+if (!array_key_exists($show_category, $categories)) {
+	$show_category = reset($categories);
+}
+
+$category_form = elgg_view_form('admin/plugins/filter', array(
+	'action' => 'admin/plugins',
+	'method' => 'get',
+	'disable_security' => true,
+), array(
+	'category' => $show_category,
+	'category_options' => $categories,
+	'sort' => $sort,
+));
+
+
+$sort_options = array(
+	'priority' => elgg_echo('admin:plugins:sort:priority'),
+	'alpha' => elgg_echo('admin:plugins:sort:alpha'),
+	'date' => elgg_echo('admin:plugins:sort:date'),
+);
+// security - only want a defined option
+if (!array_key_exists($sort, $sort_options)) {
+	$sort = reset($sort_options);
+}
+
+$sort_form = elgg_view_form('admin/plugins/sort', array(
+	'action' => 'admin/plugins',
+	'method' => 'get',
+	'disable_security' => true,
+), array(
+	'sort' => $sort,
+	'sort_options' => $sort_options,
+	'category' => $show_category,
+));
+
+$buttons = "<div class=\"clearfix mbm\">";
+$buttons .= elgg_view_form('admin/plugins/change_state', array(
+	'action' => 'action/admin/plugins/activate_all',
+	'class' => 'float',
+), array(
+	'guids' => $guids,
+	'action' => 'activate',
+));
+$buttons .= elgg_view_form('admin/plugins/change_state', array(
+	'action' => 'action/admin/plugins/deactivate_all',
+	'class' => 'float',
+), array(
+	'guids' => $guids,
+	'action' => 'deactivate',
+));
+$buttons .= "</div>";
+
+$buttons .= $category_form . $sort_form;
+
+// construct page header
+?>
+<div id="content_header" class="mbm clearfix">
+	<div class="content-header-options"><?php echo $buttons ?></div>
+</div>
+
+<div id="elgg-plugin-list">
+<?php
+
+$options = array(
+	'limit' => 0,
+	'full_view' => true,
+	'list_type_toggle' => false,
+	'pagination' => false,
+);
+if ($show_category == 'all' && $sort == 'priority') {
+	$options['display_reordering'] = true;
+}
+echo elgg_view_entity_list($plugin_list, $options);
+
+?>
+</div>
\ No newline at end of file
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
deleted file mode 100644
index 02e9ae58b..000000000
--- a/views/default/admin/plugins/advanced.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Elgg administration advanced plugin screen
- *
- * Shows a list of all plugins sorted by load order.
- *
- * @package Elgg.Core
- * @subpackage Admin.Plugins
- */
-
-elgg_generate_plugin_entities();
-$installed_plugins = elgg_get_plugins('any', true);
-$show_category = get_input('category', null);
-
-// Get a list of the all categories
-// and trim down the plugin list if we're not viewing all categories.
-// @todo this could be cached somewhere after have the manifest loaded
-$categories = array();
-
-foreach ($installed_plugins as $id => $plugin) {
-	if (!$plugin->isValid()) {
-		continue;
-	}
-
-	$plugin_categories = $plugin->manifest->getCategories();
-
-	// handle plugins that don't declare categories
-	// unset them here because this is the list we foreach
-	if ($show_category && !in_array($show_category, $plugin_categories)) {
-		unset($installed_plugins[$id]);
-	}
-
-	if (isset($plugin_categories)) {
-		foreach ($plugin_categories as $category) {
-			if (!array_key_exists($category, $categories)) {
-				$categories[$category] = elgg_echo("admin:plugins:category:$category");
-			}
-		}
-	}
-}
-
-$categories = array_merge(array('' => elgg_echo('admin:plugins:category:all')), $categories);
-
-$category_dropdown = elgg_view('input/dropdown', array(
-	'name' => 'category',
-	'options_values' => $categories,
-	'value' => $show_category
-));
-
-$category_button = elgg_view('input/submit', array(
-	'value' => elgg_echo('filter'),
-	'class' => 'elgg-button elgg-button-action'
-));
-
-$category_form = elgg_view('input/form', array(
-	'body' => $category_dropdown . $category_button,
-	'method' => 'get',
-	'action' => 'admin/plugins/advanced',
-	'disable_security' => true,
-));
-
-// @todo Until "en/deactivate all" means "All plugins on this page" hide when not looking at all.
-if (!isset($show_category) || empty($show_category)) {
-	$activate_url = "action/admin/plugins/activate_all";
-	$activate_url = elgg_add_action_tokens_to_url($activate_url);
-	$deactivate_url = "action/admin/plugins/deactivate_all";
-	$deactivate_url = elgg_add_action_tokens_to_url($deactivate_url);
-
-	$buttons = "<div class=\"mbl\">";
-	$buttons .= "<a class='elgg-button elgg-button-action' href=\"$activate_url\">" . elgg_echo('admin:plugins:activate_all') . '</a> ';
-	$buttons .=	"<a class='elgg-button elgg-button-cancel' href=\"$deactivate_url\">" . elgg_echo('admin:plugins:deactivate_all') . '</a> ';
-	$buttons .= "</div>";
-} else {
-	$buttons = '';
-}
-
-$buttons .= $category_form;
-
-// construct page header
-?>
-<div id="content_header" class="mbm clearfix">
-	<div class="content-header-options"><?php echo $buttons ?></div>
-</div>
-
-<div id="elgg-plugin-list">
-<?php
-
-echo elgg_view_entity_list($installed_plugins, 0, 0, 0, true, false, false); 
-
-?>
-</div>
\ No newline at end of file
diff --git a/views/default/admin/plugins/simple.php b/views/default/admin/plugins/simple.php
deleted file mode 100644
index 28c1cc25e..000000000
--- a/views/default/admin/plugins/simple.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Elgg administration simple plugin screen
- *
- * Shows an alphabetical list of "simple" plugins.
- *
- * @package Elgg
- * @subpackage Core
- */
-
-echo elgg_view_form('admin/plugins/simple_update_states', array('class' => 'admin_plugins_simpleview'));
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 4a3407e1a..69520d102 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -63,9 +63,11 @@ HTML;
 
 	$on = elgg_echo('on');
 
+	$excerpt = elgg_get_excerpt($comment->value, 80);
+
 	$body = <<<HTML
 <span class="elgg-subtext">
-	$commenter_link $on $entity_link ($friendlytime)
+	$commenter_link $on $entity_link ($friendlytime): $excerpt
 </span>
 HTML;
 
diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php
index a1d64a768..e90cbf106 100644
--- a/views/default/core/account/login_dropdown.php
+++ b/views/default/core/account/login_dropdown.php
@@ -9,7 +9,7 @@ if (elgg_is_logged_in()) {
 
 $login_url = elgg_get_site_url();
 if (elgg_get_config('https_login')) {
-	$login_url = str_replace("http", "https", elgg_get_site_url());
+	$login_url = str_replace("http:", "https:", elgg_get_site_url());
 }
 
 $body = elgg_view_form('login', array('action' => "{$login_url}action/login"), array('returntoreferer' => TRUE));
@@ -24,4 +24,4 @@ $body = elgg_view_form('login', array('action' => "{$login_url}action/login"), a
 		)); 
 		echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); 
 	?>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php
index 57c3c31d7..1606b9592 100644
--- a/views/default/core/account/login_walled_garden.php
+++ b/views/default/core/account/login_walled_garden.php
@@ -6,7 +6,7 @@
  */
 
 $reg_url = elgg_normalize_url('register');
-$forgot_url = elgg_normalize_url('pages/account/forgotten_password.php');
+$forgot_url = elgg_normalize_url('forgotpassword');
 $cancel_button = elgg_view('input/button', array(
 	'value' => elgg_echo('cancel'),
 	'class' => 'elgg-button-cancel mlm',
@@ -20,7 +20,7 @@ $form_body .= elgg_view('input/hidden', array(
 
 $login_url = elgg_get_site_url();
 if (elgg_get_config('https_login')) {
-	$login_url = str_replace("http", "https", elgg_get_site_url());
+	$login_url = str_replace("http:", "https:", elgg_get_site_url());
 }
 
 ?>
diff --git a/views/default/core/settings/tools.php b/views/default/core/settings/tools.php
index ff02c9183..a249adf82 100644
--- a/views/default/core/settings/tools.php
+++ b/views/default/core/settings/tools.php
@@ -11,7 +11,7 @@
 // Description of what's going on
 echo elgg_view('output/longtext', array(
 	'value' => elgg_echo("usersettings:plugins:description"),
-	'class' => 'user-settings mtm',
+	'class' => 'user-settings mtn mbm',
 ));
 
 $limit = get_input('limit', 10);
@@ -29,7 +29,7 @@ foreach ($installed_plugins as $plugin) {
 		if (elgg_view_exists("usersettings/$plugin_id/edit") 
 			|| elgg_view_exists("plugins/$plugin_id/usersettings")) {
 	
-			$title = $plugin->manifest->getName();
+			$title = $plugin->getManifest()->getName();
 			$body = elgg_view_form('plugins/usersettings/save', array(), array('entity' => $plugin));
 			echo elgg_view_module('info', $title, $body);
 		}
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index b41649c06..a4d413781 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -100,6 +100,7 @@ h6 { font-size: 0.8em; }
 
 a {
 	color: #333;
+	text-decoration: none;
 }
 a:hover {
 	color: black;
@@ -115,6 +116,9 @@ p {
 	margin-bottom: 15px;
 }
 
+.elgg-output dt { font-weight: bold }
+.elgg-output dd { margin: 0 0 1em 2em }
+
 table.mceLayout {
 	width:100% !important;
 }
@@ -154,6 +158,13 @@ table.mceLayout {
 .center {
 	text-align: center;
 }
+.float {
+	float: left;
+}
+.float-alt {
+	float: right;
+}
+
 /* ***************************************
 	PAGE WRAPPER
 *************************************** */
@@ -225,6 +236,17 @@ table.mceLayout {
 	border: 2px solid #ddd;
 	cursor: pointer;
 }
+.elgg-message.elgg-state-error {
+	background: #fbe3e4;
+	color: #8a1f11;
+	border-color: #fbc2c4;
+	font-weight: bold;
+}
+.elgg-message.elgg-state-success {
+	background: #e6efc2;
+	color: #264409;
+	border-color: #c6d880;
+}
 
 /* ***************************************
 	BODY
@@ -266,6 +288,7 @@ table.mceLayout {
 	background-color: #111;
 	border: 1px solid #999;
 	padding: 10px 20px;
+	margin-bottom: 10px;
 }
 .elgg-page-footer a {
 	color: #ddd;
@@ -330,7 +353,11 @@ table.mceLayout {
 	width: 100%;
 	border-top: 1px solid #ccc;
 }
-.elgg-table-alt td {
+.elgg-table-alt th {
+	background-color: #eee;
+	font-weight: bold;
+}
+.elgg-table-alt td, th {
 	padding: 2px 4px;
 	border-bottom: 1px solid #ccc;
 }
@@ -402,10 +429,18 @@ input {
 .input-text,
 .input-tags,
 .input-url,
-.input-textarea {
+.input-textarea,
+<?php // until we're all on elgg-, need to duplicate ?>
+.elgg-input-text,
+.elgg-input-tags,
+.elgg-input-url,
+.elgg-input-textarea {
 	width:98%;
 }
-input[type="submit"], .elgg-button-submit, .elgg-button-action {
+textarea {
+	height: 100px;
+}
+input[type="submit"], .elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
 	font-size: 14px;
 	font-weight: bold;
 	color: white;
@@ -429,9 +464,22 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 	background-color: #000;
 	text-decoration: none;
 }
-.elgg-button-submit, .elgg-button-action {
+.elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
 	padding: 4px 8px;
 }
+.elgg-button-cancel {
+	color: #333;
+	background-color: #999;
+}
+.elgg-button-cancel:hover {
+	color: #222;
+	background-color: #666;
+	text-decoration: none;
+}
+.elgg-button-action.elgg-state-disabled {
+	background-color: #aaa;
+}
+
 /* ***************************************
 	PAGINATION
 *************************************** */
@@ -637,6 +685,9 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-menu-admin-footer > li {
 	padding-right: 25px;
 }
+.elgg-menu-longtext {
+	float: right;
+}
 
 /* ***************************************
 	WIDGETS
@@ -672,6 +723,16 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-widgets-add-panel li a {
 	display: block;
 }
+.elgg-widget-single.elgg-state-available {
+	color: #333;
+	cursor: pointer;
+}
+.elgg-widget-single.elgg-state-available:hover {
+	border-color: #aaa;
+}
+.elgg-widget-single.elgg-state-unavailable {
+	color: #888;
+}
 
 .elgg-module-widget {
 	background-color: #dedede;
@@ -684,18 +745,17 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 }
 .elgg-module-widget > .elgg-head {
 	background-color: #f5f5f5;
-	height: 30px;
-	line-height: 30px;
+	height: 26px;
 	overflow: hidden;
 }
 .elgg-module-widget > .elgg-head h3 {
 	float: left;
-	padding: 0 45px 0 20px;
+	padding: 4px 45px 0 20px;
 	color: #333;
 }
 .elgg-module-widget > .elgg-head a {
 	position: absolute;
-	top: 5px;
+	top: 4px;
 	display: inline-block;
 	width: 18px;
 	height: 18px;
@@ -797,9 +857,10 @@ a.elgg-widget-collapsed:before {
 	margin-bottom: 5px;
 }
 
-a.elgg-longtext-control {
-	float: right;
+.elgg-longtext-control {
 	margin-left: 14px;
+	font-size: 80%;
+	cursor: pointer;
 }
 
 /* ***************************************
@@ -1032,58 +1093,11 @@ a.elgg-longtext-control {
 .right {float:right}
 .elgg-toggle {cursor:pointer}
 
-/* ***************************************
-	STATES
-*************************************** */
-
-.elgg-state-active {
-	background:#ccc;
-	color: #333;
-}
-
-.elgg-state-inactive {
-	background:#dedede;
-}
-
-.elgg-state-available {
-	color: #333;
-	cursor: pointer;
-}
-
-.elgg-state-available:hover {
-	border-color: #aaa;
-}
-
-.elgg-state-unavailable {
-	color: #888;
-}
-
-.elgg-state-success {
-	background: #e6efc2;
-	color: #264409;
-	border-color: #c6d880;
-}
-
-.elgg-state-error {
-	background: #fbe3e4;
-	color: #8a1f11;
-	border-color: #fbc2c4;
-	font-weight: bold;
-}
-
-p.elgg-state-error {
-	padding: 5px;
-}
-
 <?php //@todo elgg-drag-handle instead? ?>
 .elgg-state-draggable .elgg-head {
 	cursor: move;
 }
 
-<?php //What to do with states that don't have default styles? ?>
-.elgg-state-selected {}
-.elgg-state-disabled {}
-
 /* ***************************************
 	ADMIN MISC
 *************************************** */
@@ -1122,8 +1136,8 @@ form.admin_plugins_simpleview .elgg-button-submit {
 	margin-right: 10px;
 }
 ul.admin_plugins {
-	margin-bottom:0;
-	padding-left:0;
+	margin-bottom: 0;
+	padding-left: 0;
 	list-style: none;
 }
 .elgg-plugin {
@@ -1173,6 +1187,22 @@ ul.admin_plugins {
 .elgg-plugin.elgg-state-active {
 	background: white;
 }
+.elgg-plugin.elgg-state-inactive {
+	background: #dedede;
+}
+
+.elgg-state-error {
+	background: #fbe3e4;
+	color: #8a1f11;
+	border-color: #fbc2c4;
+	font-weight: bold;
+}
+.elgg-state-warning {
+	background: #fbedb5;
+	color: #000000;
+	border-color: #fbe58b;
+	font-weight: bold;
+}
 
 .admin_notices {
 	padding-bottom: 15px;
@@ -1200,3 +1230,35 @@ ul.admin_plugins {
 .add-user form {
 	width:300px;
 }
+
+/****************************************
+	Markdown Text
+****************************************/
+
+.elgg-markdown {
+	margin: 15px;
+}
+
+.elgg-markdown h1,
+.elgg-markdown h2,
+.elgg-markdown h3,
+.elgg-markdown h4,
+.elgg-markdown h5,
+.elgg-markdown h6 {
+	margin: 1em 0 1em -15px;
+	color: #333;
+}
+
+.elgg-markdown ol {
+	list-style: decimal;
+	padding-left: 2em;
+}
+
+.elgg-markdown ul {
+	list-style: disc;
+	padding-left: 2em;
+}
+
+.elgg-markdown p {
+	margin: 15px 0;
+}
\ No newline at end of file
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index c5d99512f..61dcdb1fe 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -105,4 +105,7 @@
 	/* Inline-block: IE 6, 7 */
 	zoom: 1;
 	*display: inline;
-}
\ No newline at end of file
+}
+
+/* Looks much better when middle-aligned with surrounding text */
+.elgg-icon {vertical-align:middle}
\ No newline at end of file
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 0230cbc54..af7b2be19 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -16,6 +16,12 @@ fieldset > div {
 fieldset > div:last-child {
 	margin-bottom: 0;
 }
+.elgg-form-footer {
+}
+.elgg-form-footer-alt {
+	border-top: 1px solid #CCC;
+	padding: 10px 0;
+}
 
 label {
 	font-weight: bold;
@@ -73,9 +79,17 @@ input[type="radio"] {
 	padding-right: 10px;
 }
 
+.elgg-form-account input[type="text"],
+.elgg-form-account input[type="password"] {
+	width: 300px;
+}
+
 /* ***************************************
 	FRIENDS PICKER
 *************************************** */
+.friends-picker-main-wrapper {
+	margin-bottom: 15px;
+}
 .friends-picker-container h3 {
 	font-size:4em !important;
 	text-align: left;
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index 08948df50..1bc056072 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -224,10 +224,10 @@
 .elgg-icon-undo {
 	background-position: 0 -1206px;
 }
-.elgg-icon-user:hover {
+.elgg-icon-user {
 	background-position: 0 -1224px;
 }
-.elgg-icon-user {
+.elgg-icon-user:hover {
 	background-position: 0 -1242px;
 }
 .elgg-icon-users:hover {
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index d52938aee..a5854f8c1 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -15,6 +15,10 @@
 	PAGE LAYOUT
 *************************************** */
 /***** DEFAULT LAYOUT ******/
+<?php // the width is on the page rather than topbar to handle small viewports ?>
+.elgg-page-default {
+	min-width: 998px;
+}
 .elgg-page-default .elgg-page-header > .elgg-inner {
 	width: 990px;
 	margin: 0 auto;
@@ -35,7 +39,6 @@
 .elgg-page-topbar {
 	background: #333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left;
 	border-bottom: 1px solid #000000;
-	min-width: 998px;
 	position: relative;
 	height: 24px;
 	z-index: 9000;
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index c8ba4f735..ebac2b91f 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -8,10 +8,6 @@
 	z-index: 100;
 }
 
-#dashboard-info .elgg-inner {
-	border: 2px solid #dedede;
-}
-
 /* ***************************************
 	AVATAR UPLOADING & CROPPING
 *************************************** */
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index a5b907ddc..c4808478b 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -197,6 +197,7 @@ a.elgg-widget-edit-button {
 	width: 96%;
 	padding: 2%;
 	border-bottom: 2px solid #dedede;
+	background-color: #f9f9f9;
 }
 .elgg-widget-content {
 	padding: 10px;
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 25b45bbee..d930d3a89 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -130,15 +130,11 @@
 }
 
 .elgg-menu-topbar > li > a {
-	padding: 2px 15px;
+	padding: 2px 15px 0;
 	color: #eee;
 	margin-top: 1px;
 }
 
-.elgg-menu-topbar > li > a > span {
-	vertical-align: middle;
-}
-
 .elgg-menu-topbar > li > a:hover {
 	color: #4690D6;
 	text-decoration: none;
@@ -148,6 +144,18 @@
 	float: right;
 }
 
+.elgg-menu-topbar > li > a.elgg-topbar-logo {
+	margin-top: 0;
+	padding-left: 5px;
+	width: 38px;
+	height: 20px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-avatar {
+	width: 18px;
+	height: 18px;
+}
+
 /* ***************************************
 	SITE MENU
 *************************************** */
diff --git a/views/default/forms/admin/menu/save.php b/views/default/forms/admin/menu/save.php
index 91129c881..92a0784df 100644
--- a/views/default/forms/admin/menu/save.php
+++ b/views/default/forms/admin/menu/save.php
@@ -33,7 +33,7 @@ echo elgg_view('output/longtext', array(
 ));
 
 for ($i=0; $i<$num_featured_items; $i++) {
-	if (array_key_exists($i, $featured_menu_names)) {
+	if ($featured_menu_names && array_key_exists($i, $featured_menu_names)) {
 		$current_value = $featured_menu_names[$i];
 	} else {
 		$current_value = ' ';
diff --git a/views/default/forms/admin/plugins/change_state.php b/views/default/forms/admin/plugins/change_state.php
new file mode 100644
index 000000000..ba5d873e7
--- /dev/null
+++ b/views/default/forms/admin/plugins/change_state.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Activate/deactive all plugins specified by guids array
+ *
+ * @uses $vars['guids']  Array of GUIDs
+ * @uses $vars['action'] 'activate' or 'deactivate'
+ */
+
+$guids = elgg_extract('guids', $vars, array());
+$guids = implode(',', $guids);
+
+echo elgg_view('input/hidden', array(
+	'name' => 'guids',
+	'value' => $guids,
+));
+
+echo elgg_view('input/submit', array(
+	'value' => elgg_echo("admin:plugins:{$vars['action']}_all"),
+	'class' => 'elgg-button elgg-button-action'
+));
diff --git a/views/default/forms/admin/plugins/filter.php b/views/default/forms/admin/plugins/filter.php
new file mode 100644
index 000000000..d00906e6a
--- /dev/null
+++ b/views/default/forms/admin/plugins/filter.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Category filter for plugins
+ *
+ * @uses $vars['category']
+ * @uses $vars['category_options']
+ * @uses $vvars['sort']
+ */
+
+echo elgg_view('input/dropdown', array(
+	'name' => 'category',
+	'options_values' => $vars['category_options'],
+	'value' => $vars['category'],
+));
+
+echo elgg_view('input/hidden', array(
+	'name' => 'sort',
+	'value' => $vars['sort'],
+));
+
+echo elgg_view('input/submit', array(
+	'value' => elgg_echo('filter'),
+	'class' => 'elgg-button elgg-button-action',
+));
diff --git a/views/default/forms/admin/plugins/simple_update_states.php b/views/default/forms/admin/plugins/simple_update_states.php
deleted file mode 100644
index 12b2cd616..000000000
--- a/views/default/forms/admin/plugins/simple_update_states.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php 
-/**
- * Elgg administration simple plugin screen
- *
- * Shows an alphabetical list of "simple" plugins.
- *
- * @package Elgg
- * @subpackage Core
- */
-
-elgg_generate_plugin_entities();
-$installed_plugins = elgg_get_plugins('any');
-$plugin_list = array();
-
-foreach ($installed_plugins as $plugin) {
-	if (!$plugin->isValid()) {
-		continue;
-	}
-	$interface = $plugin->manifest->getAdminInterface();
-	if ($interface == 'simple') {
-		$plugin_list[$plugin->manifest->getName()] = $plugin;
-	}
-}
-
-ksort($plugin_list);
-
-echo elgg_view_entity_list($plugin_list, 0, 0, 0, false, false, false);
-echo elgg_view('input/submit', array('value' => elgg_echo('save')));
diff --git a/views/default/forms/admin/plugins/sort.php b/views/default/forms/admin/plugins/sort.php
new file mode 100644
index 000000000..284e085e6
--- /dev/null
+++ b/views/default/forms/admin/plugins/sort.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Sort plugins form body
+ *
+ * @uses $vars['sort']
+ * @uses $vars['sort_options']
+ * @uses $vars['category']
+ */
+
+echo elgg_view('input/dropdown', array(
+	'name' => 'sort',
+	'options_values' => $vars['sort_options'],
+	'value' => $vars['sort'],
+));
+
+echo elgg_view('input/hidden', array(
+	'name' => 'category',
+	'value' => $vars['category'],
+));
+
+echo elgg_view('input/submit', array(
+	'value' => elgg_echo('sort'),
+	'class' => 'elgg-button elgg-button-action'
+));
diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index 857a54e1f..3deec66bd 100644
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -8,11 +8,10 @@
 $master_image = $vars['entity']->getIcon('master');
 
 ?>
-<div>
+<div class="clearfix">
 	<img id="user-avatar" class="mrl" src="<?php echo $master_image; ?>" alt="<?php echo elgg_echo('avatar'); ?>" />
 </div>
-
-<div class="clearfloat"></div>
+<div>
 <?php
 $coords = array('x1', 'x2', 'y1', 'y2');
 foreach ($coords as $coord) {
@@ -24,6 +23,7 @@ echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity'
 echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
 
 ?>
+</div>
 <!-- grab the required js for icon cropping -->
 <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.imgareaselect-0.8.min.js"></script>
 <?php //@todo JS 1.8: no ?>
diff --git a/views/default/forms/avatar/upload.php b/views/default/forms/avatar/upload.php
index 08db1f7e0..b099b8c4c 100644
--- a/views/default/forms/avatar/upload.php
+++ b/views/default/forms/avatar/upload.php
@@ -5,11 +5,12 @@
  * @uses $vars['entity']
  */
 
-echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid));
 ?>
 <div>
 	<label><?php echo elgg_echo("avatar:upload"); ?></label><br />
 	<?php echo elgg_view("input/file",array('name' => 'avatar')); ?>
-<br />
+</div>
+<div class="elgg-form-footer">
+	<?php echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid)); ?>
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('upload'))); ?>
 </div>
diff --git a/views/default/forms/comments/add.php b/views/default/forms/comments/add.php
index 6d674838a..40e574338 100644
--- a/views/default/forms/comments/add.php
+++ b/views/default/forms/comments/add.php
@@ -18,16 +18,20 @@ if (isset($vars['entity']) && elgg_is_logged_in()) {
 		echo elgg_view('input/submit', array('value' => elgg_echo('comment')));
 	} else {
 ?>
-		<div>
-			<label><?php echo elgg_echo("generic_comments:add"); ?></label>
-			<?php echo elgg_view('input/longtext', array('name' => 'generic_comment')); ?>
-		</div>
+	<div>
+		<label><?php echo elgg_echo("generic_comments:add"); ?></label>
+		<?php echo elgg_view('input/longtext', array('name' => 'generic_comment')); ?>
+	</div>
+	<div>
 <?php
 		echo elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post")));
+?>
+	</div>
+<?php
 	}
 	
 	echo elgg_view('input/hidden', array(
 		'name' => 'entity_guid',
 		'value' => $vars['entity']->getGUID()
 	));
-}
\ No newline at end of file
+}
diff --git a/views/default/forms/login.php b/views/default/forms/login.php
index 452c4c425..5cfdcd4c6 100644
--- a/views/default/forms/login.php
+++ b/views/default/forms/login.php
@@ -39,7 +39,7 @@
 		echo '<li><a class="registration_link" href="' . elgg_get_site_url() . 'register">' . elgg_echo('register') . '</a></li>';
 	}
 ?>
-	<li><a class="forgotten_password_link" href="<?php echo elgg_get_site_url(); ?>pages/account/forgotten_password.php">
+	<li><a class="forgotten_password_link" href="<?php echo elgg_get_site_url(); ?>forgotpassword">
 		<?php echo elgg_echo('user:password:lost'); ?>
 	</a></li>
 </ul>
\ No newline at end of file
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
index 57dc00e85..4e0f51dc6 100644
--- a/views/default/forms/profile/fields/reset.php
+++ b/views/default/forms/profile/fields/reset.php
@@ -5,6 +5,6 @@
 
 $params = array(
 	'value' => elgg_echo('profile:resetdefault'),
-	'class' => 'elgg-button elgg-button-action elgg-state-disabled',
+	'class' => 'elgg-button-cancel',
 );
 echo elgg_view('input/submit', $params);
diff --git a/views/default/forms/register.php b/views/default/forms/register.php
index 6f35a3ea3..4e0a521ab 100644
--- a/views/default/forms/register.php
+++ b/views/default/forms/register.php
@@ -11,17 +11,9 @@ $username = get_input('u');
 $email = get_input('e');
 $name = get_input('n');
 
-$admin_option = false;
-if (elgg_is_admin_logged_in() && isset($vars['show_admin'])) {
-	$admin_option = true;
-}
-
 if (elgg_is_sticky_form('register')) {
 	extract(elgg_get_sticky_values('register'));
 	elgg_clear_sticky_form('register');
-	if (is_array($admin)) {
-		$admin = $admin[0];
-	}
 }
 
 ?>
@@ -78,13 +70,6 @@ echo elgg_view('register/extend');
 // Add captcha hook
 echo elgg_view('input/captcha');
 
-if ($admin_option) {
-	echo elgg_view('input/checkboxes', array(
-		'name' => "admin",
-		'options' => array(elgg_echo('admin_option')),
-	));
-}
-
 echo elgg_view('input/hidden', array('name' => 'friend_guid', 'value' => $vars['friend_guid']));
 echo elgg_view('input/hidden', array('name' => 'invitecode', 'value' => $vars['invitecode']));
 echo elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('register')));
diff --git a/views/default/forms/user/requestnewpassword.php b/views/default/forms/user/requestnewpassword.php
index f2f276417..970938327 100644
--- a/views/default/forms/user/requestnewpassword.php
+++ b/views/default/forms/user/requestnewpassword.php
@@ -11,7 +11,7 @@
 	<?php echo elgg_echo('user:password:text'); ?>
 </div>
 <div>
-	<label><?php echo elgg_echo('username'); ?></label>
+	<label><?php echo elgg_echo('username'); ?></label><br />
 	<?php echo elgg_view('input/text', array('name' => 'username')); ?>
 </div>
 <?php echo elgg_view('input/captcha'); ?>
diff --git a/views/default/forms/usersettings/save.php b/views/default/forms/usersettings/save.php
index 62593e699..35871144b 100644
--- a/views/default/forms/usersettings/save.php
+++ b/views/default/forms/usersettings/save.php
@@ -1,7 +1,7 @@
 <?php
 $form_body = elgg_view("forms/account/settings");
 
-$form_body .= '<div class="elgg-divide-top">';
+$form_body .= '<div class="elgg-form-footer-alt">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
 $form_body .= '</div>';
 
diff --git a/views/default/group/elements/summary.php b/views/default/group/elements/summary.php
new file mode 100644
index 000000000..395ed5292
--- /dev/null
+++ b/views/default/group/elements/summary.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Group summary
+ *
+ * @uses $vars['entity']    ElggEntity
+ * @uses $vars['title']     Title link (optional) false = no title, '' = default
+ * @uses $vars['metadata']  HTML for entity metadata and actions (optional)
+ * @uses $vars['subtitle']  HTML for the subtitle (optional)
+ * @uses $vars['tags']      HTML for the tags (optional)
+ * @uses $vars['content']   HTML for the entity content (optional)
+ */
+
+echo elgg_view('object/elements/summary', $vars);
diff --git a/views/default/input/access.php b/views/default/input/access.php
index 7fa2323bf..40a93aaa4 100644
--- a/views/default/input/access.php
+++ b/views/default/input/access.php
@@ -3,12 +3,10 @@
  * Elgg access level input
  * Displays a dropdown input field
  *
- * @package Elgg
- * @subpackage Core
- *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['options_values']
  * @uses $vars['name'] The name of the input field
+ * @uses $vars['entity'] Optional. The entity for this access control (uses access_id)
  */
 
 $defaults = array(
@@ -18,6 +16,11 @@ $defaults = array(
 	'options_values' => get_write_access_array(),
 );
 
+if (isset($vars['entity'])) {
+	$defaults['value'] = $vars['entity']->access_id;
+	unset($vars['entity']);
+}
+
 $vars = array_merge($defaults, $vars);
 
 if ($vars['value'] == ACCESS_DEFAULT) {
@@ -26,4 +29,4 @@ if ($vars['value'] == ACCESS_DEFAULT) {
 
 if (is_array($vars['options_values']) && sizeof($vars['options_values']) > 0) {
 	echo elgg_view('input/dropdown', $vars);
-}
\ No newline at end of file
+}
diff --git a/views/default/input/dropdown.php b/views/default/input/dropdown.php
index 6fd97d3b5..fccccb888 100644
--- a/views/default/input/dropdown.php
+++ b/views/default/input/dropdown.php
@@ -3,7 +3,7 @@
  * Elgg dropdown input
  * Displays a dropdown (select) input field
  *
- * NB: Default values of FALSE or NULL will match '' (empty string) and not 0.
+ * @warning Default values of FALSE or NULL will match '' (empty string) and not 0.
  *
  * @package Elgg
  * @subpackage Core
@@ -47,13 +47,15 @@ if ($options_values) {
 		echo "<option $option_attrs>$option</option>";
 	}
 } else {
-	foreach ($options as $option) {
+	if (is_array($options)) {
+		foreach ($options as $option) {
 
-		$option_attrs = elgg_format_attributes(array(
-			'selected' => (string)$option == (string)$value
-		));
+			$option_attrs = elgg_format_attributes(array(
+				'selected' => (string)$option == (string)$value
+			));
 
-		echo "<option $option_attrs>$option</option>";
+			echo "<option $option_attrs>$option</option>";
+		}
 	}
 }
 ?>
diff --git a/views/default/input/location.php b/views/default/input/location.php
new file mode 100644
index 000000000..d7ae2bbbd
--- /dev/null
+++ b/views/default/input/location.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Location input field
+ *
+ * @uses $vars['entity'] The ElggEntity that has a location
+ * @uses $vars['value']  The default value for the location
+ */
+
+$defaults = array(
+	'class' => 'elgg-input-location',
+	'disabled' => FALSE,
+);
+
+if (isset($vars['entity'])) {
+	$defaults['value'] = $vars['entity']->location;
+	unset($vars['entity']);
+}
+
+$vars = array_merge($defaults, $vars);
+
+echo elgg_view('input/tag', $vars);
diff --git a/views/default/input/tag.php b/views/default/input/tag.php
new file mode 100644
index 000000000..a78ec3163
--- /dev/null
+++ b/views/default/input/tag.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Elgg tag input
+ *
+ * Accepts a single tag value
+ *
+ * @uses $vars['value'] The default value for the tag
+ */
+
+$defaults = array(
+	'class' => 'elgg-input-tag',
+	'disabled' => FALSE,
+);
+
+$vars = array_merge($defaults, $vars);
+
+echo elgg_view('input/text', $vars);
\ No newline at end of file
diff --git a/views/default/input/tags.php b/views/default/input/tags.php
index 539bbd4db..7cda958aa 100644
--- a/views/default/input/tags.php
+++ b/views/default/input/tags.php
@@ -3,8 +3,10 @@
  * Elgg tag input
  * Displays a tag input field
  *
- * @package Elgg
- * @subpackage Core
+ * @uses $vars['disabled']
+ * @uses $vars['class']
+ * @uses $vars['value']    Array of tags or a string
+ * @uses $vars['entity']   Optional. Entity whose tags are being displayed (metadata ->tags)
  */
 
 $defaults = array(
@@ -12,6 +14,11 @@ $defaults = array(
 	'disabled' => FALSE,
 );
 
+if (isset($vars['entity'])) {
+	$defaults['value'] = $vars['entity']->tags;
+	unset($vars['entity']);
+}
+
 $vars = array_merge($defaults, $vars);
 
 if (is_array($vars['value'])) {
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index 656effc98..dcd65072a 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -5,17 +5,18 @@
  * @package Elgg
  * @subpackage Core
  *
- * @uses $vars['value'] The current value, if any
- * @uses $vars['name'] The name of the input field
+ * @uses $vars['value'] Array of user guids for already selected users or null
+ * @uses $vars['name']  The name of the input field
  *
  *
- * pops up defaulted to lazy load friends lists in paginated alphabetical order.
- * upon
+ * Defaults to lazy load user lists in paginated alphabetical order. User needs
+ * two type two characters before seeing the user popup list.
  *
  * As users are checked they move down to a "users" box.
  * When this happens, a hidden input is created also.
- * 	{$internalnal}[] with the value th GUID.
+ * 	{$internalnal}[] with the value the GUID.
  *
+ * @warning: this is not stable
  */
 
 elgg_load_js('elgg.userpicker');
@@ -65,6 +66,5 @@ foreach ($vars['value'] as $user_id) {
 	<ul class="elgg-user-picker-entries"><?php echo $user_list; ?></ul>
 </div>
 <script type="text/javascript">
-	elgg.provide('elgg.userpicker');
 	elgg.userpicker.userList = <?php echo $json_values ?>;
 </script>
\ No newline at end of file
diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php
index 55ddc2fe4..f3e46315b 100644
--- a/views/default/navigation/menu/elements/item.php
+++ b/views/default/navigation/menu/elements/item.php
@@ -22,13 +22,7 @@ if ($children) {
 
 $item_class = $item->getItemClass();
 
-//allow people to specify name with underscores
-$name = str_replace('_', '-', $item->getName());
-if ($item_class) {
-	$class = "class=\"elgg-menu-item-$name $item_class\"";
-}
-
-echo "<li $class>";
+echo "<li class=\"$item_class\">";
 echo $item->getContent();
 if ($children) {
 	echo elgg_view('navigation/menu/elements/section', array(
diff --git a/views/default/navigation/topbar_tools.php b/views/default/navigation/topbar_tools.php
index 3351edc93..307f03fc6 100644
--- a/views/default/navigation/topbar_tools.php
+++ b/views/default/navigation/topbar_tools.php
@@ -7,4 +7,3 @@
  * 
  * @deprecated 1.8 Extend the topbar menus or the page/elements/topbar view directly
  */
-elgg_deprecated_notice('navigation/topbar_tools was deprecated. Extend the topbar menus or the page/elements/topbar view directly', 1.8);
\ No newline at end of file
diff --git a/views/default/object/default.php b/views/default/object/default.php
index 2cf9805f0..27bb1890e 100644
--- a/views/default/object/default.php
+++ b/views/default/object/default.php
@@ -42,6 +42,6 @@ $params = array(
 	'subtitle' => $subtitle,
 	'tags' => $vars['entity']->tags,
 );
-$body = elgg_view('page/components/summary', $params);
+$body = elgg_view('object/elements/summary', $params);
 
 echo elgg_view_image_block($icon, $body);
diff --git a/views/default/object/elements/summary.php b/views/default/object/elements/summary.php
new file mode 100644
index 000000000..d3a6ea862
--- /dev/null
+++ b/views/default/object/elements/summary.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Object summary
+ *
+ * Sample output
+ * <ul class="elgg-menu elgg-menu-metadata"><li>Public</li><li>Like this</li></ul>
+ * <h3><a href="">Title</a></h3>
+ * <p class="elgg-subtext">Posted 3 hours ago by George</p>
+ * <p class="elgg-tags"><a href="">one</a>, <a href="">two</a></p>
+ * <div class="elgg-list-content">Excerpt text</div>
+ *
+ * @uses $vars['entity']    ElggEntity
+ * @uses $vars['title']     Title link (optional) false = no title, '' = default
+ * @uses $vars['metadata']  HTML for entity metadata and actions (optional)
+ * @uses $vars['subtitle']  HTML for the subtitle (optional)
+ * @uses $vars['tags']      HTML for the tags (optional)
+ * @uses $vars['content']   HTML for the entity content (optional)
+ */
+
+$entity = $vars['entity'];
+
+$title_link = elgg_extract('title', $vars, '');
+if ($title_link === '') {
+	if (isset($entity->title)) {
+		$text = $entity->title;
+	} else {
+		$text = $entity->name;
+	}
+	$params = array(
+		'text' => $text,
+		'href' => $entity->getURL(),
+	);
+	$title_link = elgg_view('output/url', $params);
+}
+
+$metadata = elgg_extract('metadata', $vars, '');
+$subtitle = elgg_extract('subtitle', $vars, '');
+$content = elgg_extract('content', $vars, '');
+
+$tags = elgg_extract('tags', $vars, '');
+if ($tags !== false) {
+	$tags = elgg_view('output/tags', array('tags' => $entity->tags));
+}
+
+if ($metadata) {
+	echo $metadata;
+}
+echo "<h3>$title_link</h3>";
+echo "<div class=\"elgg-subtext\">$subtitle</div>";
+echo $tags;
+if ($content) {
+	echo "<div class=\"elgg-list-content\">$content</div>";
+}
diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index a346d4ff1..51fb69d17 100644
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -5,108 +5,127 @@
  * This file renders a plugin for the admin screen, including active/deactive,
  * manifest details & display plugin settings.
  *
+ * @uses $vars['entity']
+ * @uses $vars['display_reordering'] Do we display the priority reordering links?
+ *
  * @package Elgg.Core
  * @subpackage Plugins
  */
 
 $plugin = $vars['entity'];
+$reordering = elgg_extract('display_reordering', $vars, false);
 $priority = $plugin->getPriority();
 $active = $plugin->isActive();
 
-$name = $plugin->manifest->getName();
+$name = $plugin->getManifest()->getName();
 $can_activate = $plugin->canActivate();
 $max_priority = elgg_get_max_plugin_priority();
 $actions_base = '/action/admin/plugins/';
 
 $ts = time();
 $token = generate_action_token($ts);
-$active_class = ($active && $can_activate) ? 'elgg-state-active' : 'elgg-state-inactive';
 
 // build reordering links
 $links = '';
 
-// top and up link only if not at top
-if ($priority > 1) {
-	$top_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
-		'plugin_guid' => $plugin->guid,
-		'priority' => 'first',
-		'is_action' => true
-	));
+if ($reordering) {
+	$draggable = 'elgg-state-draggable';
 
-	$links .= "<li>" . elgg_view('output/url', array(
-		'href' 		=> $top_url,
-		'text'		=> elgg_echo('top'),
-		'is_action'	=> true
-	)) . "</li>";
+	// top and up link only if not at top
+	if ($priority > 1) {
+		$top_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
+			'plugin_guid' => $plugin->guid,
+			'priority' => 'first',
+			'is_action' => true
+		));
 
-	$up_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
-		'plugin_guid' => $plugin->guid,
-		'priority' => '-1',
-		'is_action' => true
-	));
+		$links .= "<li>" . elgg_view('output/url', array(
+			'href' 		=> $top_url,
+			'text'		=> elgg_echo('top'),
+			'is_action'	=> true
+		)) . "</li>";
 
-	$links .= "<li>" . elgg_view('output/url', array(
-		'href' 		=> $up_url,
-		'text'		=> elgg_echo('up'),
-		'is_action'	=> true
-	)) . "</li>";
-}
+		$up_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
+			'plugin_guid' => $plugin->guid,
+			'priority' => '-1',
+			'is_action' => true
+		));
 
-// down and bottom links only if not at bottom
-if ($priority < $max_priority) {
-	$down_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
-		'plugin_guid' => $plugin->guid,
-		'priority' => '+1',
-		'is_action' => true
-	));
+		$links .= "<li>" . elgg_view('output/url', array(
+			'href' 		=> $up_url,
+			'text'		=> elgg_echo('up'),
+			'is_action'	=> true
+		)) . "</li>";
+	}
+
+	// down and bottom links only if not at bottom
+	if ($priority < $max_priority) {
+		$down_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
+			'plugin_guid' => $plugin->guid,
+			'priority' => '+1',
+			'is_action' => true
+		));
 
-	$links .= "<li>" . elgg_view('output/url', array(
-		'href' 		=> $down_url,
-		'text'		=> elgg_echo('down'),
-		'is_action'	=> true
-	)) . "</li>";
+		$links .= "<li>" . elgg_view('output/url', array(
+			'href' 		=> $down_url,
+			'text'		=> elgg_echo('down'),
+			'is_action'	=> true
+		)) . "</li>";
 
-	$bottom_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
-		'plugin_guid' => $plugin->guid,
-		'priority' => 'last',
-		'is_action' => true
-	));
+		$bottom_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
+			'plugin_guid' => $plugin->guid,
+			'priority' => 'last',
+			'is_action' => true
+		));
 
-	$links .= "<li>" . elgg_view('output/url', array(
-		'href' 		=> $bottom_url,
-		'text'		=> elgg_echo('bottom'),
-		'is_action'	=> true
-	)) . "</li>";
+		$links .= "<li>" . elgg_view('output/url', array(
+			'href' 		=> $bottom_url,
+			'text'		=> elgg_echo('bottom'),
+			'is_action'	=> true
+		)) . "</li>";
+	}
+} else {
+	$draggable = 'elgg-state-undraggable';
 }
 
+
 // activate / deactivate links
-if ($can_activate) {
-	if ($active) {
-		$action = 'deactivate';
-		$class = 'elgg-button-cancel';
-	} else {
-		$action = 'activate';
-		$class = 'elgg-button-submit';
+
+// always let them deactivate
+$options = array(
+	'is_action' => true
+);
+if ($active) {
+	$active_class = 'elgg-state-active';
+	$action = 'deactivate';
+	$options['text'] = elgg_echo('deactivate');
+	$options['class'] = "elgg-button elgg-button-cancel";
+
+	if (!$can_activate) {
+		$active_class = 'elgg-state-active';
+		$options['class'] = 'elgg-button elgg-state-warning';
 	}
+} else if ($can_activate) {
+	$active_class = 'elgg-state-inactive';
+	$action = 'activate';
+	$options['text'] = elgg_echo('activate');
+	$options['class'] = "elgg-button elgg-button-submit";
+} else {
+	$active_class = 'elgg-state-inactive';
+	$action = '';
+	$options['text'] = elgg_echo('admin:plugins:cannot_activate');
+	$options['class'] = "elgg-button elgg-button-disabled";
+	$options['disabled'] = 'disabled';
+}
 
+if ($action) {
 	$url = elgg_http_add_url_query_elements($actions_base . $action, array(
-		'plugin_guids[]' => $plugin->guid,
-		'is_action' => true
+		'plugin_guids[]' => $plugin->guid
 	));
 
-	$action_button = elgg_view('output/url', array(
-		'href' 		=> $url,
-		'text'		=> elgg_echo($action),
-		'is_action'	=> true,
-		'class'		=> "elgg-button $class"
-	));
-} else {
-	$action_button = elgg_view('output/url', array(
-		'text'		=> elgg_echo('admin:plugins:cannot_activate'),
-		'disabled'	=> 'disabled',
-		'class'		=> "elgg-button elgg-button-action elgg-state-disabled"
-	));
+	$options['href'] = $url;
 }
+$action_button = elgg_view('output/url', $options);
 
 // Display categories
 $categories_html = '';
@@ -123,7 +142,7 @@ if ($categories) {
 }
 
 $screenshots_html = '';
-$screenshots = $plugin->manifest->getScreenshots();
+$screenshots = $plugin->getManifest()->getScreenshots();
 if ($screenshots) {
 	$base_url = elgg_get_plugins_path() . $plugin->getID() . '/';
 	foreach ($screenshots as $screenshot) {
@@ -138,17 +157,17 @@ if ($screenshots) {
 }
 
 // metadata
-$description = elgg_view('output/longtext', array('value' => $plugin->manifest->getDescription()));
+$description = elgg_view('output/longtext', array('value' => $plugin->getManifest()->getDescription()));
 $author = '<span>' . elgg_echo('admin:plugins:label:author') . '</span>: '
-			. elgg_view('output/text', array('value' => $plugin->manifest->getAuthor()));
-$version = htmlspecialchars($plugin->manifest->getVersion());
+			. elgg_view('output/text', array('value' => $plugin->getManifest()->getAuthor()));
+$version = htmlspecialchars($plugin->getManifest()->getVersion());
 $website = elgg_view('output/url', array(
-	'href' => $plugin->manifest->getWebsite(),
-	'text' => $plugin->manifest->getWebsite()
+	'href' => $plugin->getManifest()->getWebsite(),
+	'text' => $plugin->getManifest()->getWebsite()
 ));
 
-$copyright = elgg_view('output/text', array('value' => $plugin->manifest->getCopyright()));
-$license = elgg_view('output/text', array('value' => $plugin->manifest->getLicense()));
+$copyright = elgg_view('output/text', array('value' => $plugin->getManifest()->getCopyright()));
+$license = elgg_view('output/text', array('value' => $plugin->getManifest()->getLicense()));
 
 // show links to text files
 $files = $plugin->getAvailableTextFiles();
@@ -170,30 +189,33 @@ if ($files) {
 
 ?>
 
-<div class="elgg-state-draggable elgg-plugin <?php echo $active_class ?>" id="elgg-plugin-<?php echo $plugin->guid; ?>">
+<div class="<?php echo $draggable; ?> elgg-plugin <?php echo $active_class ?>" id="elgg-plugin-<?php echo $plugin->guid; ?>">
 	<div class="elgg-image-block">
 		<div class="elgg-image-alt">
+			<?php if ($links) : ?>
 			<ul class="elgg-menu elgg-menu-metadata">
-				<?php echo "$links"; ?>
+				<?php echo $links; ?>
 			</ul>
+			<?php endif; ?>
 			<div class="clearfloat right mtm">
 				<?php echo $action_button; ?>
 			</div>
 		</div>
 		<div class="elgg-body">
 <?php
-$settings_view = 'settings/' . $plugin->getID() . '/edit';
-if (elgg_view_exists($settings_view)) {
+$settings_view_old = 'settings/' . $plugin->getID() . '/edit';
+$settings_view_new = 'plugins/' . $plugin->getID() . '/settings';
+if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)) {
 	$link = elgg_get_site_url() . "admin/plugin_settings/" . $plugin->getID();
 	$settings_link = "<a class='plugin_settings small link' href='$link'>[" . elgg_echo('settings') . "]</a>";
 }
 ?>
 			<div class="elgg-head">
-				<h3><?php echo $plugin->manifest->getName(). " $version $settings_link"; ?></h3>
+				<h3><?php echo $plugin->getManifest()->getName(). " $version $settings_link"; ?></h3>
 			</div>
 			<?php
-			if ($plugin->manifest->getApiVersion() < 1.8) {
-				$reqs = $plugin->manifest->getRequires();
+			if ($plugin->getManifest()->getApiVersion() < 1.8) {
+				$reqs = $plugin->getManifest()->getRequires();
 				if (!$reqs) {
 					$message = elgg_echo('admin:plugins:warning:elgg_version_unknown');
 					echo "<p class=\"elgg-state-error\">$message</p>";
@@ -201,8 +223,13 @@ if (elgg_view_exists($settings_view)) {
 			}
 	
 			if (!$can_activate) {
-				$message = elgg_echo('admin:plugins:warning:unmet_dependencies');
-				echo "<p class=\"elgg-state-error\">$message</p>";
+				if ($active) {
+					$message = elgg_echo('admin:plugins:warning:unmet_dependencies_active');
+					echo "<p class=\"elgg-state-warning\">$message</p>";
+				} else {
+					$message = elgg_echo('admin:plugins:warning:unmet_dependencies');
+					echo "<p class=\"elgg-state-error\">$message</p>";
+				}
 			}
 			?>
 	
diff --git a/views/default/object/plugin/elements/dependencies.php b/views/default/object/plugin/elements/dependencies.php
index 11a441a4a..5f4aa4392 100644
--- a/views/default/object/plugin/elements/dependencies.php
+++ b/views/default/object/plugin/elements/dependencies.php
@@ -9,7 +9,7 @@
  */
 
 $plugin = elgg_extract('plugin', $vars, false);
-$deps = $plugin->package->checkDependencies(true);
+$deps = $plugin->getPackage()->checkDependencies(true);
 
 $columns = array('type', 'name', 'expected_value', 'local_value', 'comment');
 
@@ -20,7 +20,7 @@ foreach ($columns as $column) {
 	echo "<th class=\"pas\">$column</th>";
 }
 
-echo '<tr/>';
+echo '</tr>';
 
 $row = 'odd';
 foreach ($deps as $dep) {
@@ -28,9 +28,9 @@ foreach ($deps as $dep) {
 	$type = $dep['type'];
 
 	if ($dep['status']) {
-		$class = "elgg-state-success elgg-dependency-$type";
+		$class = "elgg-state-success elgg-dependency elgg-dependency-$type";
 	} else {
-		$class = "elgg-state-error elgg-dependency-$type";
+		$class = "elgg-state-error elgg-dependency elgg-dependency-$type";
 	}
 
 	echo "<tr class=\"$row\">";
diff --git a/views/default/object/plugin/simple.php b/views/default/object/plugin/simple.php
index d57d81934..5f5b08f10 100644
--- a/views/default/object/plugin/simple.php
+++ b/views/default/object/plugin/simple.php
@@ -5,11 +5,11 @@ $plugin_guid = $plugin->guid;
 $plugin_id = $plugin->getID();
 $active = $plugin->isActive();
 $can_activate = $plugin->canActivate();
-$name = $plugin->manifest->getName();
-$author = $plugin->manifest->getAuthor();
-$version = $plugin->manifest->getVersion();
-$website = $plugin->manifest->getWebsite();
-$description = $plugin->manifest->getDescription();
+$name = $plugin->getManifest()->getName();
+$author = $plugin->getManifest()->getAuthor();
+$version = $plugin->getManifest()->getVersion();
+$website = $plugin->getManifest()->getWebsite();
+$description = $plugin->getManifest()->getDescription();
 
 if ($active) {
 	$active_class = 'elgg-state-active';
diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index 967094113..5059a656e 100644
--- a/views/default/output/confirmlink.php
+++ b/views/default/output/confirmlink.php
@@ -13,7 +13,8 @@
  * @uses $vars['text_encode'] Encode special characters? (false)
  */
 
-$confirm = elgg_extract('confirm', $vars, elgg_echo('question:areyousure'));
+$vars['rel'] = elgg_extract('confirm', $vars, elgg_echo('question:areyousure'));
+$vars['rel'] = addslashes($vars['rel']);
 $encode = elgg_extract('text_encode', $vars, false);
 
 // always generate missing action tokens
@@ -36,7 +37,6 @@ if (isset($vars['class'])) {
 } else {
 	$vars['class'] = 'elgg-requires-confirmation';
 }
-//$vars['onclick'] = "return confirm('" . addslashes($confirm) . "')";
 
 unset($vars['encode_text']);
 unset($vars['text']);
diff --git a/views/default/output/location.php b/views/default/output/location.php
new file mode 100644
index 000000000..e3619d2e1
--- /dev/null
+++ b/views/default/output/location.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Display a location
+ *
+ * @uses $vars['entity'] The ElggEntity that has a location
+ * @uses $vars['value']  The location string if the entity is not passed
+ */
+
+if (isset($vars['entity'])) {
+	$vars['value'] = $vars['entity']->location;
+	unset($vars['entity']);
+}
+
+echo elgg_view('output/tag', $vars);
diff --git a/views/default/output/tag.php b/views/default/output/tag.php
new file mode 100644
index 000000000..abae9c4b2
--- /dev/null
+++ b/views/default/output/tag.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Elgg single tag output
+ *
+ * @uses $vars['value']   String
+ * @uses $vars['type']    The entity type, optional
+ * @uses $vars['subtype'] The entity subtype, optional
+ *
+ */
+
+if (!empty($vars['subtype'])) {
+	$subtype = "&subtype=" . urlencode($vars['subtype']);
+} else {
+	$subtype = "";
+}
+if (!empty($vars['object'])) {
+	$object = "&object=" . urlencode($vars['object']);
+} else {
+	$object = "";
+}
+
+if (isset($vars['value'])) {
+	if (!empty($vars['type'])) {
+		$type = "&type={$vars['type']}";
+	} else {
+		$type = "";
+	}
+	$url = elgg_get_site_url() . 'search?q=' . urlencode($vars['value']) . "&search_type=tags{$type}{$subtype}{$object}";
+	echo elgg_view('output/url', array('href' => $url, 'text' => $vars['value'], 'rel' => 'tag'));
+}
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index 345b256c4..6dedfacc7 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -1,17 +1,19 @@
 <?php
 /**
  * Elgg tags
- *
  * Tags can be a single string (for one tag) or an array of strings
  *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['tags'] The tags to display
- * @uses $vars['type'] The entity type, optional
+ * @uses $vars['value']   Array of tags or a string
+ * @uses $vars['type']    The entity type, optional
  * @uses $vars['subtype'] The entity subtype, optional
+ * @uses $vars['entity']  Optional. Entity whose tags are being displayed (metadata ->tags)
  */
 
+if (isset($vars['entity'])) {
+	$vars['tags'] = $vars['entity']->tags;
+	unset($vars['entity']);
+}
+
 if (!empty($vars['subtype'])) {
 	$subtype = "&subtype=" . urlencode($vars['subtype']);
 } else {
@@ -27,6 +29,10 @@ if (empty($vars['tags']) && !empty($vars['value'])) {
 	$vars['tags'] = $vars['value'];
 }
 
+if (empty($vars['tags']) && isset($vars['entity'])) {
+	$vars['tags'] = $vars['entity']->tags;
+}
+
 if (!empty($vars['tags'])) {
 	if (!is_array($vars['tags'])) {
 		$vars['tags'] = array($vars['tags']);
diff --git a/views/default/page/components/summary.php b/views/default/page/components/summary.php
index 578e9b9cf..ea61a6e4b 100644
--- a/views/default/page/components/summary.php
+++ b/views/default/page/components/summary.php
@@ -1,53 +1,4 @@
 <?php
-/**
- * List body
- *
- * Sample output
- * <ul class="elgg-menu elgg-menu-metadata"><li>Public</li><li>Like this</li></ul>
- * <h3><a href="">Title</a></h3>
- * <p class="elgg-subtext">Posted 3 hours ago by George</p>
- * <p class="elgg-tags"><a href="">one</a>, <a href="">two</a></p>
- * <div class="elgg-list-content">Excerpt text</div>
- *
- * @uses $vars['entity']    ElggEntity
- * @uses $vars['title']     Title link (optional) false = no title, '' = default
- * @uses $vars['metadata']  HTML for entity metadata and actions (optional)
- * @uses $vars['subtitle']  HTML for the subtitle (optional)
- * @uses $vars['tags']      HTML for the tags (optional)
- * @uses $vars['content']   HTML for the entity content (optional)
- */
 
-$entity = $vars['entity'];
-
-$title_link = elgg_extract('title', $vars, '');
-if ($title_link === '') {
-	if (isset($entity->title)) {
-		$text = $entity->title;
-	} else {
-		$text = $entity->name;
-	}
-	$params = array(
-		'text' => $text,
-		'href' => $entity->getURL(),
-	);
-	$title_link = elgg_view('output/url', $params);
-}
-
-$metadata = elgg_extract('metadata', $vars, '');
-$subtitle = elgg_extract('subtitle', $vars, '');
-$content = elgg_extract('content', $vars, '');
-
-$tags = elgg_extract('tags', $vars, '');
-if ($tags !== false) {
-	$tags = elgg_view('output/tags', array('tags' => $entity->tags));
-}
-
-if ($metadata) {
-	echo $metadata;
-}
-echo "<h3>$title_link</h3>";
-echo "<div class=\"elgg-subtext\">$subtitle</div>";
-echo $tags;
-if ($content) {
-	echo "<div class=\"elgg-list-content\">$content</div>";
-}
+// Deprecated in favor of type/elements/summary
+echo elgg_view('object/elements/summary', $vars);
diff --git a/views/default/page/elements/comments_block.php b/views/default/page/elements/comments_block.php
index 751aa4312..d0f8ab809 100644
--- a/views/default/page/elements/comments_block.php
+++ b/views/default/page/elements/comments_block.php
@@ -36,6 +36,7 @@ if ($comments) {
 		'items' => $comments,
 		'pagination' => false,
 		'list_class' => 'elgg-latest-comments',
+		'full_view' => false,
 	));
 } else {
 	$body = '<p>' . elgg_echo('generic_comment:none') . '</p>';
diff --git a/views/default/page/elements/header.php b/views/default/page/elements/header.php
index 2361644f2..1a1f5d211 100644
--- a/views/default/page/elements/header.php
+++ b/views/default/page/elements/header.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Elgg header contents
- * This file holds the header output that a user will see
- **/
+ * Elgg page header
+ * In the default theme, the header lives between the topbar and main content area.
+ */
 
 // link back to main site.
 echo elgg_view('page/elements/header_logo', $vars);
diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
index 17c5d938b..e4c6c86bb 100644
--- a/views/default/page/elements/topbar.php
+++ b/views/default/page/elements/topbar.php
@@ -1,14 +1,16 @@
 <?php
 /**
- * Elgg top toolbar
+ * Elgg topbar
  * The standard elgg top toolbar
  */
 
-
-
 // Elgg logo
 echo elgg_view_menu('topbar', array('sort_by' => 'priority', array('elgg-menu-hz')));
 
 // elgg tools menu
 // need to echo this empty view for backward compatibility.
-echo elgg_view("navigation/topbar_tools");
+$content = elgg_view("navigation/topbar_tools");
+if ($content) {
+	elgg_deprecated_notice('navigation/topbar_tools was deprecated. Extend the topbar menus or the page/elements/topbar view directly', 1.8);
+	echo $content;
+}
diff --git a/views/default/page/layouts/widgets/add_panel.php b/views/default/page/layouts/widgets/add_panel.php
index 2786e83b2..9eb78cdb6 100644
--- a/views/default/page/layouts/widgets/add_panel.php
+++ b/views/default/page/layouts/widgets/add_panel.php
@@ -12,6 +12,7 @@ $context = $vars['context'];
 $exact = elgg_extract('exact_match', $vars, false);
 
 $widget_types = elgg_get_widget_types($context, $exact);
+uasort($widget_types, create_function('$a,$b', 'return strcmp($a->name,$b->name);'));
 
 $current_handlers = array();
 foreach ($widgets as $column_widgets) {
diff --git a/views/default/river/user/default/profileiconupdate.php b/views/default/river/user/default/profileiconupdate.php
new file mode 100644
index 000000000..a723c5335
--- /dev/null
+++ b/views/default/river/user/default/profileiconupdate.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Update avatar river view
+ */
+$subject = $vars['item']->getSubjectEntity();
+
+$subject_icon = elgg_view_entity_icon($subject, 'tiny');
+
+echo elgg_echo("profile:river:iconupdate");
+
+echo '<div class="elgg-river-content clearfix">';
+echo $subject_icon;
+echo '</div>';
diff --git a/views/default/user/default.php b/views/default/user/default.php
index 71eb273f0..c0c18f85f 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -6,25 +6,26 @@
  * @uses $vars['size']   Size of the icon
  */
 
-$user = $vars['entity'];
+$entity = $vars['entity'];
 $size = elgg_extract('size', $vars, 'tiny');
 
-$icon = elgg_view_entity_icon($user, $size);
+$icon = elgg_view_entity_icon($entity, $size);
 
 // Simple XFN
 $rel = '';
-if (elgg_get_logged_in_user_guid() == $user->guid) {
+if (elgg_get_logged_in_user_guid() == $entity->guid) {
 	$rel = 'rel="me"';
-} elseif (check_entity_relationship(elgg_get_logged_in_user_guid(), 'friend', $user->guid)) {
+} elseif (check_entity_relationship(elgg_get_logged_in_user_guid(), 'friend', $entity->guid)) {
 	$rel = 'rel="friend"';
 }
 
-$title = "<a href=\"" . $user->getUrl() . "\" $rel>" . $user->name . "</a>";
+$title = "<a href=\"" . $entity->getUrl() . "\" $rel>" . $entity->name . "</a>";
 
-
-$metadata = "<ul class=\"elgg-menu elgg-menu-metadata\"><li>$user->location</li>";
-$metadata .= elgg_view("entity/metadata", array('entity' => $user));
-$metadata .= "</ul>";
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $entity,
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));
 
 if (elgg_in_context('owner_block') || elgg_in_context('widgets')) {
 	$metadata = '';
@@ -33,24 +34,24 @@ if (elgg_in_context('owner_block') || elgg_in_context('widgets')) {
 if (elgg_get_context() == 'gallery') {
 	echo $icon;
 } else {
-	if ($user->isBanned()) {
+	if ($entity->isBanned()) {
 		$banned = elgg_echo('banned');
 		$params = array(
-			'entity' => $user,
+			'entity' => $entity,
 			'title' => $title,
-			'metadata' => '<ul class="elgg-menu elgg-menu-metadata"><li>$banned</li></ul>',
+			'metadata' => $metadata,
 		);
 	} else {
 		$params = array(
-			'entity' => $user,
+			'entity' => $entity,
 			'title' => $title,
 			'metadata' => $metadata,
-			'subtitle' => $user->briefdescription,
-			'content' => elgg_view('user/status', array('entity' => $user)),
+			'subtitle' => $entity->briefdescription,
+			'content' => elgg_view('user/status', array('entity' => $entity)),
 		);
 	}
 
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('user/elements/summary', $params);
 
 	echo elgg_view_image_block($icon, $list_body);
 }
diff --git a/views/default/user/elements/summary.php b/views/default/user/elements/summary.php
new file mode 100644
index 000000000..46d11c14c
--- /dev/null
+++ b/views/default/user/elements/summary.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * User summary
+ *
+ * @uses $vars['entity']    ElggEntity
+ * @uses $vars['title']     Title link (optional) false = no title, '' = default
+ * @uses $vars['metadata']  HTML for entity metadata and actions (optional)
+ * @uses $vars['subtitle']  HTML for the subtitle (optional)
+ * @uses $vars['tags']      HTML for the tags (optional)
+ * @uses $vars['content']   HTML for the entity content (optional)
+ */
+
+echo elgg_view('object/elements/summary', $vars);
diff --git a/views/default/widgets/admin_welcome/content.php b/views/default/widgets/admin_welcome/content.php
index 4ebdb719c..f4b92ea66 100644
--- a/views/default/widgets/admin_welcome/content.php
+++ b/views/default/widgets/admin_welcome/content.php
@@ -7,16 +7,13 @@
 $sections = array(
 	'intro' => array(),
 	'admin_overview' => array(),
-	'common_links' => array(
-			elgg_normalize_url('pg/admin/plugins/simple'),
-			elgg_normalize_url('pg/admin/site/advanced'),
-	),
-	'external_resources' => array(),
 	'outro' => array()
 );
 
 // don't use longtext because it filters output.
 // that's annoying.
+echo '<div class="elgg-output">';
 foreach ($sections as $section => $strings) {
 	echo '<p>' . elgg_echo("admin:widget:admin_welcome:$section", $strings) . '</p>';
-}
\ No newline at end of file
+}
+echo '</div>';
\ No newline at end of file
diff --git a/views/installation/forms/install/template.php b/views/installation/forms/install/template.php
index 7e7a668d3..385168fe4 100644
--- a/views/installation/forms/install/template.php
+++ b/views/installation/forms/install/template.php
@@ -15,11 +15,11 @@ foreach ($variables as $field => $params) {
 	$help = elgg_echo("install:$type:help:$field");
 	$params['name'] = $field;
 
-	$form_body .= '<p>';
+	$form_body .= '<div>';
 	$form_body .= "<label>$label</label>";
 	$form_body .= elgg_view("input/{$params['type']}", $params);
 	$form_body .= "<span class=\"install-help\">$help</span>";
-	$form_body .= '</p>';
+	$form_body .= '</div>';
 }
 
 $submit_params = array(
@@ -28,19 +28,3 @@ $submit_params = array(
 $form_body .= elgg_view('input/submit', $submit_params);
 
 echo $form_body;
-
-?>
-
-<script type="text/javascript">
-	//prevent double-submission
-	$(function() {
-		$('form').submit(function() {
-			if (this.data('submitted')) {
-				return false;
-			}
-
-			this.data('submitted', true);
-			return true;
-		}
-	});
-</script>
diff --git a/views/installation/input/access.php b/views/installation/input/access.php
index 3fde7295f..7665d8bca 100644
--- a/views/installation/input/access.php
+++ b/views/installation/input/access.php
@@ -3,11 +3,7 @@
  * Elgg access level input
  * Displays a dropdown input field
  *
- * @package Elgg
- * @subpackage Core
- *
  * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
  * @uses $vars['name'] The name of the input field
  *
  */
@@ -28,7 +24,7 @@ if (is_array($vars['options']) && sizeof($vars['options']) > 0) {
 
 	?>
 
-	<select name="<?php echo $vars['name']; ?>" <?php if (isset($vars['js'])) echo $vars['js']; ?> <?php if ((isset($vars['disabled'])) && ($vars['disabled'])) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
+	<select name="<?php echo $vars['name']; ?>" <?php if ((isset($vars['disabled'])) && ($vars['disabled'])) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
 	<?php
 
 		foreach($vars['options'] as $key => $option) {
diff --git a/views/installation/input/button.php b/views/installation/input/button.php
index a69f7dbfa..29a37dd55 100644
--- a/views/installation/input/button.php
+++ b/views/installation/input/button.php
@@ -1,18 +1,10 @@
 <?php
 /**
  * Create a input button
- * Use this view for forms rather than creating a submit/reset button tag in the wild as it provides
- * extra security which help prevent CSRF attacks.
- *
- * @package Elgg
- * @subpackage Core
  *
  * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
  * @uses $vars['name'] The name of the input field
- * @uses $vars['type'] Submit or reset, defaults to submit.
- * @uses $vars['src'] Src of an image
- *
+ * @uses $vars['type'] submit or button.
  */
 
 $class = $vars['class'];
@@ -30,9 +22,6 @@ switch ($type) {
 	case 'button' :
 		$type='button';
 		break;
-	case 'reset' :
-		$type='reset';
-		break;
 	case 'submit':
 	default:
 		$type = 'submit';
@@ -40,10 +29,5 @@ switch ($type) {
 
 $value = htmlentities($vars['value'], ENT_QUOTES, 'UTF-8');
 $name = $vars['name'];
-$src = $vars['src'];
-// blank src if trying to access an offsite image.
-if (strpos($src, elgg_get_site_url()) === false) {
-	$src = "";
-}
 ?>
-<input type="<?php echo $type; ?>" <?php if (isset($vars['id'])) echo "id=\"{$vars['id']}\"";?> <?php echo $vars['js']; ?> value="<?php echo $value; ?>" src="<?php echo $src; ?>" class="<?php echo $class; ?>" />
\ No newline at end of file
+<input type="<?php echo $type; ?>" <?php if (isset($vars['id'])) echo "id=\"{$vars['id']}\"";?> value="<?php echo $value; ?>" class="<?php echo $class; ?>" />
\ No newline at end of file
diff --git a/views/installation/input/checkbox.php b/views/installation/input/checkbox.php
index 898fe8458..378eae6fd 100644
--- a/views/installation/input/checkbox.php
+++ b/views/installation/input/checkbox.php
@@ -2,32 +2,29 @@
 /**
  * Elgg checkbox input
  * Displays a checkbox input tag
- * 
- * @package Elgg
- * @subpackage Core
  *
- *
- * Pass input tag attributes as key value pairs. For a list of allowable
- * attributes, see http://www.w3schools.com/tags/tag_input.asp
- * 
- * @uses mixed $vars['default'] The default value to submit if not checked.
- *                              Optional, defaults to 0. Set to false for no default.
+ * @uses $var['name']
+ * @uses $vars['value']
+ * @uses $vars['id']
+ * @uses $vars['class']
  */
 
-$defaults = array(
-	'class' => 'elgg-input-checkbox',
-	'default' => 0,
-);
-
-$vars = array_merge($defaults, $vars);
+if (isset($vars['id'])) {
+	$id = "id=\"{$vars['id']}\"";
+} else {
+	$id = '';
+}
 
-$default = $vars['default'];
-unset($vars['default']);
+if (isset($vars['class'])) {
+	$id = "class=\"{$vars['class']}\"";
+} else {
+	$id = '';
+}
 
-if (isset($vars['name']) && $default !== false) {
-	echo "<input type=\"hidden\" name=\"{$vars['name']}\" value=\"$default\"/>";
+if (!isset($vars['value'])) {
+	$vars['value'] = $vars['name'];
 }
 
 ?>
 
-<input type="checkbox" <?php echo elgg_format_attributes($vars); ?> />
\ No newline at end of file
+<input type="checkbox" <?php echo $id; ?> <?php echo $class; ?> name="<?php echo $vars['name']; ?>" value="<?php echo $vars['value']; ?>" />
\ No newline at end of file
diff --git a/views/installation/input/checkboxes.php b/views/installation/input/checkboxes.php
deleted file mode 100644
index c78fe4db0..000000000
--- a/views/installation/input/checkboxes.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Elgg checkbox input
- * Displays a checkbox input field
- *
- * @note This also includes a hidden input with the same name as the checkboxes
- * to make sure something is sent to the server.  The default value is 0.
- * If using JS, be specific to avoid selecting the hidden default value:
- * 	$('input[type=checkbox][name=name]')
- * 
- * @warning Passing integers as labels does not currently work due to a
- * deprecated hack that will be removed in Elgg 1.9. To use integer labels,
- * the labels must be character codes: 1 would be &#0049;
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses string $vars['name'] The name of the input fields
- *                                    (Forced to an array by appending [])
- * @uses array  $vars['options']      An array of strings representing the
- *                                    label => option for the each checkbox field
- * @uses string $vars['id']   The id for each input field. Optional.
- *                                    (Only use this with a single value.)
- * @uses string $vars['default']      The default value to send if nothing is checked.
- *                                    Optional, defaults to 0. Set to FALSE for no default.
- * @uses bool   $vars['disabled']     Make all input elements disabled. Optional.
- * @uses string $vars['value']        The current value. Optional.
- * @uses string $vars['class']        Additional class of the list. Optional.
- * @uses string $vars['align']       'horizontal' or 'vertical' Default: 'vertical'
- *
- */
-
-$additional_class = elgg_extract('class', $vars);
-$align = elgg_extract('align', $vars, 'vertical');
-$value = (isset($vars['value'])) ? $vars['value'] : NULL;
-$value_array = (is_array($value)) ? array_map('elgg_strtolower', $value) : array(elgg_strtolower($value));
-$name = (isset($vars['name'])) ? $vars['name'] : '';
-$options = (isset($vars['options']) && is_array($vars['options'])) ? $vars['options'] : array();
-$default = (isset($vars['default'])) ? $vars['default'] : 0;
-
-$id = (isset($vars['id'])) ? $vars['id'] : '';
-$disabled = (isset($vars['disabled'])) ? $vars['disabled'] : FALSE;
-$js = (isset($vars['js'])) ? $vars['js'] : '';
-
-$class = "elgg-input-checkboxes elgg-$align";
-if ($additional_class) {
-	$class = " $additional_class";
-}
-
-if ($options && count($options) > 0) {
-	// include a default value so if nothing is checked 0 will be passed.
-	if ($name && $default !== FALSE) {
-		echo "<input type=\"hidden\" name=\"$name\" value=\"$default\" />";
-	}
-
-	echo "<ul class=\"$class\">";
-	foreach ($options as $label => $option) {
-		// @deprecated 1.8 Remove in 1.9
-		if (is_integer($label)) {
-			elgg_deprecated_notice('$vars[\'options\'] must be an associative array in input/checkboxes', 1.8);
-			$label = $option;
-		}
-
-		$input_vars = array(
-			'checked' => in_array(elgg_strtolower($option), $value_array),
-			'value' => $option,
-			'disabled' => $disabled,
-			'id' => $id,
-			'js' => $js,
-			'default' => false,
-		);
-
-		if ($name) {
-			$input_vars['name'] = "{$name}[]";
-		}
-		
-		$input = elgg_view('input/checkbox', $input_vars);
-
-		echo "<li><label>{$input}{$label}</label></li>";
-	}
-	echo '</ul>';
-}
\ No newline at end of file
diff --git a/views/installation/input/combo.php b/views/installation/input/combo.php
new file mode 100644
index 000000000..508dbcd01
--- /dev/null
+++ b/views/installation/input/combo.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Combination of text box and check box. When the checkbox is checked, the
+ * text field is cleared and disabled.
+ *
+ */
+
+$label = elgg_echo('install:label:combo:' . $vars['name']);
+
+$vars['class'] = "elgg-combo-text";
+echo elgg_view('input/text', $vars);
+
+$vars['class'] = "elgg-combo-checkbox";
+$vars['value'] = "{$vars['name']}-checkbox";
+echo elgg_view('input/checkbox', $vars);
+
+echo "<label class=\"elgg-combo-label\">$label</label>";
+
+echo '<div class="clearfloat"></div>';
\ No newline at end of file
diff --git a/views/installation/input/dropdown.php b/views/installation/input/dropdown.php
index 141ff65b0..46e15c657 100644
--- a/views/installation/input/dropdown.php
+++ b/views/installation/input/dropdown.php
@@ -3,11 +3,7 @@
  * Elgg dropdown input
  * Displays a dropdown input field
  *
- * @package Elgg
- * @subpackage Core
- *
  * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
  * @uses $vars['name'] The name of the input field
  * @uses $vars['options'] An array of strings representing the options for the dropdown field
  * @uses $vars['options_values'] An associative array of "value" => "option" where "value" is an internal name and "option" is
@@ -20,7 +16,7 @@ if (!$class) {
 	$class = "elgg-input-dropdown";
 }
 ?>
-<select name="<?php echo $vars['name']; ?>" <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
+<select name="<?php echo $vars['name']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
 <?php
 if ($vars['options_values']) {
 	foreach($vars['options_values'] as $value => $option) {
diff --git a/views/installation/input/form.php b/views/installation/input/form.php
index b131c9d10..f8730b4f5 100644
--- a/views/installation/input/form.php
+++ b/views/installation/input/form.php
@@ -1,36 +1,26 @@
 <?php
 /**
  * Create a form for data submission.
- * Use this view for forms rather than creating a form tag in the wild as it provides
- * extra security which help prevent CSRF attacks.
  *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['body'] The body of the form (made up of other input/xxx views and html
- * @uses $vars['method'] Method (default POST)
- * @uses $vars['enctype'] How the form is encoded, default blank
+ * @uses $vars['body']   The body of the form (made up of other input/xxx views and html
  * @uses $vars['action'] URL of the action being called
- *
+ * @uses $vars['method'] Method (default POST)
+ * @uses $vars['id']     Form id
+ * @uses $vars['name']   Form name
  */
 
 if (isset($vars['id'])) {
-	$id = $vars['id'];
+	$id = "id=\"{$vars['id']}\"";
 } else {
 	$id = '';
 }
 if (isset($vars['name'])) {
-	$name = $vars['name'];
+	$name = "name=\"{$vars['name']}\"";
 } else {
 	$name = '';
 }
 $body = $vars['body'];
 $action = $vars['action'];
-if (isset($vars['enctype'])) {
-	$enctype = $vars['enctype'];
-} else {
-	$enctype = '';
-}
 if (isset($vars['method'])) {
 	$method = $vars['method'];
 } else {
@@ -39,13 +29,7 @@ if (isset($vars['method'])) {
 
 $method = strtolower($method);
 
-// Generate a security header
-$security_header = "";
-if (!isset($vars['disable_security']) || $vars['disable_security'] != true) {
-	$security_header = elgg_view('input/securitytoken');
-}
 ?>
-<form <?php if ($id) { ?>id="<?php echo $id; ?>" <?php } ?> <?php if ($name) { ?>name="<?php echo $name; ?>" <?php } ?> action="<?php echo $action; ?>" method="<?php echo $method; ?>" <?php if ($enctype!="") echo "enctype=\"$enctype\""; ?> <?php echo $vars['js']; ?>>
-<?php echo $security_header; ?>
+<form <?php echo "$id $name"; ?> action="<?php echo $action; ?>" method="<?php echo $method; ?>">
 <?php echo $body; ?>
 </form>
\ No newline at end of file
diff --git a/views/installation/input/hidden.php b/views/installation/input/hidden.php
deleted file mode 100644
index c9800ebbb..000000000
--- a/views/installation/input/hidden.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Create a hidden data field
- * Use this view for forms rather than creating a hidden tag in the wild as it provides
- * extra security which help prevent CSRF attacks.
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['name'] The name of the input field
- *
- */
-?>
-<input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['name']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" />
\ No newline at end of file
diff --git a/views/installation/input/longtext.php b/views/installation/input/longtext.php
deleted file mode 100644
index 820a51da4..000000000
--- a/views/installation/input/longtext.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Elgg long text input
- * Displays a long text input field
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['name'] The name of the input field
- *
- */
-
-$class = $vars['class'];
-if (!$class) {
-	$class = "elgg-input-textarea";
-}
-
-?>
-
-<textarea class="<?php echo $class; ?>" name="<?php echo $vars['name']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo $vars['value']; ?></textarea>
\ No newline at end of file
diff --git a/views/installation/input/password.php b/views/installation/input/password.php
index 8ba79228d..18811109b 100644
--- a/views/installation/input/password.php
+++ b/views/installation/input/password.php
@@ -3,11 +3,7 @@
  * Elgg password input
  * Displays a password input field
  *
- * @package Elgg
- * @subpackage Core
- *
  * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
  * @uses $vars['name'] The name of the input field
  *
  */
@@ -18,4 +14,4 @@ if (!$class) {
 }
 ?>
 
-<input type="password" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['name']; ?>" <?php if (isset($vars['id'])) echo "id=\"{$vars['id']}\""; ?> value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>" />
+<input type="password" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> name="<?php echo $vars['name']; ?>" <?php if (isset($vars['id'])) echo "id=\"{$vars['id']}\""; ?> value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>" />
diff --git a/views/installation/input/reset.php b/views/installation/input/reset.php
deleted file mode 100644
index 0c83a92ca..000000000
--- a/views/installation/input/reset.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Create a reset input button
- * Use this view for forms rather than creating a submit/reset button tag in the wild as it provides
- * extra security which help prevent CSRF attacks.
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$vars['type'] = 'reset';
-
-echo elgg_view('input/button', $vars);
\ No newline at end of file
diff --git a/views/installation/input/securitytoken.php b/views/installation/input/securitytoken.php
deleted file mode 100644
index 75410848a..000000000
--- a/views/installation/input/securitytoken.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * CSRF security token view for use with secure forms.
- *
- * It is still recommended that you use input/form.
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$ts = time();
-$token = generate_action_token($ts);
-
-echo elgg_view('input/hidden', array('name' => '__elgg_token', 'value' => $token));
-echo elgg_view('input/hidden', array('name' => '__elgg_ts', 'value' => $ts));
diff --git a/views/installation/input/submit.php b/views/installation/input/submit.php
index aefb2ada6..5d891c380 100644
--- a/views/installation/input/submit.php
+++ b/views/installation/input/submit.php
@@ -1,11 +1,9 @@
 <?php
 /**
  * Create a submit input button
- * Use this view for forms rather than creating a submit/reset button tag in the wild as it provides
- * extra security which help prevent CSRF attacks.
  *
- * @package Elgg
- * @subpackage Core
+ * @uses $vars['value'] The current value, if any
+ * @uses $vars['name'] The name of the input field
  */
 
 $vars['type'] = 'submit';
diff --git a/views/installation/input/text.php b/views/installation/input/text.php
index c59278b40..ec8233461 100644
--- a/views/installation/input/text.php
+++ b/views/installation/input/text.php
@@ -3,22 +3,23 @@
  * Elgg text input
  * Displays a text input field
  *
- * @package Elgg
- * @subpackage Core
-
-
- *
  * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['name'] The name of the input field
- * @uses $vars['disabled'] If true then control is read-only
- * @uses $vars['class'] Class override
+ * @uses $vars['name']  The name of the input field
+ * @uses $vars['class'] CSS class
+ * @uses $vars['id']    CSS id
  */
 
-$class = $vars['class'];
-if (!$class) {
-	$class = "input-text";
+if (isset($vars['class'])) {
+	$class = "class=\"{$vars['class']}\"";
+} else {
+	$class = "";
+}
+
+if (isset($vars['id'])) {
+	$id = "id=\"{$vars['id']}\"";
+} else {
+	$id = '';
 }
 
 ?>
-<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['name']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class ?>"/>
\ No newline at end of file
+<input type="text" name="<?php echo $vars['name']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" <?php echo $class; ?> <?php echo $id; ?>/>
\ No newline at end of file
diff --git a/views/installation/install/nav.php b/views/installation/install/nav.php
index 5426071c6..76bd2ac50 100644
--- a/views/installation/install/nav.php
+++ b/views/installation/install/nav.php
@@ -27,7 +27,7 @@ if (isset($vars['advance']) && !$vars['advance']) {
 
 
 echo <<<___END
-<div class="install-nav">
+<div class="elgg-install-nav">
 	$next
 	$refresh
 </div>
diff --git a/views/installation/install/pages/complete.php b/views/installation/install/pages/complete.php
index 0c9821fc2..2f5a04854 100644
--- a/views/installation/install/pages/complete.php
+++ b/views/installation/install/pages/complete.php
@@ -7,7 +7,7 @@ echo autop(elgg_echo('install:complete:instructions'));
 
 ?>
 
-<div class="install-nav">
+<div class="elgg-install-nav">
 <?php
 	$url = elgg_get_site_url() . $vars['destination'];
 	$text = elgg_echo('install:complete:gotosite');
diff --git a/views/installation/install/pages/requirements.php b/views/installation/install/pages/requirements.php
index b6516840f..e3689e761 100644
--- a/views/installation/install/pages/requirements.php
+++ b/views/installation/install/pages/requirements.php
@@ -20,7 +20,7 @@ $report = $vars['report'];
 foreach ($report as $category => $checks) {
 	$title = elgg_echo("install:require:$category");
 	echo "<h3>$title</h3>";
-	echo "<ul>";
+	echo "<ul class=\"elgg-require-$category\">";
 	foreach ($checks as $check) {
 		echo "<li class=\"{$check['severity']}\">";
 		echo autop($check['message']);
diff --git a/views/installation/page/default.php b/views/installation/page/default.php
index 7618e7255..a41a5b688 100644
--- a/views/installation/page/default.php
+++ b/views/installation/page/default.php
@@ -29,6 +29,8 @@ header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', TRUE);
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
 		<link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>install/css/install.css" type="text/css" />
+		<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.5.min.js"></script>
+		<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>install/js/install.js"></script>
 	</head>
 	<body>
 		<div class="elgg-page">
diff --git a/views/installation/page/elements/footer.php b/views/installation/page/elements/footer.php
index 3f7bdf189..d6a755fba 100644
--- a/views/installation/page/elements/footer.php
+++ b/views/installation/page/elements/footer.php
@@ -4,7 +4,7 @@
  */
 ?>
 <ul>
-	<li><a href="http://docs.elgg.org/wiki/Installation">Install instructions</a></li>
-	<li><a href="http://docs.elgg.org/wiki/Install_Troubleshooting">Install troubleshooting</a></li>
-	<li><a href="http://community.elgg.org/pg/groups/world">Elgg community forums</a></li>
+	<li><a href="http://docs.elgg.org/wiki/Installation" target="_blank">Install instructions</a></li>
+	<li><a href="http://docs.elgg.org/wiki/Install_Troubleshooting" target="_blank">Install troubleshooting</a></li>
+	<li><a href="http://community.elgg.org/pg/groups/world" target="_blank">Elgg community forums</a></li>
 </ul>
\ No newline at end of file