Index: .hgsub
===================================================================
--- .hgsub	(revision 786)
+++ .hgsub	(revision 0)
@@ -1,1 +1,1 @@
-inc/libs/clearbricks = https://clearbricks.org/hg
+inc/libs/clearbricks = https://bitbucket.org/dotclear/clearbricks
Index: .hgsubstate
===================================================================
--- .hgsubstate	(revision 843)
+++ .hgsubstate	(revision 782)
@@ -1,1 +1,1 @@
-4f62679e0756104bdc0b49eacaed9aba68735aa5 inc/libs/clearbricks
+cf8874ccc1fae0e9315d461497ff019f6dafeb7f inc/libs/clearbricks
Index: .hgtags
===================================================================
--- .hgtags	(revision 800)
+++ .hgtags	(revision 369)
@@ -1,7 +1,2 @@
 ec077f3c6b20bc6f7f40a113acaff0220457a2c4 2.3.0
 4e0137ddb12474d62b88c4966d5895a391b6d382 2.3.1
-43a9cace0f39c95463e66346dcc953ced40836be 2.4.2
-43a9cace0f39c95463e66346dcc953ced40836be 2.4.2
-0000000000000000000000000000000000000000 2.4.2
-0000000000000000000000000000000000000000 2.4.2
-6b3942c0cf7eee71ebd906ec0827c5962823dedf 2.4.2
Index: CHANGELOG
===================================================================
--- CHANGELOG	(revision 978)
+++ CHANGELOG	(revision 777)
@@ -1,60 +1,12 @@
-Dotclear 2.5.0 - 201?-??-13
-===========================================================
-* Add (none) option to image insertion title pattern
-* Smileys are not more converted in image in pre,code,kbd,script and math contents
-* Notes' title can be now enclosed in h4 (default), h3 or p HTML tag
-* Now display translated name and desc of plugins
-* Add publication date validation on post and page editing forms
-* Add description to widgets
-* Add syntax color option to theme editor plugin
-* Add delete button on media item page
-* Add/complement display modes (all pages, home page only, except on home page) for all widgets
-* {{tpl:Widgets}} without type attribute set displays now all widgets (from nav, extra and custom)
-* Add {{tpl:else}}, {{tpl:TagCount}}, <tpl:TagIf>, {{tpl:CategoryEntriesCount}} template tags
-* Add cat_only, no_tag and content_only attributes to {{tpl:EntryFirstImage}} tag
-* Add capitalize attribute to template filters' list
-* Enhance links lookup anti spam filter
-* Add hidden optional attribute for pages
-* Adaptative compression rate for thumbnails generation
-* Add timestamp on admin information messages
-* Update to jQuery 1.8.2 and jQuery-UI 1.9 (custom)
-* Add default favicon.ico
-* Add default attributes settings for image,mp3,flv insertion
-* Various bug fixes
-* Various cosmetic updates and contrast adjustments
-
-Dotclear 2.4.4 - 2012-08-13
-===========================================================
-* Bugfix: Programmed entries works again.
-* Compatibility fix: widgets are now fully php >=5.3 compliant
-* Security fix: potential CSRF in user management
-* has_tag now part of dotclear core, moved from tag plugin.
-* empty title fixed on rss reader widget
-
-Dotclear 2.4.3 - 2012-05-18
-===========================================================
-* Admin: My favorites menu can be hidden
-* Admin: Fix wordpress importer
-* Admin: about:config and user:pref tables are now more readable
-* Ductile theme: Blog logo can be changed
-* New lithuanian language (thanks to Paulius Černakauskas)
-* Various bug fixes
-
-Dotclear 2.4.2 - 2012-02-11
-===========================================================
-* Security fix release
-* 4 XSS vulnerabilities fixed, discovered by High-Tech Bridge
-
-Dotclear 2.4.1.2 - 2011-12-24
-===========================================================
-* Happy Christmas!
-* Security: fixed one SQL injection vulnerability in Clearbricks, thanks to Adjaya
-* New behaviour: publicGetURLFor
-* New behaviour: publicRegisterURL
-* New behaviour: templatePrepareParams
+Dotclear 2.4.1-dev
+===========================================================
+* New behavior : publicGetURLFor
+* New behavior : publicRegisterURL
+* New behavior : templatePrepareParams
 * Changed the way to get artefacts URLs, through $core->url->getURLFor calls, instead of $core->url->getBase()
 * new/updated parameter sql_only in $core->blog->getPosts and $core->blog->getComments
 
-Dotclear 2.4.0 - 2011-11-13
+
+Dotclear 2.4.0
 ===========================================================
 * Admin: new iconset from Thomas Daveluy
@@ -69,5 +21,5 @@
 * Various bug fixes
 
-Dotclear 2.3.1 - 2011-06-14
+Dotclear 2.3.1 - 2001-06-14
 ===========================================================
 * Updated makefile for cleaner distrib.
Index: admin/auth.php
===================================================================
--- admin/auth.php	(revision 794)
+++ admin/auth.php	(revision 550)
@@ -31,5 +31,5 @@
 
 $change_pwd = $core->auth->allowPassChange() && isset($_POST['new_pwd']) && isset($_POST['new_pwd_c']) && isset($_POST['login_data']);
-$login_data = !empty($_POST['login_data']) ? html::escapeHTML($_POST['login_data']) : null;
+$login_data = !empty($_POST['login_data']) ? $_POST['login_data'] : null;
 $recover = $core->auth->allowPassChange() && !empty($_REQUEST['recover']);
 $safe_mode = !empty($_REQUEST['safe_mode']);
Index: admin/blog_pref.php
===================================================================
--- admin/blog_pref.php	(revision 976)
+++ admin/blog_pref.php	(revision 557)
@@ -82,7 +82,5 @@
 	__('year/month/title') => '{y}/{m}/{t}',
 	__('year/title') => '{y}/{t}',
-	__('title') => '{t}',
-	__('post id/title') => '{id}/{t}',
-	__('post id') => '{id}'
+	__('title') => '{t}'
 );
 if (!in_array($blog_settings->system->post_url_format,$post_url_combo)) {
@@ -90,14 +88,6 @@
 }
 
-# Note title tag combo
-$note_title_tag_combo = array(
-	__('H4') => 0,
-	__('H3') => 1,
-	__('P') => 2
-);
-
 # Image title combo
 $img_title_combo = array(
-	__('(none)') => '',
 	__('Title') => 'Title ;; separator(, )',
 	__('Title, Date') => 'Title ;; Date(%b %Y) ;; separator(, )',
@@ -108,20 +98,4 @@
 	$img_title_combo[html::escapeHTML($blog_settings->system->media_img_title_pattern)] = html::escapeHTML($blog_settings->system->media_img_title_pattern);
 }
-
-# Image default size combo
-$img_default_size_combo = array();
-$media = new dcMedia($core);
-$img_default_size_combo[__('original')] = 'o';
-foreach ($media->thumb_sizes as $code => $size) {
-	$img_default_size_combo[__($size[2])] = $code;
-}
-
-# Image default alignment combo
-$img_default_alignment_combo = array(
-	__('None') => 'none',
-	__('Left') => 'left',
-	__('Right') => 'right',
-	__('Center') => 'center'
-);
 
 # Robots policy options
@@ -217,5 +191,4 @@
 		$blog_settings->system->put('wiki_comments',!empty($_POST['wiki_comments']));
 		$blog_settings->system->put('enable_xmlrpc',!empty($_POST['enable_xmlrpc']));
-		$blog_settings->system->put('note_title_tag',$_POST['note_title_tag']);
 		
 		$blog_settings->system->put('nb_post_per_page',$nb_post_per_page);
@@ -225,7 +198,4 @@
 		$blog_settings->system->put('media_img_m_size',$media_img_m_size);
 		$blog_settings->system->put('media_img_title_pattern',$_POST['media_img_title_pattern']);
-		$blog_settings->system->put('media_img_default_size',$_POST['media_img_default_size']);
-		$blog_settings->system->put('media_img_default_alignment',$_POST['media_img_default_alignment']);
-		$blog_settings->system->put('media_img_default_link',!empty($_POST['media_img_default_link']));
 		$blog_settings->system->put('nb_post_per_feed',$nb_post_per_feed);
 		$blog_settings->system->put('nb_comment_per_feed',$nb_comment_per_feed);
@@ -277,9 +247,9 @@
 	
 	if (!empty($_GET['add'])) {
-		dcPage::message(__('Blog has been successfully created.'));
+		echo '<p class="message">'.__('Blog has been successfully created.').'</p>';
 	}
 	
 	if (!empty($_GET['upd'])) {
-		dcPage::message(__('Blog has been successfully updated.'));
+		echo '<p class="message">'.__('Blog has been successfully updated.').'</p>';
 	}
 	
@@ -340,41 +310,19 @@
 	form::combo('blog_timezone',dt::getZones(true,true),html::escapeHTML($blog_settings->system->blog_timezone)).
 	'</label></p>'.
-
+	'</div>'.
+	
+	'<div class="col">'.
 	'<p><label for="copyright_notice">'.__('Copyright notice:').
 	form::field('copyright_notice',30,255,html::escapeHTML($blog_settings->system->copyright_notice)).
 	'</label></p>'.
-	'</div>'.
-	
-	'<div class="col">'.
+	
 	'<p><label for="post_url_format">'.__('New post URL format:').
 	form::combo('post_url_format',$post_url_combo,html::escapeHTML($blog_settings->system->post_url_format)).
 	'</label></p>'.
-
-	'<p><label for="note_title_tag">'.__('Note title HTML tag:').
-	form::combo('note_title_tag',$note_title_tag_combo,$blog_settings->system->note_title_tag).
-	'</label></p>'.
-		
+	
 	'<p><label for="enable_xmlrpc" class="classic">'.
 	form::checkbox('enable_xmlrpc','1',$blog_settings->system->enable_xmlrpc).
-	__('Enable XML/RPC interface').'</label></p>';
-
-	echo
-		'<p class="form-note">'.__('XML/RPC interface allows you to edit your blog with an external client.').'</p>';	
-
-	if ($blog_settings->system->enable_xmlrpc) {
-		echo
-		'<p>'.__('XML/RPC interface is active. You should set the following parameters on your XML/RPC client:').'</p>'.
-		'<ul>'.
-		'<li>'.__('Server URL:').' <strong><code>'.
-		sprintf(DC_XMLRPC_URL,$core->blog->url,$core->blog->id).
-		'</code></strong></li>'.
-		'<li>'.__('Blogging system:').' <strong><code>Movable Type</code></strong></li>'.
-		'<li>'.__('User name:').' <strong><code>'.$core->auth->userID().'</code></strong></li>'.
-		'<li>'.__('Password:').' <strong><code>&lt;'.__('your password').'&gt;</code></strong></li>'.
-		'<li>'.__('Blog ID:').' <strong><code>1</code></strong></li>'.
-		'</ul>';
-	}
-
-	echo
+	__('Enable XML/RPC interface').'</label>'.
+	' - <a href="#xmlrpc">'.__('more information').'</a></p>'.
 	'</div>'.
 	'</div>'.
@@ -483,20 +431,5 @@
 	'<p>'.form::combo('media_img_title_pattern',$img_title_combo,html::escapeHTML($blog_settings->system->media_img_title_pattern)).'</p>'.
 	'</div>'.
-
-	'<div class="col">'.
-	'<h4>'.__('Default image insertion attributes').'</h4>'.
-	'<p><label for="media_img_default_size">'.__('Image size:').
-	form::combo('media_img_default_size',$img_default_size_combo,
-		(html::escapeHTML($blog_settings->system->media_img_default_size) != '' ? html::escapeHTML($blog_settings->system->media_img_default_size) : 'm')).
-	'</label></p>'.
-	'<p><label for="media_img_default_alignment">'.__('Image alignment').
-	form::combo('media_img_default_alignment',$img_default_alignment_combo,html::escapeHTML($blog_settings->system->media_img_default_alignment)).
-	'</label></p>'.
-	'<p><label for="media_img_default_link" class="classic">'.
-	form::checkbox('media_img_default_link','1',$blog_settings->system->media_img_default_link).
-	__('As a link to original image').'</label></p>'.
-	'</div>'.
-	'</div>'.
-
+	'</div>'.
 	'</fieldset>';
 	
@@ -532,10 +465,28 @@
 		$core->formNonce().'</p>'.
 		'</form>';
-	} else {
-		if ($blog_id == $core->blog->id) {
-			echo '<p class="message">'.__('The current blog cannot be deleted').'</p>';
-		} else {
-			echo '<p class="message">'.__('Only superadmin can delete a blog').'</p>';
-		}
+	}
+	
+	# XML/RPC information
+	echo '<h3 id="xmlrpc">'.__('XML/RPC interface').'</h3>';
+	
+	echo '<p>'.__('XML/RPC interface allows you to edit your blog with an external client.').'</p>';
+	
+	if (!$blog_settings->system->enable_xmlrpc)
+	{
+		echo '<p>'.__('XML/RPC interface is not active. Change settings to enable it.').'</p>';
+	}
+	else
+	{
+		echo
+		'<p>'.__('XML/RPC interface is active. You should set the following parameters on your XML/RPC client:').'</p>'.
+		'<ul>'.
+		'<li>'.__('Server URL:').' <strong>'.
+		sprintf(DC_XMLRPC_URL,$core->blog->url,$core->blog->id).
+		'</strong></li>'.
+		'<li>'.__('Blogging system:').' <strong>Movable Type</strong></li>'.
+		'<li>'.__('User name:').' <strong>'.$core->auth->userID().'</strong></li>'.
+		'<li>'.__('Password:').' <strong>'.__('your password').'</strong></li>'.
+		'<li>'.__('Blog ID:').' <strong>1</strong></li>'.
+		'</ul>';
 	}
 	
@@ -572,5 +523,13 @@
 				' ('.html::escapeHTML(dcUtils::getUserCN(
 					$k, $v['name'], $v['firstname'], $v['displayname']
-				)).')</h4>';
+				)).')';
+				
+				if (!$v['super'] && $core->auth->isSuperAdmin()) {
+					echo
+					' - <a href="permissions.php?blog_id[]='.$blog_id.'&amp;user_id[]='.$k.'">'
+					.__('Change permissions').'</a>';
+				}
+				
+				echo '</h4>';
 				
 				echo '<ul>';
@@ -583,17 +542,4 @@
 				}
 				echo '</ul>';
-				
-				if (!$v['super'] && $core->auth->isSuperAdmin()) {
-					echo 
-					'<form action="users_actions.php" method="post">'.
-					'<p><input type="submit" value="'.__('Change permissions').'" />'.
-					form::hidden(array('redir'),'blog_pref.php?id='.$k).
-					form::hidden(array('action'),'perms').
-					form::hidden(array('users[]'),$k).
-					form::hidden(array('blogs[]'),$blog_id).
-					$core->formNonce().
-					'</p>'.
-					'</form>';
-				}
 			}
 		}
Index: admin/blog_theme.php
===================================================================
--- admin/blog_theme.php	(revision 907)
+++ admin/blog_theme.php	(revision 719)
@@ -219,13 +219,15 @@
 	
 	if (!empty($_GET['upd'])) {
-		dcPage::message(__('Theme has been successfully changed.'));
+		echo '<p class="message">'.__('Theme has been successfully changed.').'</p>';
 	}
 	
 	if (!empty($_GET['added'])) {
-		dcPage::message(($_GET['added'] == 2 ? __('Theme has been successfully upgraded') : __('Theme has been successfully installed.')));
+		echo '<p class="message">'.
+		($_GET['added'] == 2 ? __('Theme has been successfully upgraded') : __('Theme has been successfully installed.')).
+		'</p>';
 	}
 	
 	if (!empty($_GET['del'])) {
-		dcPage::message(__('Theme has been successfully deleted.'));
+		echo '<p class="message">'.__('Theme has been successfully deleted.').'</p>';
 	}
 	
Index: admin/blogs.php
===================================================================
--- admin/blogs.php	(revision 907)
+++ admin/blogs.php	(revision 782)
@@ -15,26 +15,12 @@
 dcPage::check('usage,contentadmin');
 
-# Filters
-$sortby_combo = array(
-__('Last update') => 'blog_upddt',
-__('Blog name') => 'UPPER(blog_name)',
-__('Blog ID') => 'B.blog_id'
-);
+$q = !empty($_GET['q']) ? $_GET['q'] : '';
 
-$order_combo = array(
-__('Descending') => 'desc',
-__('Ascending') => 'asc'
-);
+$blogs_list = new adminBlogList($core);
 
-$q = !empty($_GET['q']) ? $_GET['q'] : '';
-$sortby = !empty($_GET['sortby']) ? $_GET['sortby'] : 'blog_upddt';
-$order = !empty($_GET['order']) ? $_GET['order'] : 'desc';
+$params = new ArrayObject();
 
-$page = !empty($_GET['page']) ? $_GET['page'] : 1;
-$nb_per_page =  30;
-
-if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
-	$nb_per_page = (integer) $_GET['nb'];
-}
+# - Limit, sortby and order filter
+$params = $blogs_list->applyFilters($params);
 
 $show_filters = false;
@@ -46,21 +32,8 @@
 }
 
-# - Sortby and order filter
-if ($sortby !== '' && in_array($sortby,$sortby_combo)) {
-	if ($order !== '' && in_array($order,$order_combo)) {
-		$params['order'] = $sortby.' '.$order;
-	}
-	
-	if ($sortby != 'blog_upddt' || $order != 'desc') {
-		$show_filters = true;
-	}
-}
-
-$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
-
 try {
 	$counter = $core->getBlogs($params,1);
 	$rs = $core->getBlogs($params);
-	$nb_blog = $counter->f(0);
+	$blogs_list->setItems($rs,$counter->f(0));
 } catch (Exception $e) {
 	$core->error->add($e->getMessage());
@@ -76,5 +49,5 @@
 
 if (!empty($_GET['del'])) {
-	dcPage::message(__('Blog has been successfully deleted.'));
+	echo '<p class="message">'.__('Blog has been successfully deleted.').'</p>';
 }
 
@@ -93,23 +66,10 @@
 	echo
 	'<form action="blogs.php" method="get" id="filters-form">'.
-	'<fieldset class="two-cols"><legend>'.__('Filters').'</legend>'.
+	'<fieldset><legend>'.__('Filters').'</legend>'.
 	
-	'<div class="col">'.
-	'<p><label for="sortby">'.__('Order by:').' '.
-	form::combo('sortby',$sortby_combo,html::escapeHTML($sortby)).
-	'</label> '.
-	'<label for="order">'.__('Sort:').' '.
-	form::combo('order',$order_combo,html::escapeHTML($order)).
-	'</label></p>'.
-	'</div>'.
-	
-	'<div class="col">'.
 	'<p><label for="q">'.__('Search:').' '.
 	form::field('q',20,255,html::escapeHTML($q)).
 	'</label></p>'.
-	'<p><label for="nb" class="classic">'.	form::field('nb',3,3,$nb_per_page).' '.
-	__('Blogs per page').'</label> '.
-	'<input type="submit" value="'.__('Apply filters').'" /></p>'.
-	'</div>'.
+	'<p><input type="submit" value="'.__('Apply filters').'" /></p>'.
 	
 	'<br class="clear" />'. //Opera sucks
@@ -118,68 +78,8 @@
 	
 	# Show blogs
-	if ($nb_blog == 0)
-	{
-		echo '<p><strong>'.__('No blog').'</strong></p>';
-	}
-	else
-	{
-		$pager = new pager($page,$nb_blog,$nb_per_page,10);
-		$pager->var_page = 'page';
-		
-		echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-		
-		echo
-		'<table class="clear"><tr>'.
-		'<th>'.__('Blog name').'</th>'.
-		'<th class="nowrap">'.__('Last update').'</th>'.
-		'<th class="nowrap">'.__('Entries (all types)').'</th>'.
-		'<th class="nowrap">'.__('Blog ID').'</th>'.
-		'<th>&nbsp;</th>'.
-		'<th class="nowrap">'.__('Status').'</th>'.
-		'</tr>';
-		
-		while ($rs->fetch()) {
-			echo blogLine($rs);
-		}
-		
-		echo '</table>';
-		
-		echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-	}
+	$blogs_list->display();
 }
 
 dcPage::close();
 
-function blogLine($rs)
-{
-	global $core;
-	
-	$blog_id = html::escapeHTML($rs->blog_id);
-	$edit_link = '';
-	
-	if ($GLOBALS['core']->auth->isSuperAdmin()) {
-		$edit_link = 
-		'<a href="blog.php?id='.$blog_id.'" '.
-		'title="'.sprintf(__('Edit blog %s'),$blog_id).'">'.
-		__('edit').'</a>';
-	}
-	
-	$img_status = $rs->blog_status == 1 ? 'check-on' : 'check-off';
-	$txt_status = $GLOBALS['core']->getBlogStatus($rs->blog_status);
-	$img_status = sprintf('<img src="images/%1$s.png" alt="%2$s" title="%2$s" />',$img_status,$txt_status);
-	$offset = dt::getTimeOffset($core->auth->getInfo('user_tz'));
-	$blog_upddt = dt::str(__('%Y-%m-%d %H:%M'),strtotime($rs->blog_upddt) + $offset);
-	
-	return
-	'<tr class="line">'.
-	'<td class="maximal"><a href="index.php?switchblog='.$rs->blog_id.'" '.
-	'title="'.sprintf(__('Switch to blog %s'),$rs->blog_id).'">'.
-	html::escapeHTML($rs->blog_name).'</a></td>'.
-	'<td class="nowrap">'.$blog_upddt.'</td>'.
-	'<td class="nowrap">'.$core->countBlogPosts($rs->blog_id).'</td>'.
-	'<td class="nowrap">'.$blog_id.'</td>'.
-	'<td>'.$edit_link.'</td>'.
-	'<td class="status">'.$img_status.'</td>'.
-	'</tr>';
-}
 ?>
Index: admin/categories.php
===================================================================
--- admin/categories.php	(revision 907)
+++ admin/categories.php	(revision 560)
@@ -56,14 +56,14 @@
 
 if (!empty($_GET['add'])) {
-	dcPage::message(__('The category has been successfully created.'));
+	echo '<p class="message">'.__('The category has been successfully created.').'</p>';
 }
 if (!empty($_GET['del'])) {
-	dcPage::message(__('The category has been successfully removed.'));
+		echo '<p class="message">'.__('The category has been successfully removed.').'</p>';
 }
 if (!empty($_GET['reord'])) {
-	dcPage::message(__('Categories have been successfully reordered.'));
+		echo '<p class="message">'.__('Categories have been successfully reordered.').'</p>';
 }
 if (!empty($_GET['moved'])) {
-	dcPage::message(__('The category has been successfully moved.'));
+		echo '<p class="message">'.__('The category has been successfully moved.').'</p>';
 }
 
Index: admin/category.php
===================================================================
--- admin/category.php	(revision 907)
+++ admin/category.php	(revision 500)
@@ -164,5 +164,5 @@
 
 if (!empty($_GET['upd'])) {
-	dcPage::message(__('Category has been successfully updated.'));
+	echo '<p class="message">'.__('Category has been successfully updated.').'</p>';
 }
 
Index: admin/comment.php
===================================================================
--- admin/comment.php	(revision 907)
+++ admin/comment.php	(revision 500)
@@ -171,5 +171,5 @@
 {
 	if (!empty($_GET['upd'])) {
-		dcPage::message(__('Comment has been successfully updated.'));
+		echo '<p class="message">'.__('Comment has been successfully updated.').'</p>';
 	}
 	
Index: admin/comments.php
===================================================================
--- admin/comments.php	(revision 796)
+++ admin/comments.php	(revision 783)
@@ -15,9 +15,21 @@
 dcPage::check('usage,contentadmin');
 
+class authorFilter extends textFilter {
+	public function header() {
+		return 
+			dcPage::jqueryUI().
+			dcPage::jsLoad('js/author_filter.js')
+			;
+	}
+	public function applyFilter($params) {
+		$val = preg_split('/\s*,\s*/',$this->values[0]);
+		$params[$this->request_param]=$val;
+	}
+}
+
+
 # Creating filter combo boxes
 # Filter form we'll put in html_block
-$status_combo = array(
-'-' => ''
-);
+$status_combo = array();
 foreach ($core->blog->getAllCommentStatus() as $k => $v) {
 	$status_combo[$v] = (string) $k;
@@ -25,100 +37,17 @@
 
 $type_combo = array(
-'-' => '',
-__('comment') => 'co',
-__('trackback') => 'tb'
+__('comment') => '0',
+__('trackback') => '1'
 );
 
-$sortby_combo = array(
-__('Date') => 'comment_dt',
-__('Entry title') => 'post_title',
-__('Author') => 'comment_author',
-__('Status') => 'comment_status'
-);
+$comment_list = new adminCommentList($core);
 
-$order_combo = array(
-__('Descending') => 'desc',
-__('Ascending') => 'asc'
-);
-
-
-/* Get comments
--------------------------------------------------------- */
-$author = isset($_GET['author']) ?	$_GET['author'] : '';
-$status = isset($_GET['status']) ?		$_GET['status'] : '';
-$type = !empty($_GET['type']) ?		$_GET['type'] : '';
-$sortby = !empty($_GET['sortby']) ?	$_GET['sortby'] : 'comment_dt';
-$order = !empty($_GET['order']) ?		$_GET['order'] : 'desc';
-$ip = !empty($_GET['ip']) ?			$_GET['ip'] : '';
-
-$with_spam = $author || $status || $type || $sortby != 'comment_dt' || $order != 'desc' || $ip;
-
-$show_filters = false;
-
-$page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
-$nb_per_page =  30;
-
-if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
-	if ($nb_per_page != $_GET['nb']) {
-		$show_filters = true;
-	}
-	$nb_per_page = (integer) $_GET['nb'];
-}
-
-$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
+$params = new ArrayObject();
 $params['no_content'] = true;
 
-# Author filter
-if ($author !== '') {
-	$params['q_author'] = $author;
-	$show_filters = true;
-} else {
-	$author='';
-}
-
-# - Type filter
-if ($type == 'tb' || $type == 'co') {
-	$params['comment_trackback'] = ($type == 'tb');
-	$show_filters = true;
-} else {
-	$type='';
-}
-
-# - Status filter
-if ($status !== '' && in_array($status,$status_combo)) {
-	$params['comment_status'] = $status;
-	$show_filters = true;
-} elseif (!$with_spam) {
-	$params['comment_status_not'] = -2;
-	$status='';
-} else {
-	$status='';
-}
-
-# - IP filter
-if ($ip) {
-	$params['comment_ip'] = $ip;
-	$show_filters = true;
-}
-
-# Sortby and order filter
-if ($sortby !== '' && in_array($sortby,$sortby_combo)) {
-	if ($order !== '' && in_array($order,$order_combo)) {
-		$params['order'] = $sortby.' '.$order;
-	} else {
-		$order = 'desc';
-	}
-	
-	if ($sortby != 'comment_dt' || $order != 'desc') {
-		$show_filters = true;
-	}
-} else {
-	$sortby = 'comment_dt';
-	$order = 'desc';
-}
+# - Limit, sortby and order filter
 
 # Actions combo box
 $combo_action = array();
-$default = '';
 if ($core->auth->check('publish,contentadmin',$core->blog->id))
 {
@@ -130,8 +59,5 @@
 if ($core->auth->check('delete,contentadmin',$core->blog->id))
 {
-	$combo_action[__('Delete')] = 'delete';
-	if ($status == -2) {
-		$default = 'delete';
-	}
+	$combo_action[__('delete')] = 'delete';
 }
 
@@ -139,10 +65,42 @@
 $core->callBehavior('adminCommentsActionsCombo',array(&$combo_action));
 
+$filterSet = new dcFilterSet('comments','comments.php');
+
+$authorFilter = new authorFilter(
+		'author',__('Author'), __('Author'),'comment_author',20,255);
+$filterSet
+	->addFilter(new comboFilter(
+		'status',__('Status'), __('Status'), 'comment_status', $status_combo))
+	->addFilter(new booleanFilter(
+		'type',__('Type'), __('Type'), 'comment_trackback', $type_combo))
+	->addFilter($authorFilter)
+	->addFilter(new textFilter(
+		'ip',__('IP address'), __('IP address'), 'comment_ip',20,39));
+		
+$core->callBehavior('adminCommentsFilters',$filterSet);
+$filterSet->setExtra($comment_list);
+
+$filterSet->setup($_GET,$_POST);
+if (isset($_GET['author'])) {
+	$authorFilter->add();
+	$authorFilter->setValues($_GET['author']);
+}
+$with_spam=true;
 /* Get comments
 -------------------------------------------------------- */
 try {
+	$nfparams = $params->getArrayCopy();
+	$filtered = $filterSet->applyFilters($params);
+	$core->callBehavior('adminCommentsParams',$params);
 	$comments = $core->blog->getComments($params);
 	$counter = $core->blog->getComments($params,true);
-	$comment_list = new adminCommentList($core,$comments,$counter->f(0));
+	if ($filtered) {
+		$totalcounter = $core->blog->getComments($nfparams,true);
+		$page_title = sprintf(__('Comments and Trackacks / %s filtered out of %s'),$counter->f(0),$totalcounter->f(0));
+	} else {
+		$page_title = __('Comments and Trackacks');
+	}
+
+	$comment_list->setItems($comments,$counter->f(0));
 } catch (Exception $e) {
 	$core->error->add($e->getMessage());
@@ -151,8 +109,6 @@
 /* DISPLAY
 -------------------------------------------------------- */
-$starting_script = dcPage::jsLoad('js/_comments.js');
-if (!$show_filters) {
-	$starting_script .= dcPage::jsLoad('js/filter-controls.js');
-}
+$starting_script = dcPage::jsLoad('js/_comments.js').$filterSet->header();
+
 # --BEHAVIOR-- adminCommentsHeaders
 $starting_script .= $core->callBehavior('adminCommentsHeaders');
@@ -165,47 +121,5 @@
 {
 	# Filters
-	if (!$show_filters) {
-		echo '<p><a id="filter-control" class="form-control" href="#">'.
-		__('Filters').'</a></p>';
-	}
-	
-	echo
-	'<form action="comments.php" method="get" id="filters-form">'.
-	'<fieldset><legend>'.__('Filters').'</legend>'.
-	'<div class="three-cols">'.
-	'<div class="col">'.
-	'<label for="type">'.__('Type:').' '.
-	form::combo('type',$type_combo,$type).
-	'</label> '.
-	'<label for="status">'.__('Status:').' '.
-	form::combo('status',$status_combo,$status).
-	'</label>'.
-	'</div>'.
-	
-	'<div class="col">'.
-	'<p><label for="sortby">'.__('Order by:').' '.
-	form::combo('sortby',$sortby_combo,$sortby).
-	'</label> '.
-	'<label for="order">'.__('Sort:').' '.
-	form::combo('order',$order_combo,$order).
-	'</label></p>'.
-	'<p><label for="nb" class="classic">'.	form::field('nb',3,3,$nb_per_page).' '.
-	__('Comments per page').'</label></p>'.
-	'</div>'.
-	
-	'<div class="col">'.
-	'<p><label for="author">'.__('Comment author:').' '.
-	form::field('author',20,255,html::escapeHTML($author)).
-	'</label>'.
-	'<label for="ip">'.__('IP address:').' '.
-	form::field('ip',20,39,html::escapeHTML($ip)).
-	'</label></p>'.
-	'<p><input type="submit" value="'.__('Apply filters').'" /></p>'.
-	'</div>'.
-	
-	'</div>'.
-	'<br class="clear" />'. //Opera sucks
-	'</fieldset>'.
-	'</form>';
+	$filterSet->display();
 	
 	if (!$with_spam) {
@@ -221,6 +135,5 @@
 	
 	# Show comments
-	$comment_list->display($page,$nb_per_page,
-	'<form action="comments_actions.php" method="post" id="form-comments">'.
+	$comment_list->display('<form action="comments_actions.php" method="post" id="form-comments">'.
 	
 	'%s'.
@@ -230,15 +143,8 @@
 	
 	'<p class="col right"><label for="action" class="classic">'.__('Selected comments action:').'</label> '.
-	form::combo('action',$combo_action,$default,'','','','title="'.__('action: ').'"').
+	form::combo('action',$combo_action,'','','','','title="'.__('action: ').'"').
 	$core->formNonce().
 	'<input type="submit" value="'.__('ok').'" /></p>'.
-	form::hidden(array('type'),$type).
-	form::hidden(array('sortby'),$sortby).
-	form::hidden(array('order'),$order).
-	form::hidden(array('author'),preg_replace('/%/','%%',$author)).
-	form::hidden(array('status'),$status).
-	form::hidden(array('ip'),preg_replace('/%/','%%',$ip)).
-	form::hidden(array('page'),$page).
-	form::hidden(array('nb'),$nb_per_page).
+	str_replace('%','%%',$filterSet->getFormFieldsAsHidden()).
 	'</div>'.
 	
Index: admin/comments_actions.php
===================================================================
--- admin/comments_actions.php	(revision 270)
+++ admin/comments_actions.php	(revision 782)
@@ -30,12 +30,5 @@
 	{
 		$redir =
-		'comments.php?type='.$_POST['type'].
-		'&author='.$_POST['author'].
-		'&status='.$_POST['status'].
-		'&sortby='.$_POST['sortby'].
-		'&ip='.$_POST['ip'].
-		'&order='.$_POST['order'].
-		'&page='.$_POST['page'].
-		'&nb='.(integer) $_POST['nb'];
+		'comments.php?'.urldecode($_POST['f_query']);
 	}
 	
Index: admin/dispatcher.php
===================================================================
--- admin/dispatcher.php	(revision 270)
+++ admin/dispatcher.php	(revision 270)
@@ -0,0 +1,34 @@
+<?php
+# -- BEGIN LICENSE BLOCK ---------------------------------------
+#
+# This file is part of Dotclear 2.
+#
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
+# Licensed under the GPL version 2.0 license.
+# See LICENSE file or
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
+# -- END LICENSE BLOCK -----------------------------------------
+
+# Delete users
+if (!empty($_REQUEST['dispatch_action']))
+{
+	if ($_REQUEST['dispatch_action'] == 'deleteuser')
+	{
+		if (!empty($_REQUEST['user_id'])) {
+			$delete_users = $_REQUEST['user_id'];
+		}
+		
+		include dirname(__FILE__).'/users.php';
+		exit;
+	}
+	elseif ($_REQUEST['dispatch_action'] == 'setpermissions')
+	{
+		include dirname(__FILE__).'/permissions_blog.php';
+		exit;
+	}
+}
+
+echo '<p>What the hell are you doing here?</p>';
+exit;
+?>
Index: admin/index.php
===================================================================
--- admin/index.php	(revision 931)
+++ admin/index.php	(revision 691)
@@ -81,13 +81,11 @@
 		$fav = unserialize($v['value']);
 		if (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)) {
-			if (dc_valid_fav($fav['url'])) {
-				$count++;
-				$title = ($fav['name'] == 'posts' ? sprintf($str_entries,$post_count) : 
-					($fav['name'] == 'comments' ? sprintf($str_comments,$comment_count) : $fav['title']));
-				$__dashboard_icons[$fav['name']] = new ArrayObject(array(__($title),$fav['url'],$fav['large-icon']));
-
-				# Let plugins set their own title for favorite on dashboard
-				$core->callBehavior('adminDashboardFavsIcon',$core,$fav['name'],$__dashboard_icons[$fav['name']]);
-			}
+			$count++;
+			$title = ($fav['name'] == 'posts' ? sprintf($str_entries,$post_count) : 
+				($fav['name'] == 'comments' ? sprintf($str_comments,$comment_count) : $fav['title']));
+			$__dashboard_icons[$fav['name']] = new ArrayObject(array(__($title),$fav['url'],$fav['large-icon']));
+
+			# Let plugins set their own title for favorite on dashboard
+			$core->callBehavior('adminDashboardFavsIcon',$core,$fav['name'],$__dashboard_icons[$fav['name']]);
 		}
 	}
@@ -98,13 +96,11 @@
 		$fav = unserialize($v['value']);
 		if (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)) {
-			if (dc_valid_fav($fav['url'])) {
-				$count++;
-				$title = ($fav['name'] == 'posts' ? sprintf($str_entries,$post_count) : 
-					($fav['name'] == 'comments' ? sprintf($str_comments,$comment_count) : $fav['title']));
-				$__dashboard_icons[$fav['name']] = new ArrayObject(array(__($title),$fav['url'],$fav['large-icon']));
-
-				# Let plugins set their own title for favorite on dashboard
-				$core->callBehavior('adminDashboardFavsIcon',$core,$fav['name'],$__dashboard_icons[$fav['name']]);
-			}
+			$count++;
+			$title = ($fav['name'] == 'posts' ? sprintf($str_entries,$post_count) : 
+				($fav['name'] == 'comments' ? sprintf($str_comments,$comment_count) : $fav['title']));
+			$__dashboard_icons[$fav['name']] = new ArrayObject(array(__($title),$fav['url'],$fav['large-icon']));
+
+			# Let plugins set their own title for favorite on dashboard
+			$core->callBehavior('adminDashboardFavsIcon',$core,$fav['name'],$__dashboard_icons[$fav['name']]);
 		}
 	}
@@ -129,5 +125,5 @@
 	
 		foreach ($__resources['doc'] as $k => $v) {
-			$doc_links .= '<li><a href="'.$v.'" title="'.$k.' '.__('(external link)').'">'.$k.'</a></li>';
+			$doc_links .= '<li><a href="'.$v.'">'.$k.'</a></li>';
 		}
 	
@@ -156,6 +152,5 @@
 			foreach ($feed->items as $item)
 			{
-				$dt = isset($item->link) ? '<a href="'.$item->link.'"'.$v.'" title="'.$item->title.' '.__('(external link)').'">'.
-					$item->title.'</a>' : $item->title;
+				$dt = isset($item->link) ? '<a href="'.$item->link.'">'.$item->title.'</a>' : $item->title;
 			
 				if ($i < 3) {
Index: admin/install/wizard.php
===================================================================
--- admin/install/wizard.php	(revision 858)
+++ admin/install/wizard.php	(revision 557)
@@ -44,13 +44,4 @@
 if (is_file(DC_RC_PATH)) {
 	http::redirect('index.php');
-}
-
-if (!is_writable(dirname(DC_RC_PATH))) {
-	$err = '<p>'.sprintf(__('Path <strong>%s</strong> is not writable.'),path::real(dirname(DC_RC_PATH))).'</p>'.
-	'<p>'.__('Dotclear installation wizard could not create configuration file for you. '.
-		'You must change folder right or create the <strong>config.php</strong> '.
-		'file manually, please refer to '.
-		'<a href="http://dotclear.org/documentation/2.0/admin/install">'.
-		'the documentation</a> to learn how to do this.').'</p>';
 }
 
Index: admin/js/_media_item.js
===================================================================
--- admin/js/_media_item.js	(revision 947)
+++ admin/js/_media_item.js	(revision 0)
@@ -63,9 +63,3 @@
 		return true;
 	});
-
-	// Confirm for deleting current medoa
-	$('#delete-form input[name="delete"]').click(function() {
-		return window.confirm(dotclear.msg.confirm_delete_media);
-	});
-
 });
Index: admin/js/_permissions.js
===================================================================
--- admin/js/_permissions.js	(revision 0)
+++ admin/js/_permissions.js	(revision 0)
@@ -0,0 +1,56 @@
+jQuery.fn.updatePermissionsForm = function() {
+	return this.each(function() {
+		var perms = {};
+		var re = /^perm\[(.+?)\]\[(.+?)\]$/;
+		var e,prop;
+		
+		// Building a nice object of form elements
+		for (var i=0; i<this.elements.length; i++) {
+			e = this.elements[i];
+			
+			if (e.name == undefined) {
+				continue;
+			}
+			prop = e.name.match(re);
+			if (!prop) {
+				continue;
+			}
+			if (perms[prop[1]] == undefined) {
+				perms[prop[1]] = {};
+			}
+			perms[prop[1]][prop[2]] = e;
+		}
+		
+		// Update elements status
+		var E;
+		for (blog in perms) {
+			for (perm in perms[blog]) {
+				E = perms[blog][perm];
+				E.onclick = function() {};
+				
+				if (perm == 'admin' && !E.disabled) {
+					perms[blog]['usage'].disabled = E.checked;
+					perms[blog]['publish'].disabled = E.checked;
+					perms[blog]['delete'].disabled = E.checked;
+					perms[blog]['contentadmin'].disabled = E.checked;
+					perms[blog]['categories'].disabled = E.checked;
+					perms[blog]['media'].disabled = E.checked;
+					perms[blog]['media_admin'].disabled = E.checked;
+					E.onclick = function() { $(this.form).updatePermissionsForm(); };
+				} else if (perm == 'contentadmin' && !E.disabled) {
+					perms[blog]['usage'].disabled = E.checked;
+					perms[blog]['publish'].disabled = E.checked;
+					perms[blog]['delete'].disabled = E.checked;
+					E.onclick = function() { $(this.form).updatePermissionsForm(); };
+				} else if (perm == 'media_admin' && !E.disabled) {
+					perms[blog]['media'].disabled = E.checked;
+					E.onclick = function() { $(this.form).updatePermissionsForm(); };
+				}
+			}
+		}
+	});
+};
+
+$(function() {
+	$('#permissions-form').updatePermissionsForm();
+});
Index: admin/js/_permissions_blog.js
===================================================================
--- admin/js/_permissions_blog.js	(revision 0)
+++ admin/js/_permissions_blog.js	(revision 0)
@@ -0,0 +1,5 @@
+$(function() {
+	$('.checkboxes-helpers').each(function() {
+		dotclear.checkboxesHelpers(this);
+	});
+});
Index: admin/js/_users.js
===================================================================
--- admin/js/_users.js	(revision 860)
+++ admin/js/_users.js	(revision 548)
@@ -4,5 +4,5 @@
 	});
 	$('#form-users').submit(function() {
-		var action = $(this).find('select[name="action"]').val();
+		var action = $(this).find('select[name="dispatch_action"]').val();
 		var user_ids = new Array();
 		var nb_posts = new Array();
@@ -10,5 +10,5 @@
 		var msg_cannot_delete = false;
 		
-		$(this).find('input[name="users[]"]').each(function() {
+		$(this).find('input[name="user_id[]"]').each(function() {
 			user_ids.push(this);
 		});
@@ -41,5 +41,5 @@
 		
 		if (action == 'deleteuser') {
-			return window.confirm(dotclear.msg.confirm_delete_user.replace('%s',$('input[name="users[]"]:checked').size()));
+			return window.confirm(dotclear.msg.confirm_delete_user.replace('%s',$('input[name="user_id[]"]:checked').size()));
 		}
 		
Index: dmin/js/_users_actions.js
===================================================================
--- admin/js/_users_actions.js	(revision 935)
+++ 	(revision )
@@ -1,63 +1,0 @@
-jQuery.fn.updatePermissionsForm = function() {
-	return this.each(function() {
-		var perms = {};
-		var re = /^perm\[(.+?)\]\[(.+?)\]$/;
-		var e,prop;
-		
-		// Building a nice object of form elements
-		for (var i=0; i<this.elements.length; i++) {
-			e = this.elements[i];
-			
-			if (e.name == undefined) {
-				continue;
-			}
-			prop = e.name.match(re);
-			if (!prop) {
-				continue;
-			}
-			if (perms[prop[1]] == undefined) {
-				perms[prop[1]] = {};
-			}
-			perms[prop[1]][prop[2]] = e;
-		}
-		
-		// Update elements status
-		var E;
-		for (blog in perms) {
-			for (perm in perms[blog]) {
-				E = perms[blog][perm];
-				E.onclick = function() {};
-				
-				if (perm == 'admin' && !E.disabled) {
-					perms[blog]['usage'].disabled = E.checked;
-					perms[blog]['publish'].disabled = E.checked;
-					perms[blog]['delete'].disabled = E.checked;
-					perms[blog]['contentadmin'].disabled = E.checked;
-					perms[blog]['categories'].disabled = E.checked;
-					perms[blog]['media'].disabled = E.checked;
-					perms[blog]['media_admin'].disabled = E.checked;
-					E.onclick = function() { $(this.form).updatePermissionsForm(); };
-				} else if (perm == 'contentadmin' && !E.disabled) {
-					perms[blog]['usage'].checked = E.checked;
-					perms[blog]['publish'].checked = E.checked;
-					perms[blog]['delete'].checked = E.checked;
-					perms[blog]['usage'].disabled = E.checked;
-					perms[blog]['publish'].disabled = E.checked;
-					perms[blog]['delete'].disabled = E.checked;
-					E.onclick = function() { $(this.form).updatePermissionsForm(); };
-				} else if (perm == 'media_admin' && !E.disabled) {
-					perms[blog]['media'].checked = E.checked;
-					perms[blog]['media'].disabled = E.checked;
-					E.onclick = function() { $(this.form).updatePermissionsForm(); };
-				}
-			}
-		}
-	});
-};
-
-$(function() {
-	$('.checkboxes-helpers').each(function() {
-		dotclear.checkboxesHelpers(this);
-	});
-	$('#permissions-form').updatePermissionsForm();
-});
Index: admin/js/author_filter.js
===================================================================
--- admin/js/author_filter.js	(revision 781)
+++ admin/js/author_filter.js	(revision 781)
@@ -0,0 +1,58 @@
+function split( val ) {
+	return val.split( /,\s*/ );
+}
+function extractLast(term) {
+	return split(term).pop();
+}
+
+$(function() {
+	$('#f_author')
+	.bind( "keydown", function( event ) {
+		if ( event.keyCode === $.ui.keyCode.TAB &&
+				$( this ).data( "autocomplete" ).menu.active ) {
+			event.preventDefault();
+		}
+	})
+	.autocomplete({
+		minLength: 2,
+		delay: 1000,
+		source: function(request,response) {
+			$.ajax({
+				url: 'services.php',
+				data: {
+					'f': 'searchCommentAuthor',
+					'q': extractLast(request.term)
+				},
+				success:function(data,status) {
+					results = [];
+					$(data).find('author').each(function(){
+						var name = $(this).attr('name');
+						results.push({label:name,value:name});
+					});
+					response(results);
+				}
+			});
+		},
+		search: function() {
+			var term = extractLast( this.value );
+			if ( term.length < 2 ) {
+				return false;
+			}
+		},
+		focus: function() {
+			// prevent value inserted on focus
+			return false;
+		},
+		select: function( event, ui ) {
+			var terms = split( this.value );
+			// remove the current input
+			terms.pop();
+			// add the selected item
+			terms.push( ui.item.value );
+			// add placeholder to get the comma-and-space at the end
+			terms.push( "" );
+			this.value = terms.join( ", " );
+			return false;
+		}		
+	});
+});
Index: admin/js/common.js
===================================================================
--- admin/js/common.js	(revision 958)
+++ admin/js/common.js	(revision 343)
@@ -319,5 +319,24 @@
 -------------------------------------------------------- */
 function positionFooter() {
-	$('#footer').constantfooter();
+	$("#wrapper").css({ overflow: "auto" });
+	var page_height = $("#top").height() + $("#wrapper").height() - $("#footer").height();
+	if( page_height < $(window).height() ){
+		// calcul de la largeur
+		var page_width = $(document).width() - 30;
+		$("#footer").css({
+			position: "absolute",
+			bottom: "10px",
+			width: page_width+"px",
+			padding: ".75em 0",
+			marginbottom: "0"
+		});
+	} else {
+		$("#footer").css({
+			position: "static",
+			padding: ".75em 0",
+			width: "auto"
+		});
+	}
+
 }
 
@@ -352,5 +371,5 @@
 
 	$('.message').backgroundFade({sColor:'#cccccc',eColor:'#666666',steps:20});
-	$('.error').backgroundFade({sColor:'#ffeee3',eColor:'#ffdec8',steps:20});
+	$('.error').backgroundFade({sColor:'#f5e5e5',eColor:'#e5bfbf',steps:20});
 
 	$('form:has(input[type=password][name=your_pwd])').submit(function() {
@@ -366,4 +385,5 @@
 	});
 
+
 	// Sticky footer
 	positionFooter();
Index: admin/js/filters.js
===================================================================
--- admin/js/filters.js	(revision 783)
+++ admin/js/filters.js	(revision 783)
@@ -0,0 +1,6 @@
+$(function() {
+	$('#toggle-filters').click(function(e) {
+		$('#filters').toggleClass('hidden');
+		$('#toggle-filters').toggleClass('opened');
+	});
+});
Index: admin/js/jquery/jquery-ui-1.8.12.custom.min.js
===================================================================
--- admin/js/jquery/jquery-ui-1.8.12.custom.min.js	(revision 15)
+++ admin/js/jquery/jquery-ui-1.8.12.custom.min.js	(revision 15)
@@ -0,0 +1,140 @@
+/*!
+ * jQuery UI 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(c,j){function k(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.12",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,
+NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,
+"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");
+if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,l,m){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(l)g-=parseFloat(c.curCSS(f,
+"border"+this+"Width",true))||0;if(m)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,
+d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){var b=a.nodeName.toLowerCase(),d=c.attr(a,"tabindex");if("area"===b){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&k(a)}return(/input|select|textarea|button|object/.test(b)?!a.disabled:"a"==b?a.href||!isNaN(d):!isNaN(d))&&k(a)},tabbable:function(a){var b=c.attr(a,"tabindex");return(isNaN(b)||b>=0)&&c(a).is(":focusable")}});
+c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&
+b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
+;/*!
+ * jQuery UI Widget 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
+a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h;
+e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,
+this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
+widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},
+enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
+;/*!
+ * jQuery UI Mouse 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */
+(function(b){b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(a){a.originalEvent=
+a.originalEvent||{};if(!a.originalEvent.mouseHandled){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,e=a.which==1,f=typeof this.options.cancel=="string"?b(a.target).parents().add(a.target).filter(this.options.cancel).length:false;if(!e||f||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
+this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(d){return c._mouseMove(d)};this._mouseUpDelegate=function(d){return c._mouseUp(d)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return a.originalEvent.mouseHandled=
+true}},_mouseMove:function(a){if(b.browser.msie&&!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);
+if(this._mouseStarted){this._mouseStarted=false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
+;/*
+ * jQuery UI Sortable 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){this.containerCache={};this.element.addClass("ui-sortable");
+this.refresh();this.floating=this.items.length?/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a==="disabled"){this.options[a]=
+b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&!b){var f=false;
+d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-
+this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};
+this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=
+document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);
+return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<
+b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-
+b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,
+a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],
+e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();
+c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):
+this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,
+dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},
+toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||
+this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();
+var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},
+_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();
+if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),
+this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),
+this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&
+this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=0;b--){var c=this.items[b];if(!(c.instance!=this.currentContainer&&this.currentContainer&&c.item[0]!=this.currentItem[0])){var e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=
+this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=
+d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||
+0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",
+a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-
+f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=
+this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==
+""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=
+this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a=
+{top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),
+10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?
+document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),
+10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=
+this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&
+this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();
+var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-
+this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-
+this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],
+this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem[0].parentNode&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]=
+"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",
+f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,
+this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",
+a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},
+_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});d.extend(d.ui.sortable,{version:"1.8.12"})})(jQuery);
+;/*
+ * jQuery UI Accordion 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(c){c.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var a=this,b=a.options;a.running=0;a.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");
+a.headers=a.element.find(b.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){b.disabled||c(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){b.disabled||c(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){b.disabled||c(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){b.disabled||c(this).removeClass("ui-state-focus")});a.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
+if(b.navigation){var d=a.element.find("a").filter(b.navigationFilter).eq(0);if(d.length){var h=d.closest(".ui-accordion-header");a.active=h.length?h:d.closest(".ui-accordion-content").prev()}}a.active=a._findActive(a.active||b.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");a.active.next().addClass("ui-accordion-content-active");a._createIcons();a.resize();a.element.attr("role","tablist");a.headers.attr("role","tab").bind("keydown.accordion",
+function(f){return a._keydown(f)}).next().attr("role","tabpanel");a.headers.not(a.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide();a.active.length?a.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):a.headers.eq(0).attr("tabIndex",0);c.browser.safari||a.headers.find("a").attr("tabIndex",-1);b.event&&a.headers.bind(b.event.split(" ").join(".accordion ")+".accordion",function(f){a._clickHandler.call(a,f,this);f.preventDefault()})},_createIcons:function(){var a=
+this.options;if(a.icons){c("<span></span>").addClass("ui-icon "+a.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(a.icons.header).toggleClass(a.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var a=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex");
+this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(a.autoHeight||a.fillHeight)b.css("height","");return c.Widget.prototype.destroy.call(this)},_setOption:function(a,b){c.Widget.prototype._setOption.apply(this,arguments);a=="active"&&this.activate(b);if(a=="icons"){this._destroyIcons();
+b&&this._createIcons()}if(a=="disabled")this.headers.add(this.headers.next())[b?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(a){if(!(this.options.disabled||a.altKey||a.ctrlKey)){var b=c.ui.keyCode,d=this.headers.length,h=this.headers.index(a.target),f=false;switch(a.keyCode){case b.RIGHT:case b.DOWN:f=this.headers[(h+1)%d];break;case b.LEFT:case b.UP:f=this.headers[(h-1+d)%d];break;case b.SPACE:case b.ENTER:this._clickHandler({target:a.target},a.target);
+a.preventDefault()}if(f){c(a.target).attr("tabIndex",-1);c(f).attr("tabIndex",0);f.focus();return false}return true}},resize:function(){var a=this.options,b;if(a.fillSpace){if(c.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}b=this.element.parent().height();c.browser.msie&&this.element.parent().css("overflow",d);this.headers.each(function(){b-=c(this).outerHeight(true)});this.headers.next().each(function(){c(this).height(Math.max(0,b-c(this).innerHeight()+
+c(this).height()))}).css("overflow","auto")}else if(a.autoHeight){b=0;this.headers.next().each(function(){b=Math.max(b,c(this).height("").height())}).height(b)}return this},activate:function(a){this.options.active=a;a=this._findActive(a)[0];this._clickHandler({target:a},a);return this},_findActive:function(a){return a?typeof a==="number"?this.headers.filter(":eq("+a+")"):this.headers.not(this.headers.not(a)):a===false?c([]):this.headers.filter(":eq(0)")},_clickHandler:function(a,b){var d=this.options;
+if(!d.disabled)if(a.target){a=c(a.currentTarget||b);b=a[0]===this.active[0];d.active=d.collapsible&&b?false:this.headers.index(a);if(!(this.running||!d.collapsible&&b)){var h=this.active;j=a.next();g=this.active.next();e={options:d,newHeader:b&&d.collapsible?c([]):a,oldHeader:this.active,newContent:b&&d.collapsible?c([]):j,oldContent:g};var f=this.headers.index(this.active[0])>this.headers.index(a[0]);this.active=b?c([]):a;this._toggle(j,g,e,b,f);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);
+if(!b){a.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);a.next().addClass("ui-accordion-content-active")}}}else if(d.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);this.active.next().addClass("ui-accordion-content-active");var g=this.active.next(),
+e={options:d,newHeader:c([]),oldHeader:d.active,newContent:c([]),oldContent:g},j=this.active=c([]);this._toggle(j,g,e)}},_toggle:function(a,b,d,h,f){var g=this,e=g.options;g.toShow=a;g.toHide=b;g.data=d;var j=function(){if(g)return g._completed.apply(g,arguments)};g._trigger("changestart",null,g.data);g.running=b.size()===0?a.size():b.size();if(e.animated){d={};d=e.collapsible&&h?{toShow:c([]),toHide:b,complete:j,down:f,autoHeight:e.autoHeight||e.fillSpace}:{toShow:a,toHide:b,complete:j,down:f,autoHeight:e.autoHeight||
+e.fillSpace};if(!e.proxied)e.proxied=e.animated;if(!e.proxiedDuration)e.proxiedDuration=e.duration;e.animated=c.isFunction(e.proxied)?e.proxied(d):e.proxied;e.duration=c.isFunction(e.proxiedDuration)?e.proxiedDuration(d):e.proxiedDuration;h=c.ui.accordion.animations;var i=e.duration,k=e.animated;if(k&&!h[k]&&!c.easing[k])k="slide";h[k]||(h[k]=function(l){this.slide(l,{easing:k,duration:i||700})});h[k](d)}else{if(e.collapsible&&h)a.toggle();else{b.hide();a.show()}j(true)}b.prev().attr({"aria-expanded":"false",
+"aria-selected":"false",tabIndex:-1}).blur();a.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");if(this.toHide.length)this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});c.extend(c.ui.accordion,{version:"1.8.12",
+animations:{slide:function(a,b){a=c.extend({easing:"swing",duration:300},a,b);if(a.toHide.size())if(a.toShow.size()){var d=a.toShow.css("overflow"),h=0,f={},g={},e;b=a.toShow;e=b[0].style.width;b.width(parseInt(b.parent().width(),10)-parseInt(b.css("paddingLeft"),10)-parseInt(b.css("paddingRight"),10)-(parseInt(b.css("borderLeftWidth"),10)||0)-(parseInt(b.css("borderRightWidth"),10)||0));c.each(["height","paddingTop","paddingBottom"],function(j,i){g[i]="hide";j=(""+c.css(a.toShow[0],i)).match(/^([\d+-.]+)(.*)$/);
+f[i]={value:j[1],unit:j[2]||"px"}});a.toShow.css({height:0,overflow:"hidden"}).show();a.toHide.filter(":hidden").each(a.complete).end().filter(":visible").animate(g,{step:function(j,i){if(i.prop=="height")h=i.end-i.start===0?0:(i.now-i.start)/(i.end-i.start);a.toShow[0].style[i.prop]=h*f[i.prop].value+f[i.prop].unit},duration:a.duration,easing:a.easing,complete:function(){a.autoHeight||a.toShow.css("height","");a.toShow.css({width:e,overflow:d});a.complete()}})}else a.toHide.animate({height:"hide",
+paddingTop:"hide",paddingBottom:"hide"},a);else a.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},a)},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1E3:200})}}})})(jQuery);
+;
Index: admin/js/jquery/jquery-ui-1.8.16.custom.min.js
===================================================================
--- admin/js/jquery/jquery-ui-1.8.16.custom.min.js	(revision 758)
+++ admin/js/jquery/jquery-ui-1.8.16.custom.min.js	(revision 758)
@@ -0,0 +1,571 @@
+/*!
+ * jQuery UI 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.16",
+keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({propAttr:c.fn.prop||c.fn.attr,_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=
+this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,
+"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":
+"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,
+outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,
+"tabindex"),d=isNaN(b);return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&
+a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&
+c.ui.isOverAxis(b,e,i)}})}})(jQuery);
+;/*!
+ * jQuery UI Widget 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)try{b(d).triggerHandler("remove")}catch(e){}k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){try{b(this).triggerHandler("remove")}catch(d){}});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=
+function(h){return!!b.data(h,a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):
+d;if(e&&d.charAt(0)==="_")return h;e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=
+b.extend(true,{},this.options,this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+
+"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",
+c);return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
+;/*!
+ * jQuery UI Mouse 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */
+(function(b){var d=false;b(document).mouseup(function(){d=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+
+this.widgetName)},_mouseDown:function(a){if(!d){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,f=a.which==1,g=typeof this.options.cancel=="string"&&a.target.nodeName?b(a.target).closest(this.options.cancel).length:false;if(!f||g||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
+this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(e){return c._mouseMove(e)};this._mouseUpDelegate=function(e){return c._mouseUp(e)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return d=true}},_mouseMove:function(a){if(b.browser.msie&&
+!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=
+false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
+;/*
+ * jQuery UI Position 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
+left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
+k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
+m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
+d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
+a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
+g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
+;/*
+ * jQuery UI Draggable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
+"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
+this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;if(b.iframeFix)d(b.iframeFix===true?"iframe":b.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")});return true},_mouseStart:function(a){var b=this.options;
+this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});
+this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);d.ui.ddmanager&&d.ui.ddmanager.dragStart(this,a);return true},
+_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=
+false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,
+10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},_mouseUp:function(a){this.options.iframeFix===true&&d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)});d.ui.ddmanager&&d.ui.ddmanager.dragStop(this,a);return d.ui.mouse.prototype._mouseUp.call(this,a)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||
+!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone().removeAttr("id"):this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&
+a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=
+this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),
+10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),
+10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[a.containment=="document"?0:d(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,a.containment=="document"?0:d(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,
+(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){a=d(a.containment);var b=a[0];if(b){a.offset();var c=d(b).css("overflow")!=
+"hidden";this.containment=[(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0),(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0),(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),
+10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom];this.relative_container=a}}else if(a.containment.constructor==Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+
+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&
+!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,h=a.pageY;if(this.originalPosition){var g;if(this.containment){if(this.relative_container){g=this.relative_container.offset();g=[this.containment[0]+g.left,this.containment[1]+g.top,this.containment[2]+g.left,this.containment[3]+g.top]}else g=this.containment;if(a.pageX-this.offset.click.left<g[0])e=g[0]+this.offset.click.left;
+if(a.pageY-this.offset.click.top<g[1])h=g[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>g[2])e=g[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>g[3])h=g[3]+this.offset.click.top}if(b.grid){h=b.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/b.grid[1])*b.grid[1]:this.originalPageY;h=g?!(h-this.offset.click.top<g[1]||h-this.offset.click.top>g[3])?h:!(h-this.offset.click.top<g[1])?h-b.grid[1]:h+b.grid[1]:h;e=b.grid[0]?this.originalPageX+Math.round((e-this.originalPageX)/
+b.grid[0])*b.grid[0]:this.originalPageX;e=g?!(e-this.offset.click.left<g[0]||e-this.offset.click.left>g[2])?e:!(e-this.offset.click.left<g[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<
+526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,
+c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.16"});d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var h=d.data(this,"sortable");if(h&&!h.options.disabled){c.sortables.push({instance:h,shouldRevert:h.options.revert});
+h.refreshPositions();h._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=
+false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",true);
+this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;
+c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&
+this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=
+a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!=
+"x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<
+c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-
+c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable","snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,
+width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,h=b.offset.left,g=h+c.helperProportions.width,n=b.offset.top,o=n+c.helperProportions.height,i=c.snapElements.length-1;i>=0;i--){var j=c.snapElements[i].left,l=j+c.snapElements[i].width,k=c.snapElements[i].top,m=k+c.snapElements[i].height;if(j-e<h&&h<l+e&&k-e<n&&n<m+e||j-e<h&&h<l+e&&k-e<o&&o<m+e||j-e<g&&g<l+e&&k-e<n&&n<m+e||j-e<g&&g<l+e&&k-e<o&&
+o<m+e){if(f.snapMode!="inner"){var p=Math.abs(k-o)<=e,q=Math.abs(m-n)<=e,r=Math.abs(j-g)<=e,s=Math.abs(l-h)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l}).left-c.margins.left}var t=
+p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(k-n)<=e;q=Math.abs(m-o)<=e;r=Math.abs(j-h)<=e;s=Math.abs(l-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m-c.helperProportions.height,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[i].snapping&&
+(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=p||q||r||s||t}else{c.snapElements[i].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),
+10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
+;/*
+ * jQuery UI Droppable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Droppables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.draggable.js
+ */
+(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
+a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
+this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
+this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
+d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
+a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.16"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;
+switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=
+i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!=
+"none";if(c[f].visible){e=="mousedown"&&c[f]._activate.call(c[f],b);c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight}}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||
+a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},dragStart:function(a,b){a.element.parents(":not(body,html)").bind("scroll.droppable",function(){a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)})},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);
+if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})},dragStop:function(a,b){a.element.parents(":not(body,html)").unbind("scroll.droppable");
+a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)}}})(jQuery);
+;/*
+ * jQuery UI Resizable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
+_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
+top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
+this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
+nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
+String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),l=0;l=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,l);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
+this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){if(!a.disabled){e(this).removeClass("ui-resizable-autohide");b._handles.show()}},function(){if(!a.disabled)if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();
+var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=
+false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});
+this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff=
+{width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];
+if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);this._updateVirtualBoundaries(b.shiftKey);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},
+_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,
+{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(b){var a=this.options,c,d,f;a={minWidth:k(a.minWidth)?a.minWidth:0,maxWidth:k(a.maxWidth)?a.maxWidth:Infinity,minHeight:k(a.minHeight)?a.minHeight:0,maxHeight:k(a.maxHeight)?a.maxHeight:
+Infinity};if(this._aspectRatio||b){b=a.minHeight*this.aspectRatio;d=a.minWidth/this.aspectRatio;c=a.maxHeight*this.aspectRatio;f=a.maxWidth/this.aspectRatio;if(b>a.minWidth)a.minWidth=b;if(d>a.minHeight)a.minHeight=d;if(c<a.maxWidth)a.maxWidth=c;if(f<a.maxHeight)a.maxHeight=f}this._vBoundaries=a},_updateCache:function(b){this.offset=this.helper.offset();if(k(b.left))this.position.left=b.left;if(k(b.top))this.position.top=b.top;if(k(b.height))this.size.height=b.height;if(k(b.width))this.size.width=
+b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(k(b.height))b.width=b.height*this.aspectRatio;else if(k(b.width))b.height=b.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top=a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this._vBoundaries,c=this.axis,d=k(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=k(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=k(b.width)&&a.minWidth&&
+a.minWidth>b.width,h=k(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,l=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&l)b.left=i-a.minWidth;if(d&&l)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=
+null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=[c.css("borderTopWidth"),c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||
+0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+
+a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+
+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);
+b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.16"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),
+10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-
+f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var l=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:l.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(l.css("position"))){c._revertToRelativePosition=true;l.css({position:"absolute",top:"auto",left:"auto"})}l.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?
+e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=
+e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,
+step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=
+e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;
+var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:
+a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-
+d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,
+f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,
+display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=
+e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=
+d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},k=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
+;/*
+ * jQuery UI Selectable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
+selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
+c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",
+c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=
+this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");
+a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&
+!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=
+e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.16"})})(jQuery);
+;/*
+ * jQuery UI Sortable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var a=this.options;this.containerCache={};this.element.addClass("ui-sortable");
+this.refresh();this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a===
+"disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&
+!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,
+left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};
+this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=
+document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);
+return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<
+b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-
+b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,
+a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],
+e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();
+c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):
+this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,
+dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},
+toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||
+this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();
+var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},
+_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();
+if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),
+this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),
+this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&
+this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=0;b--){var c=this.items[b];if(!(c.instance!=this.currentContainer&&this.currentContainer&&c.item[0]!=this.currentItem[0])){var e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=
+this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=
+d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||
+0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",
+a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-
+f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=
+this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==
+""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=
+this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a=
+{top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),
+10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?
+document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),
+10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=
+this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&
+this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();
+var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-
+this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-
+this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],
+this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]=
+"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",
+f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,
+this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",
+a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},
+_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});d.extend(d.ui.sortable,{version:"1.8.16"})})(jQuery);
+;/*
+ * jQuery UI Accordion 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(c){c.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var a=this,b=a.options;a.running=0;a.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");
+a.headers=a.element.find(b.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){b.disabled||c(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){b.disabled||c(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){b.disabled||c(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){b.disabled||c(this).removeClass("ui-state-focus")});a.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
+if(b.navigation){var d=a.element.find("a").filter(b.navigationFilter).eq(0);if(d.length){var h=d.closest(".ui-accordion-header");a.active=h.length?h:d.closest(".ui-accordion-content").prev()}}a.active=a._findActive(a.active||b.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");a.active.next().addClass("ui-accordion-content-active");a._createIcons();a.resize();a.element.attr("role","tablist");a.headers.attr("role","tab").bind("keydown.accordion",
+function(f){return a._keydown(f)}).next().attr("role","tabpanel");a.headers.not(a.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide();a.active.length?a.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):a.headers.eq(0).attr("tabIndex",0);c.browser.safari||a.headers.find("a").attr("tabIndex",-1);b.event&&a.headers.bind(b.event.split(" ").join(".accordion ")+".accordion",function(f){a._clickHandler.call(a,f,this);f.preventDefault()})},_createIcons:function(){var a=
+this.options;if(a.icons){c("<span></span>").addClass("ui-icon "+a.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(a.icons.header).toggleClass(a.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var a=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex");
+this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(a.autoHeight||a.fillHeight)b.css("height","");return c.Widget.prototype.destroy.call(this)},_setOption:function(a,b){c.Widget.prototype._setOption.apply(this,arguments);a=="active"&&this.activate(b);if(a=="icons"){this._destroyIcons();
+b&&this._createIcons()}if(a=="disabled")this.headers.add(this.headers.next())[b?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(a){if(!(this.options.disabled||a.altKey||a.ctrlKey)){var b=c.ui.keyCode,d=this.headers.length,h=this.headers.index(a.target),f=false;switch(a.keyCode){case b.RIGHT:case b.DOWN:f=this.headers[(h+1)%d];break;case b.LEFT:case b.UP:f=this.headers[(h-1+d)%d];break;case b.SPACE:case b.ENTER:this._clickHandler({target:a.target},a.target);
+a.preventDefault()}if(f){c(a.target).attr("tabIndex",-1);c(f).attr("tabIndex",0);f.focus();return false}return true}},resize:function(){var a=this.options,b;if(a.fillSpace){if(c.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}b=this.element.parent().height();c.browser.msie&&this.element.parent().css("overflow",d);this.headers.each(function(){b-=c(this).outerHeight(true)});this.headers.next().each(function(){c(this).height(Math.max(0,b-c(this).innerHeight()+
+c(this).height()))}).css("overflow","auto")}else if(a.autoHeight){b=0;this.headers.next().each(function(){b=Math.max(b,c(this).height("").height())}).height(b)}return this},activate:function(a){this.options.active=a;a=this._findActive(a)[0];this._clickHandler({target:a},a);return this},_findActive:function(a){return a?typeof a==="number"?this.headers.filter(":eq("+a+")"):this.headers.not(this.headers.not(a)):a===false?c([]):this.headers.filter(":eq(0)")},_clickHandler:function(a,b){var d=this.options;
+if(!d.disabled)if(a.target){a=c(a.currentTarget||b);b=a[0]===this.active[0];d.active=d.collapsible&&b?false:this.headers.index(a);if(!(this.running||!d.collapsible&&b)){var h=this.active;j=a.next();g=this.active.next();e={options:d,newHeader:b&&d.collapsible?c([]):a,oldHeader:this.active,newContent:b&&d.collapsible?c([]):j,oldContent:g};var f=this.headers.index(this.active[0])>this.headers.index(a[0]);this.active=b?c([]):a;this._toggle(j,g,e,b,f);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);
+if(!b){a.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);a.next().addClass("ui-accordion-content-active")}}}else if(d.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);this.active.next().addClass("ui-accordion-content-active");var g=this.active.next(),
+e={options:d,newHeader:c([]),oldHeader:d.active,newContent:c([]),oldContent:g},j=this.active=c([]);this._toggle(j,g,e)}},_toggle:function(a,b,d,h,f){var g=this,e=g.options;g.toShow=a;g.toHide=b;g.data=d;var j=function(){if(g)return g._completed.apply(g,arguments)};g._trigger("changestart",null,g.data);g.running=b.size()===0?a.size():b.size();if(e.animated){d={};d=e.collapsible&&h?{toShow:c([]),toHide:b,complete:j,down:f,autoHeight:e.autoHeight||e.fillSpace}:{toShow:a,toHide:b,complete:j,down:f,autoHeight:e.autoHeight||
+e.fillSpace};if(!e.proxied)e.proxied=e.animated;if(!e.proxiedDuration)e.proxiedDuration=e.duration;e.animated=c.isFunction(e.proxied)?e.proxied(d):e.proxied;e.duration=c.isFunction(e.proxiedDuration)?e.proxiedDuration(d):e.proxiedDuration;h=c.ui.accordion.animations;var i=e.duration,k=e.animated;if(k&&!h[k]&&!c.easing[k])k="slide";h[k]||(h[k]=function(l){this.slide(l,{easing:k,duration:i||700})});h[k](d)}else{if(e.collapsible&&h)a.toggle();else{b.hide();a.show()}j(true)}b.prev().attr({"aria-expanded":"false",
+"aria-selected":"false",tabIndex:-1}).blur();a.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");if(this.toHide.length)this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});c.extend(c.ui.accordion,{version:"1.8.16",
+animations:{slide:function(a,b){a=c.extend({easing:"swing",duration:300},a,b);if(a.toHide.size())if(a.toShow.size()){var d=a.toShow.css("overflow"),h=0,f={},g={},e;b=a.toShow;e=b[0].style.width;b.width(parseInt(b.parent().width(),10)-parseInt(b.css("paddingLeft"),10)-parseInt(b.css("paddingRight"),10)-(parseInt(b.css("borderLeftWidth"),10)||0)-(parseInt(b.css("borderRightWidth"),10)||0));c.each(["height","paddingTop","paddingBottom"],function(j,i){g[i]="hide";j=(""+c.css(a.toShow[0],i)).match(/^([\d+-.]+)(.*)$/);
+f[i]={value:j[1],unit:j[2]||"px"}});a.toShow.css({height:0,overflow:"hidden"}).show();a.toHide.filter(":hidden").each(a.complete).end().filter(":visible").animate(g,{step:function(j,i){if(i.prop=="height")h=i.end-i.start===0?0:(i.now-i.start)/(i.end-i.start);a.toShow[0].style[i.prop]=h*f[i.prop].value+f[i.prop].unit},duration:a.duration,easing:a.easing,complete:function(){a.autoHeight||a.toShow.css("height","");a.toShow.css({width:e,overflow:d});a.complete()}})}else a.toHide.animate({height:"hide",
+paddingTop:"hide",paddingBottom:"hide"},a);else a.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},a)},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1E3:200})}}})})(jQuery);
+;/*
+ * jQuery UI Autocomplete 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.position.js
+ */
+(function(d){var e=0;d.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:false,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var a=this,b=this.element[0].ownerDocument,g;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!(a.options.disabled||a.element.propAttr("readOnly"))){g=
+false;var f=d.ui.keyCode;switch(c.keyCode){case f.PAGE_UP:a._move("previousPage",c);break;case f.PAGE_DOWN:a._move("nextPage",c);break;case f.UP:a._move("previous",c);c.preventDefault();break;case f.DOWN:a._move("next",c);c.preventDefault();break;case f.ENTER:case f.NUMPAD_ENTER:if(a.menu.active){g=true;c.preventDefault()}case f.TAB:if(!a.menu.active)return;a.menu.select(c);break;case f.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!=
+a.element.val()){a.selectedItem=null;a.search(null,c)}},a.options.delay);break}}}).bind("keypress.autocomplete",function(c){if(g){g=false;c.preventDefault()}}).bind("focus.autocomplete",function(){if(!a.options.disabled){a.selectedItem=null;a.previous=a.element.val()}}).bind("blur.autocomplete",function(c){if(!a.options.disabled){clearTimeout(a.searching);a.closing=setTimeout(function(){a.close(c);a._change(c)},150)}});this._initSource();this.response=function(){return a._response.apply(a,arguments)};
+this.menu=d("<ul></ul>").addClass("ui-autocomplete").appendTo(d(this.options.appendTo||"body",b)[0]).mousedown(function(c){var f=a.menu.element[0];d(c.target).closest(".ui-menu-item").length||setTimeout(function(){d(document).one("mousedown",function(h){h.target!==a.element[0]&&h.target!==f&&!d.ui.contains(f,h.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,f){f=f.item.data("item.autocomplete");false!==a._trigger("focus",c,{item:f})&&/^key/.test(c.originalEvent.type)&&
+a.element.val(f.value)},selected:function(c,f){var h=f.item.data("item.autocomplete"),i=a.previous;if(a.element[0]!==b.activeElement){a.element.focus();a.previous=i;setTimeout(function(){a.previous=i;a.selectedItem=h},1)}false!==a._trigger("select",c,{item:h})&&a.element.val(h.value);a.term=a.element.val();a.close(c);a.selectedItem=h},blur:function(){a.menu.element.is(":visible")&&a.element.val()!==a.term&&a.element.val(a.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");
+d.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");this.menu.element.remove();d.Widget.prototype.destroy.call(this)},_setOption:function(a,b){d.Widget.prototype._setOption.apply(this,arguments);a==="source"&&this._initSource();if(a==="appendTo")this.menu.element.appendTo(d(b||"body",this.element[0].ownerDocument)[0]);a==="disabled"&&
+b&&this.xhr&&this.xhr.abort()},_initSource:function(){var a=this,b,g;if(d.isArray(this.options.source)){b=this.options.source;this.source=function(c,f){f(d.ui.autocomplete.filter(b,c.term))}}else if(typeof this.options.source==="string"){g=this.options.source;this.source=function(c,f){a.xhr&&a.xhr.abort();a.xhr=d.ajax({url:g,data:c,dataType:"json",autocompleteRequest:++e,success:function(h){this.autocompleteRequest===e&&f(h)},error:function(){this.autocompleteRequest===e&&f([])}})}}else this.source=
+this.options.source},search:function(a,b){a=a!=null?a:this.element.val();this.term=this.element.val();if(a.length<this.options.minLength)return this.close(b);clearTimeout(this.closing);if(this._trigger("search",b)!==false)return this._search(a)},_search:function(a){this.pending++;this.element.addClass("ui-autocomplete-loading");this.source({term:a},this.response)},_response:function(a){if(!this.options.disabled&&a&&a.length){a=this._normalize(a);this._suggest(a);this._trigger("open")}else this.close();
+this.pending--;this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(a){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this.menu.element.hide();this.menu.deactivate();this._trigger("close",a)}},_change:function(a){this.previous!==this.element.val()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(a){if(a.length&&a[0].label&&a[0].value)return a;return d.map(a,function(b){if(typeof b==="string")return{label:b,value:b};return d.extend({label:b.label||
+b.value,value:b.value||b.label},b)})},_suggest:function(a){var b=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(b,a);this.menu.deactivate();this.menu.refresh();b.show();this._resizeMenu();b.position(d.extend({of:this.element},this.options.position));this.options.autoFocus&&this.menu.next(new d.Event("mouseover"))},_resizeMenu:function(){var a=this.menu.element;a.outerWidth(Math.max(a.width("").outerWidth(),this.element.outerWidth()))},_renderMenu:function(a,b){var g=this;
+d.each(b,function(c,f){g._renderItem(a,f)})},_renderItem:function(a,b){return d("<li></li>").data("item.autocomplete",b).append(d("<a></a>").text(b.label)).appendTo(a)},_move:function(a,b){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term);this.menu.deactivate()}else this.menu[a](b);else this.search(null,b)},widget:function(){return this.menu.element}});d.extend(d.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,
+"\\$&")},filter:function(a,b){var g=new RegExp(d.ui.autocomplete.escapeRegex(b),"i");return d.grep(a,function(c){return g.test(c.label||c.value||c)})}})})(jQuery);
+(function(d){d.widget("ui.menu",{_create:function(){var e=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(a){if(d(a.target).closest(".ui-menu-item a").length){a.preventDefault();e.select(a)}});this.refresh()},refresh:function(){var e=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
+-1).mouseenter(function(a){e.activate(a,d(this).parent())}).mouseleave(function(){e.deactivate()})},activate:function(e,a){this.deactivate();if(this.hasScroll()){var b=a.offset().top-this.element.offset().top,g=this.element.scrollTop(),c=this.element.height();if(b<0)this.element.scrollTop(g+b);else b>=c&&this.element.scrollTop(g+b-c+a.height())}this.active=a.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",e,{item:a})},deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");
+this._trigger("blur");this.active=null}},next:function(e){this.move("next",".ui-menu-item:first",e)},previous:function(e){this.move("prev",".ui-menu-item:last",e)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(e,a,b){if(this.active){e=this.active[e+"All"](".ui-menu-item").eq(0);e.length?this.activate(b,e):this.activate(b,this.element.children(a))}else this.activate(b,
+this.element.children(a))},nextPage:function(e){if(this.hasScroll())if(!this.active||this.last())this.activate(e,this.element.children(".ui-menu-item:first"));else{var a=this.active.offset().top,b=this.element.height(),g=this.element.children(".ui-menu-item").filter(function(){var c=d(this).offset().top-a-b+d(this).height();return c<10&&c>-10});g.length||(g=this.element.children(".ui-menu-item:last"));this.activate(e,g)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active||
+this.last()?":first":":last"))},previousPage:function(e){if(this.hasScroll())if(!this.active||this.first())this.activate(e,this.element.children(".ui-menu-item:last"));else{var a=this.active.offset().top,b=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var g=d(this).offset().top-a+b-d(this).height();return g<10&&g>-10});result.length||(result=this.element.children(".ui-menu-item:first"));this.activate(e,result)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active||
+this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element[d.fn.prop?"prop":"attr"]("scrollHeight")},select:function(e){this._trigger("selected",e,{item:this.active})}})})(jQuery);
+;/*
+ * jQuery UI Button 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(b){var h,i,j,g,l=function(){var a=b(this).find(":ui-button");setTimeout(function(){a.button("refresh")},1)},k=function(a){var c=a.name,e=a.form,f=b([]);if(c)f=e?b(e).find("[name='"+c+"']"):b("[name='"+c+"']",a.ownerDocument).filter(function(){return!this.form});return f};b.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",l);if(typeof this.options.disabled!==
+"boolean")this.options.disabled=this.element.propAttr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var a=this,c=this.options,e=this.type==="checkbox"||this.type==="radio",f="ui-state-hover"+(!e?" ui-state-active":"");if(c.label===null)c.label=this.buttonElement.html();if(this.element.is(":disabled"))c.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",function(){if(!c.disabled){b(this).addClass("ui-state-hover");
+this===h&&b(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){c.disabled||b(this).removeClass(f)}).bind("click.button",function(d){if(c.disabled){d.preventDefault();d.stopImmediatePropagation()}});this.element.bind("focus.button",function(){a.buttonElement.addClass("ui-state-focus")}).bind("blur.button",function(){a.buttonElement.removeClass("ui-state-focus")});if(e){this.element.bind("change.button",function(){g||a.refresh()});this.buttonElement.bind("mousedown.button",function(d){if(!c.disabled){g=
+false;i=d.pageX;j=d.pageY}}).bind("mouseup.button",function(d){if(!c.disabled)if(i!==d.pageX||j!==d.pageY)g=true})}if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(c.disabled||g)return false;b(this).toggleClass("ui-state-active");a.buttonElement.attr("aria-pressed",a.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(c.disabled||g)return false;b(this).addClass("ui-state-active");a.buttonElement.attr("aria-pressed","true");
+var d=a.element[0];k(d).not(d).map(function(){return b(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")});else{this.buttonElement.bind("mousedown.button",function(){if(c.disabled)return false;b(this).addClass("ui-state-active");h=this;b(document).one("mouseup",function(){h=null})}).bind("mouseup.button",function(){if(c.disabled)return false;b(this).removeClass("ui-state-active")}).bind("keydown.button",function(d){if(c.disabled)return false;if(d.keyCode==b.ui.keyCode.SPACE||
+d.keyCode==b.ui.keyCode.ENTER)b(this).addClass("ui-state-active")}).bind("keyup.button",function(){b(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(d){d.keyCode===b.ui.keyCode.SPACE&&b(this).click()})}this._setOption("disabled",c.disabled);this._resetButton()},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type===
+"radio"){var a=this.element.parents().filter(":last"),c="label[for='"+this.element.attr("id")+"']";this.buttonElement=a.find(c);if(!this.buttonElement.length){a=a.length?a.siblings():this.element.siblings();this.buttonElement=a.filter(c);if(!this.buttonElement.length)this.buttonElement=a.find(c)}this.element.addClass("ui-helper-hidden-accessible");(a=this.element.is(":checked"))&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",a)}else this.buttonElement=this.element},
+widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());this.hasTitle||this.buttonElement.removeAttr("title");
+b.Widget.prototype.destroy.call(this)},_setOption:function(a,c){b.Widget.prototype._setOption.apply(this,arguments);if(a==="disabled")c?this.element.propAttr("disabled",true):this.element.propAttr("disabled",false);else this._resetButton()},refresh:function(){var a=this.element.is(":disabled");a!==this.options.disabled&&this._setOption("disabled",a);if(this.type==="radio")k(this.element[0]).each(function(){b(this).is(":checked")?b(this).button("widget").addClass("ui-state-active").attr("aria-pressed",
+"true"):b(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false")},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var a=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
+c=b("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(a.empty()).text(),e=this.options.icons,f=e.primary&&e.secondary,d=[];if(e.primary||e.secondary){if(this.options.text)d.push("ui-button-text-icon"+(f?"s":e.primary?"-primary":"-secondary"));e.primary&&a.prepend("<span class='ui-button-icon-primary ui-icon "+e.primary+"'></span>");e.secondary&&a.append("<span class='ui-button-icon-secondary ui-icon "+e.secondary+"'></span>");if(!this.options.text){d.push(f?"ui-button-icons-only":
+"ui-button-icon-only");this.hasTitle||a.attr("title",c)}}else d.push("ui-button-text-only");a.addClass(d.join(" "))}}});b.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(a,c){a==="disabled"&&this.buttons.button("option",a,c);b.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){var a=this.element.css("direction")===
+"ltr";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return b(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(a?"ui-corner-left":"ui-corner-right").end().filter(":last").addClass(a?"ui-corner-right":"ui-corner-left").end().end()},destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return b(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");
+b.Widget.prototype.destroy.call(this)}})})(jQuery);
+;/*
+ * jQuery UI Dialog 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *  jquery.ui.button.js
+ *	jquery.ui.draggable.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.position.js
+ *	jquery.ui.resizable.js
+ */
+(function(c,l){var m={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},n={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},o=c.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,
+position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||"&#160;",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+
+b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&!i.isDefaultPrevented()&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),
+h=c('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);return false}).appendTo(f);(a.uiDialogTitlebarCloseText=c("<span></span>")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("<span></span>").addClass("ui-dialog-title").attr("id",
+e).html(d).prependTo(f);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=b.beforeclose;f.find("*").add(f).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");
+a.uiDialog.remove();a.originalTitle&&a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d,e;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!==
+b.uiDialog[0]){e=c(this).css("z-index");isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.scrollTop(),scrollLeft:d.element.scrollLeft()};c.ui.dialog.maxZ+=1;
+d.uiDialog.css("z-index",c.ui.dialog.maxZ);d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target===
+f[0]&&e.shiftKey){g.focus(1);return false}}});c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,e=c("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("<div></div>").addClass("ui-dialog-buttonset").appendTo(e);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a,
+function(){return!(d=true)});if(d){c.each(a,function(f,h){h=c.isFunction(h)?{click:h,text:f}:h;var i=c('<button type="button"></button>').click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.each(h,function(j,k){if(j!=="click")j in o?i[j](k):i.attr(j,k)});c.fn.button&&i.button()});e.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(f){return{position:f.position,offset:f.offset}}var b=this,d=b.options,e=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",
+handle:".ui-dialog-titlebar",containment:"document",start:function(f,h){g=d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",f,a(h))},drag:function(f,h){b._trigger("drag",f,a(h))},stop:function(f,h){d.position=[h.position.left-e.scrollLeft(),h.position.top-e.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);b._trigger("dragStop",f,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(f){return{originalPosition:f.originalPosition,
+originalSize:f.originalSize,position:f.position,size:f.size}}a=a===l?this.options.resizable:a;var d=this,e=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:a,start:function(f,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",f,b(h))},resize:function(f,h){d._trigger("resize",
+f,b(h))},stop:function(f,h){c(this).removeClass("ui-dialog-resizing");e.height=c(this).height();e.width=c(this).width();d._trigger("resizeStop",f,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(a){var b=[],d=[0,0],e;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "):
+[a[0],a[1]];if(b.length===1)b[1]=b[0];c.each(["left","top"],function(g,f){if(+b[g]===b[g]){d[g]=b[g];b[g]=f}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(e=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(c.extend({of:window},a));e||this.uiDialog.hide()},_setOptions:function(a){var b=this,d={},e=false;c.each(a,function(g,f){b._setOption(g,f);
+if(g in m)e=true;if(g in n)d[g]=f});e&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",d)},_setOption:function(a,b){var d=this,e=d.uiDialog;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":e.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?e.addClass("ui-dialog-disabled"):
+e.removeClass("ui-dialog-disabled");break;case "draggable":var g=e.is(":data(draggable)");g&&!b&&e.draggable("destroy");!g&&b&&d._makeDraggable();break;case "position":d._position(b);break;case "resizable":(g=e.is(":data(resizable)"))&&!b&&e.resizable("destroy");g&&typeof b==="string"&&e.resizable("option","handles",b);!g&&b!==false&&d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||"&#160;"));break}c.Widget.prototype._setOption.apply(d,arguments)},_size:function(){var a=
+this.options,b,d,e=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();d=Math.max(0,a.minHeight-b);if(a.height==="auto")if(c.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();a=this.element.css("height","auto").height();e||this.uiDialog.hide();this.element.height(Math.max(a,d))}else this.element.height(Math.max(a.height-
+b,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.16",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "),
+create:function(a){if(this.instances.length===0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()<c.ui.dialog.overlay.maxZ)return false})},1);c(document).bind("keydown.dialog-overlay",function(d){if(a.options.closeOnEscape&&!d.isDefaultPrevented()&&d.keyCode&&d.keyCode===c.ui.keyCode.ESCAPE){a.close(d);d.preventDefault()}});c(window).bind("resize.dialog-overlay",c.ui.dialog.overlay.resize)}var b=(this.oldInstances.pop()||
+c("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&&
+c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a<b?c(window).height()+"px":a+"px"}else return c(document).height()+"px"},width:function(){var a,b;if(c.browser.msie){a=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);b=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return a<b?c(window).width()+"px":a+"px"}else return c(document).width()+
+"px"},resize:function(){var a=c([]);c.each(c.ui.dialog.overlay.instances,function(){a=a.add(this)});a.css({width:0,height:0}).css({width:c.ui.dialog.overlay.width(),height:c.ui.dialog.overlay.height()})}});c.extend(c.ui.dialog.overlay.prototype,{destroy:function(){c.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
+;/*
+ * jQuery UI Slider 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var a=this,b=this.options,c=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f=b.values&&b.values.length||1,e=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
+this.orientation+" ui-widget ui-widget-content ui-corner-all"+(b.disabled?" ui-slider-disabled ui-disabled":""));this.range=d([]);if(b.range){if(b.range===true){if(!b.values)b.values=[this._valueMin(),this._valueMin()];if(b.values.length&&b.values.length!==2)b.values=[b.values[0],b.values[0]]}this.range=d("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(b.range==="min"||b.range==="max"?" ui-slider-range-"+b.range:""))}for(var j=c.length;j<f;j+=1)e.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");
+this.handles=c.add(d(e.join("")).appendTo(a.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){b.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(b.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(g){d(this).data("index.ui-slider-handle",
+g)});this.handles.keydown(function(g){var k=true,l=d(this).data("index.ui-slider-handle"),i,h,m;if(!a.options.disabled){switch(g.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:k=false;if(!a._keySliding){a._keySliding=true;d(this).addClass("ui-state-active");i=a._start(g,l);if(i===false)return}break}m=a.options.step;i=a.options.values&&a.options.values.length?
+(h=a.values(l)):(h=a.value());switch(g.keyCode){case d.ui.keyCode.HOME:h=a._valueMin();break;case d.ui.keyCode.END:h=a._valueMax();break;case d.ui.keyCode.PAGE_UP:h=a._trimAlignValue(i+(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:h=a._trimAlignValue(i-(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(i===a._valueMax())return;h=a._trimAlignValue(i+m);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(i===a._valueMin())return;h=a._trimAlignValue(i-
+m);break}a._slide(g,l,h);return k}}).keyup(function(g){var k=d(this).data("index.ui-slider-handle");if(a._keySliding){a._keySliding=false;a._stop(g,k);a._change(g,k);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();
+return this},_mouseCapture:function(a){var b=this.options,c,f,e,j,g;if(b.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:a.pageX,y:a.pageY});f=this._valueMax()-this._valueMin()+1;j=this;this.handles.each(function(k){var l=Math.abs(c-j.values(k));if(f>l){f=l;e=d(this);g=k}});if(b.range===true&&this.values(1)===b.min){g+=1;e=d(this.handles[g])}if(this._start(a,g)===false)return false;
+this._mouseSliding=true;j._handleIndex=g;e.addClass("ui-state-active").focus();b=e.offset();this._clickOffset=!d(a.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:a.pageX-b.left-e.width()/2,top:a.pageY-b.top-e.height()/2-(parseInt(e.css("borderTopWidth"),10)||0)-(parseInt(e.css("borderBottomWidth"),10)||0)+(parseInt(e.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(a,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(a){var b=
+this._normValueFromMouse({x:a.pageX,y:a.pageY});this._slide(a,this._handleIndex,b);return false},_mouseStop:function(a){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(a,this._handleIndex);this._change(a,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b;if(this.orientation==="horizontal"){b=
+this.elementSize.width;a=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{b=this.elementSize.height;a=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}b=a/b;if(b>1)b=1;if(b<0)b=0;if(this.orientation==="vertical")b=1-b;a=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+b*a)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);
+c.values=this.values()}return this._trigger("start",a,c)},_slide:function(a,b,c){var f;if(this.options.values&&this.options.values.length){f=this.values(b?0:1);if(this.options.values.length===2&&this.options.range===true&&(b===0&&c>f||b===1&&c<f))c=f;if(c!==this.values(b)){f=this.values();f[b]=c;a=this._trigger("slide",a,{handle:this.handles[b],value:c,values:f});this.values(b?0:1);a!==false&&this.values(b,c,true)}}else if(c!==this.value()){a=this._trigger("slide",a,{handle:this.handles[b],value:c});
+a!==false&&this.value(c)}},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("change",a,c)}},value:function(a){if(arguments.length){this.options.value=
+this._trimAlignValue(a);this._refreshValue();this._change(null,0)}else return this._value()},values:function(a,b){var c,f,e;if(arguments.length>1){this.options.values[a]=this._trimAlignValue(b);this._refreshValue();this._change(null,a)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;f=arguments[0];for(e=0;e<c.length;e+=1){c[e]=this._trimAlignValue(f[e]);this._change(null,e)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(a):
+this.value();else return this._values()},_setOption:function(a,b){var c,f=0;if(d.isArray(this.options.values))f=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(a){case "disabled":if(b){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.propAttr("disabled",true);this.element.addClass("ui-disabled")}else{this.handles.propAttr("disabled",false);this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
+this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<f;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var a=this.options.value;return a=this._trimAlignValue(a)},_values:function(a){var b,c;if(arguments.length){b=this.options.values[a];
+return b=this._trimAlignValue(b)}else{b=this.options.values.slice();for(c=0;c<b.length;c+=1)b[c]=this._trimAlignValue(b[c]);return b}},_trimAlignValue:function(a){if(a<=this._valueMin())return this._valueMin();if(a>=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b;a=a-c;if(Math.abs(c)*2>=b)a+=c>0?b:-b;return parseFloat(a.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var a=
+this.options.range,b=this.options,c=this,f=!this._animateOff?b.animate:false,e,j={},g,k,l,i;if(this.options.values&&this.options.values.length)this.handles.each(function(h){e=(c.values(h)-c._valueMin())/(c._valueMax()-c._valueMin())*100;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";d(this).stop(1,1)[f?"animate":"css"](j,b.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(h===0)c.range.stop(1,1)[f?"animate":"css"]({left:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({width:e-
+g+"%"},{queue:false,duration:b.animate})}else{if(h===0)c.range.stop(1,1)[f?"animate":"css"]({bottom:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({height:e-g+"%"},{queue:false,duration:b.animate})}g=e});else{k=this.value();l=this._valueMin();i=this._valueMax();e=i!==l?(k-l)/(i-l)*100:0;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[f?"animate":"css"](j,b.animate);if(a==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[f?"animate":"css"]({width:e+"%"},
+b.animate);if(a==="max"&&this.orientation==="horizontal")this.range[f?"animate":"css"]({width:100-e+"%"},{queue:false,duration:b.animate});if(a==="min"&&this.orientation==="vertical")this.range.stop(1,1)[f?"animate":"css"]({height:e+"%"},b.animate);if(a==="max"&&this.orientation==="vertical")this.range[f?"animate":"css"]({height:100-e+"%"},{queue:false,duration:b.animate})}}});d.extend(d.ui.slider,{version:"1.8.16"})})(jQuery);
+;/*
+ * jQuery UI Tabs 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&&
+e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=
+d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]||
+(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
+this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected=
+this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
+if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))[0]))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
+this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+
+g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal",
+function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")};
+this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected=
+-1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
+d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=
+d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b,
+e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]);
+j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove();
+if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=b}),function(h){return h>=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null,
+this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this},
+load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c,
+"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
+url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.16"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&&
+a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(a.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
+;/*
+ * jQuery UI Datepicker 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */
+(function(d,C){function M(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
+"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
+"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
+minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function N(a){return a.bind("mouseout",
+function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+b.addClass("ui-state-hover");b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.16"}});var B=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},
+setDefaults:function(a){H(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,
+"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",
+function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b);b.settings.disabled&&this._disableDatepicker(a)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c==
+"focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():
+d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,
+b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.settings.disabled&&this._disableDatepicker(a);b.dpDiv.css("display","block")}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=
+1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/
+2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=
+d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=
+a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,
+"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==
+a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?
+d.extend({},e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&this._hideDatepicker();var h=this._getDateDatepicker(a,true),i=this._getMinMaxDate(e,"min"),g=this._getMinMaxDate(e,"max");H(e.settings,f);if(i!==null&&f.dateFormat!==C&&f.minDate===C)e.settings.minDate=this._formatDate(e,i);if(g!==null&&f.dateFormat!==C&&f.maxDate===C)e.settings.maxDate=this._formatDate(e,g);this._attachments(d(a),e);this._autoSize(e);this._setDate(e,h);this._updateAlternate(e);
+this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");
+b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);c[0]&&d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]);if(a=d.datepicker._get(b,"onSelect")){c=d.datepicker._formatDate(b);a.apply(b.input?b.input[0]:null,[c,b])}else d.datepicker._hideDatepicker();return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,
+a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=
+a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,
+"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==C?a.keyCode:a.charCode);
+return a.ctrlKey||a.metaKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",
+a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);if(d.datepicker._curInst&&d.datepicker._curInst!=b){d.datepicker._datepickerShowing&&d.datepicker._triggerOnClose(d.datepicker._curInst);d.datepicker._curInst.dpDiv.stop(true,true)}var c=d.datepicker._get(b,"beforeShow");c=c?c.apply(a,[a,b]):{};if(c!==false){H(b.settings,c);b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value=
+"";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);
+c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing=
+true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}}},_updateDatepicker:function(a){this.maxRows=4;var b=d.datepicker._getBorders(a.dpDiv);J=a;a.dpDiv.empty().append(this._generateHTML(a));var c=a.dpDiv.find("iframe.ui-datepicker-cover");c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});
+a.dpDiv.find("."+this._dayOverClass+" a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&
+!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),
+h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=
+this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_triggerOnClose:function(a){var b=this._get(a,"onClose");if(b)b.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a])},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);
+this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();d.datepicker._triggerOnClose(b);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},
+_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):
+0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e["selected"+(c=="M"?
+"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);
+this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");
+if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?
+b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=A+1<a.length&&a.charAt(A+1)==p)&&A++;return p},m=function(p){var D=
+o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&D?4:p=="o"?3:2)+"}");p=b.substring(q).match(p);if(!p)throw"Missing number at position "+q;q+=p[0].length;return parseInt(p[0],10)},n=function(p,D,K){p=d.map(o(p)?K:D,function(w,x){return[[x,w]]}).sort(function(w,x){return-(w[1].length-x[1].length)});var E=-1;d.each(p,function(w,x){w=x[1];if(b.substr(q,w.length).toLowerCase()==w.toLowerCase()){E=x[0];q+=w.length;return false}});if(E!=-1)return E+1;else throw"Unknown name at position "+q;},s=
+function(){if(b.charAt(q)!=a.charAt(A))throw"Unexpected literal at position "+q;q++},q=0,A=0;A<a.length;A++)if(k)if(a.charAt(A)=="'"&&!o("'"))k=false;else s();else switch(a.charAt(A)){case "d":l=m("d");break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":j=m("m");break;case "M":j=n("M",i,g);break;case "y":c=m("y");break;case "@":var v=new Date(m("@"));c=v.getFullYear();j=v.getMonth()+1;l=v.getDate();break;case "!":v=new Date((m("!")-this._ticksTo1970)/1E4);c=v.getFullYear();j=v.getMonth()+
+1;l=v.getDate();break;case "'":if(o("'"))s();else k=true;break;default:s()}if(q<b.length)throw"Extra/unparsed characters found in date: "+b.substring(q);if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,j-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd",
+COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:
+null)||this._defaults.monthNames;var i=function(o){(o=k+1<a.length&&a.charAt(k+1)==o)&&k++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},j=function(o,m,n,s){return i(o)?s[m]:n[m]},l="",u=false;if(b)for(var k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else l+=a.charAt(k);else switch(a.charAt(k)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=j("D",b.getDay(),e,f);break;case "o":l+=g("o",Math.round(((new Date(b.getFullYear(),b.getMonth(),b.getDate())).getTime()-
+(new Date(b.getFullYear(),0,0)).getTime())/864E5),3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=j("M",b.getMonth(),h,c);break;case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+="'";else u=true;break;default:l+=a.charAt(k)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=
+0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+="0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==C?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);
+var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;
+i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case "d":case "D":g+=parseInt(k[1],10);break;case "w":case "W":g+=parseInt(k[1],10)*7;break;case "m":case "M":l+=parseInt(k[1],10);g=
+Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case "y":case "Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return new Date(j,l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>
+12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&
+a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?
+new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));
+n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var s=this._get(a,"nextText");s=!h?s:this.formatDate(s,this._daylightSavingAdjust(new Date(m,
+g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\" title=\""+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>";j=this._get(a,"currentText");s=this._get(a,"gotoCurrent")&&
+a.currentDay?u:b;j=!h?j:this.formatDate(j,s,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+B+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,s)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+
+B+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");s=this._get(a,"dayNames");this._get(a,"dayNamesShort");var q=this._get(a,"dayNamesMin"),A=this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),D=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var E=this._getDefaultDate(a),w="",x=0;x<i[0];x++){var O=
+"";this.maxRows=4;for(var G=0;G<i[1];G++){var P=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",y="";if(l){y+='<div class="ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-1:y+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:y+=" ui-datepicker-group-middle";t="";break}y+='">'}y+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&
+x==0?c?f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,A,v)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var z=j?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var r=(t+h)%7;z+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+s[r]+'">'+q[r]+"</span></th>"}y+=z+"</tr></thead><tbody>";z=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,
+z);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;z=Math.ceil((t+z)/7);this.maxRows=z=l?this.maxRows>z?this.maxRows:z:z;r=this._daylightSavingAdjust(new Date(m,g,1-t));for(var Q=0;Q<z;Q++){y+="<tr>";var R=!j?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(r)+"</td>";for(t=0;t<7;t++){var I=p?p.apply(a.input?a.input[0]:null,[r]):[true,""],F=r.getMonth()!=g,L=F&&!K||!I[0]||k&&r<k||o&&r>o;R+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(r.getTime()==
+P.getTime()&&g==a.selectedMonth&&a._keyEvent||E.getTime()==r.getTime()&&E.getTime()==P.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!D?"":" "+I[1]+(r.getTime()==u.getTime()?" "+this._currentClass:"")+(r.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!F||D)&&I[2]?' title="'+I[2]+'"':"")+(L?"":' onclick="DP_jQuery_'+B+".datepicker._selectDay('#"+a.id+"',"+r.getMonth()+","+r.getFullYear()+', this);return false;"')+">"+(F&&!D?"&#xa0;":L?'<span class="ui-state-default">'+
+r.getDate()+"</span>":'<a class="ui-state-default'+(r.getTime()==b.getTime()?" ui-state-highlight":"")+(r.getTime()==u.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+'" href="#">'+r.getDate()+"</a>")+"</td>";r.setDate(r.getDate()+1);r=this._daylightSavingAdjust(r)}y+=R+"</tr>"}g++;if(g>11){g=0;m++}y+="</tbody></table>"+(l?"</div>"+(i[0]>0&&G==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':
+"");a._keyEvent=false;return w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div class="ui-datepicker-title">',o="";if(h||!j)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" >";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&
+(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&l)?"&#xa0;":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var s=(new Date).getFullYear();i=function(q){q=q.match(/c[+-].*/)?c+parseInt(q.substring(1),10):q.match(/[+-].*/)?s+parseInt(q,10):parseInt(q,10);return isNaN(q)?s:q};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,
+e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" >";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?"&#xa0;":"")+o;k+="</div>";return k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c=="Y"?b:0),f=a.drawMonth+
+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");if(b)b.apply(a.input?
+a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);c=this._daylightSavingAdjust(new Date(c,
+e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,
+"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=function(a){if(!this.length)return this;
+if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));return this.each(function(){typeof a==
+"string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new M;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.16";window["DP_jQuery_"+B]=d})(jQuery);
+;/*
+ * jQuery UI Progressbar 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar
+ *
+ * Depends:
+ *   jquery.ui.core.js
+ *   jquery.ui.widget.js
+ */
+(function(b,d){b.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=b("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
+this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===d)return this._value();this._setOption("value",a);return this},_setOption:function(a,c){if(a==="value"){this.options.value=c;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100*
+this._value()/this.options.max},_refreshValue:function(){var a=this.value(),c=this._percentage();if(this.oldValue!==a){this.oldValue=a;this._trigger("change")}this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(c.toFixed(0)+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.16"})})(jQuery);
+;
Index: dmin/js/jquery/jquery-ui.custom.js
===================================================================
--- admin/js/jquery/jquery-ui.custom.js	(revision 906)
+++ 	(revision )
@@ -1,2776 +1,0 @@
-/*! jQuery UI - v1.9.0 - 2012-10-25
-* http://jqueryui.com
-* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.sortable.js, jquery.ui.accordion.js
-* Copyright (c) 2012 jQuery Foundation and other contributors Licensed MIT */
-
-(function( $, undefined ) {
-
-var uuid = 0,
-	runiqueId = /^ui-id-\d+$/;
-
-// prevent duplicate loading
-// this is only a problem because we proxy existing functions
-// and we don't want to double proxy them
-$.ui = $.ui || {};
-if ( $.ui.version ) {
-	return;
-}
-
-$.extend( $.ui, {
-	version: "1.9.0",
-
-	keyCode: {
-		BACKSPACE: 8,
-		COMMA: 188,
-		DELETE: 46,
-		DOWN: 40,
-		END: 35,
-		ENTER: 13,
-		ESCAPE: 27,
-		HOME: 36,
-		LEFT: 37,
-		NUMPAD_ADD: 107,
-		NUMPAD_DECIMAL: 110,
-		NUMPAD_DIVIDE: 111,
-		NUMPAD_ENTER: 108,
-		NUMPAD_MULTIPLY: 106,
-		NUMPAD_SUBTRACT: 109,
-		PAGE_DOWN: 34,
-		PAGE_UP: 33,
-		PERIOD: 190,
-		RIGHT: 39,
-		SPACE: 32,
-		TAB: 9,
-		UP: 38
-	}
-});
-
-// plugins
-$.fn.extend({
-	_focus: $.fn.focus,
-	focus: function( delay, fn ) {
-		return typeof delay === "number" ?
-			this.each(function() {
-				var elem = this;
-				setTimeout(function() {
-					$( elem ).focus();
-					if ( fn ) {
-						fn.call( elem );
-					}
-				}, delay );
-			}) :
-			this._focus.apply( this, arguments );
-	},
-
-	scrollParent: function() {
-		var scrollParent;
-		if (($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
-			scrollParent = this.parents().filter(function() {
-				return (/(relative|absolute|fixed)/).test($.css(this,'position')) && (/(auto|scroll)/).test($.css(this,'overflow')+$.css(this,'overflow-y')+$.css(this,'overflow-x'));
-			}).eq(0);
-		} else {
-			scrollParent = this.parents().filter(function() {
-				return (/(auto|scroll)/).test($.css(this,'overflow')+$.css(this,'overflow-y')+$.css(this,'overflow-x'));
-			}).eq(0);
-		}
-
-		return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent;
-	},
-
-	zIndex: function( zIndex ) {
-		if ( zIndex !== undefined ) {
-			return this.css( "zIndex", zIndex );
-		}
-
-		if ( this.length ) {
-			var elem = $( this[ 0 ] ), position, value;
-			while ( elem.length && elem[ 0 ] !== document ) {
-				// Ignore z-index if position is set to a value where z-index is ignored by the browser
-				// This makes behavior of this function consistent across browsers
-				// WebKit always returns auto if the element is positioned
-				position = elem.css( "position" );
-				if ( position === "absolute" || position === "relative" || position === "fixed" ) {
-					// IE returns 0 when zIndex is not specified
-					// other browsers return a string
-					// we ignore the case of nested elements with an explicit value of 0
-					// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
-					value = parseInt( elem.css( "zIndex" ), 10 );
-					if ( !isNaN( value ) && value !== 0 ) {
-						return value;
-					}
-				}
-				elem = elem.parent();
-			}
-		}
-
-		return 0;
-	},
-
-	uniqueId: function() {
-		return this.each(function() {
-			if ( !this.id ) {
-				this.id = "ui-id-" + (++uuid);
-			}
-		});
-	},
-
-	removeUniqueId: function() {
-		return this.each(function() {
-			if ( runiqueId.test( this.id ) ) {
-				$( this ).removeAttr( "id" );
-			}
-		});
-	}
-});
-
-// support: jQuery <1.8
-if ( !$( "<a>" ).outerWidth( 1 ).jquery ) {
-	$.each( [ "Width", "Height" ], function( i, name ) {
-		var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
-			type = name.toLowerCase(),
-			orig = {
-				innerWidth: $.fn.innerWidth,
-				innerHeight: $.fn.innerHeight,
-				outerWidth: $.fn.outerWidth,
-				outerHeight: $.fn.outerHeight
-			};
-
-		function reduce( elem, size, border, margin ) {
-			$.each( side, function() {
-				size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
-				if ( border ) {
-					size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
-				}
-				if ( margin ) {
-					size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
-				}
-			});
-			return size;
-		}
-
-		$.fn[ "inner" + name ] = function( size ) {
-			if ( size === undefined ) {
-				return orig[ "inner" + name ].call( this );
-			}
-
-			return this.each(function() {
-				$( this ).css( type, reduce( this, size ) + "px" );
-			});
-		};
-
-		$.fn[ "outer" + name] = function( size, margin ) {
-			if ( typeof size !== "number" ) {
-				return orig[ "outer" + name ].call( this, size );
-			}
-
-			return this.each(function() {
-				$( this).css( type, reduce( this, size, true, margin ) + "px" );
-			});
-		};
-	});
-}
-
-// selectors
-function focusable( element, isTabIndexNotNaN ) {
-	var map, mapName, img,
-		nodeName = element.nodeName.toLowerCase();
-	if ( "area" === nodeName ) {
-		map = element.parentNode;
-		mapName = map.name;
-		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
-			return false;
-		}
-		img = $( "img[usemap=#" + mapName + "]" )[0];
-		return !!img && visible( img );
-	}
-	return ( /input|select|textarea|button|object/.test( nodeName ) ?
-		!element.disabled :
-		"a" === nodeName ?
-			element.href || isTabIndexNotNaN :
-			isTabIndexNotNaN) &&
-		// the element and all of its ancestors must be visible
-		visible( element );
-}
-
-function visible( element ) {
-	return !$( element ).parents().andSelf().filter(function() {
-		return $.css( this, "visibility" ) === "hidden" ||
-			$.expr.filters.hidden( this );
-	}).length;
-}
-
-$.extend( $.expr[ ":" ], {
-	data: $.expr.createPseudo ?
-		$.expr.createPseudo(function( dataName ) {
-			return function( elem ) {
-				return !!$.data( elem, dataName );
-			};
-		}) :
-		// support: jQuery <1.8
-		function( elem, i, match ) {
-			return !!$.data( elem, match[ 3 ] );
-		},
-
-	focusable: function( element ) {
-		return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
-	},
-
-	tabbable: function( element ) {
-		var tabIndex = $.attr( element, "tabindex" ),
-			isTabIndexNaN = isNaN( tabIndex );
-		return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
-	}
-});
-
-// support
-$(function() {
-	var body = document.body,
-		div = body.appendChild( div = document.createElement( "div" ) );
-
-	// access offsetHeight before setting the style to prevent a layout bug
-	// in IE 9 which causes the element to continue to take up space even
-	// after it is removed from the DOM (#8026)
-	div.offsetHeight;
-
-	$.extend( div.style, {
-		minHeight: "100px",
-		height: "auto",
-		padding: 0,
-		borderWidth: 0
-	});
-
-	$.support.minHeight = div.offsetHeight === 100;
-	$.support.selectstart = "onselectstart" in div;
-
-	// set display to none to avoid a layout bug in IE
-	// http://dev.jquery.com/ticket/4014
-	body.removeChild( div ).style.display = "none";
-});
-
-
-
-
-
-// deprecated
-
-$.fn.extend({
-	disableSelection: function() {
-		return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
-			".ui-disableSelection", function( event ) {
-				event.preventDefault();
-			});
-	},
-
-	enableSelection: function() {
-		return this.unbind( ".ui-disableSelection" );
-	}
-});
-
-$.extend( $.ui, {
-	// $.ui.plugin is deprecated.  Use the proxy pattern instead.
-	plugin: {
-		add: function( module, option, set ) {
-			var i,
-				proto = $.ui[ module ].prototype;
-			for ( i in set ) {
-				proto.plugins[ i ] = proto.plugins[ i ] || [];
-				proto.plugins[ i ].push( [ option, set[ i ] ] );
-			}
-		},
-		call: function( instance, name, args ) {
-			var i,
-				set = instance.plugins[ name ];
-			if ( !set || !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) {
-				return;
-			}
-
-			for ( i = 0; i < set.length; i++ ) {
-				if ( instance.options[ set[ i ][ 0 ] ] ) {
-					set[ i ][ 1 ].apply( instance.element, args );
-				}
-			}
-		}
-	},
-
-	contains: $.contains,
-
-	// only used by resizable
-	hasScroll: function( el, a ) {
-
-		//If overflow is hidden, the element might have extra content, but the user wants to hide it
-		if ( $( el ).css( "overflow" ) === "hidden") {
-			return false;
-		}
-
-		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
-			has = false;
-
-		if ( el[ scroll ] > 0 ) {
-			return true;
-		}
-
-		// TODO: determine which cases actually cause this to happen
-		// if the element doesn't have the scroll set, see if it's possible to
-		// set the scroll
-		el[ scroll ] = 1;
-		has = ( el[ scroll ] > 0 );
-		el[ scroll ] = 0;
-		return has;
-	},
-
-	// these are odd functions, fix the API or move into individual plugins
-	isOverAxis: function( x, reference, size ) {
-		//Determines when x coordinate is over "b" element axis
-		return ( x > reference ) && ( x < ( reference + size ) );
-	},
-	isOver: function( y, x, top, left, height, width ) {
-		//Determines when x, y coordinates is over "b" element
-		return $.ui.isOverAxis( y, top, height ) && $.ui.isOverAxis( x, left, width );
-	}
-});
-
-})( jQuery );
-(function( $, undefined ) {
-
-var uuid = 0,
-	slice = Array.prototype.slice,
-	_cleanData = $.cleanData;
-$.cleanData = function( elems ) {
-	for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-		try {
-			$( elem ).triggerHandler( "remove" );
-		// http://bugs.jquery.com/ticket/8235
-		} catch( e ) {}
-	}
-	_cleanData( elems );
-};
-
-$.widget = function( name, base, prototype ) {
-	var fullName, existingConstructor, constructor, basePrototype,
-		namespace = name.split( "." )[ 0 ];
-
-	name = name.split( "." )[ 1 ];
-	fullName = namespace + "-" + name;
-
-	if ( !prototype ) {
-		prototype = base;
-		base = $.Widget;
-	}
-
-	// create selector for plugin
-	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
-		return !!$.data( elem, fullName );
-	};
-
-	$[ namespace ] = $[ namespace ] || {};
-	existingConstructor = $[ namespace ][ name ];
-	constructor = $[ namespace ][ name ] = function( options, element ) {
-		// allow instantiation without "new" keyword
-		if ( !this._createWidget ) {
-			return new constructor( options, element );
-		}
-
-		// allow instantiation without initializing for simple inheritance
-		// must use "new" keyword (the code above always passes args)
-		if ( arguments.length ) {
-			this._createWidget( options, element );
-		}
-	};
-	// extend with the existing constructor to carry over any static properties
-	$.extend( constructor, existingConstructor, {
-		version: prototype.version,
-		// copy the object used to create the prototype in case we need to
-		// redefine the widget later
-		_proto: $.extend( {}, prototype ),
-		// track widgets that inherit from this widget in case this widget is
-		// redefined after a widget inherits from it
-		_childConstructors: []
-	});
-
-	basePrototype = new base();
-	// we need to make the options hash a property directly on the new instance
-	// otherwise we'll modify the options hash on the prototype that we're
-	// inheriting from
-	basePrototype.options = $.widget.extend( {}, basePrototype.options );
-	$.each( prototype, function( prop, value ) {
-		if ( $.isFunction( value ) ) {
-			prototype[ prop ] = (function() {
-				var _super = function() {
-						return base.prototype[ prop ].apply( this, arguments );
-					},
-					_superApply = function( args ) {
-						return base.prototype[ prop ].apply( this, args );
-					};
-				return function() {
-					var __super = this._super,
-						__superApply = this._superApply,
-						returnValue;
-
-					this._super = _super;
-					this._superApply = _superApply;
-
-					returnValue = value.apply( this, arguments );
-
-					this._super = __super;
-					this._superApply = __superApply;
-
-					return returnValue;
-				};
-			})();
-		}
-	});
-	constructor.prototype = $.widget.extend( basePrototype, {
-		// TODO: remove support for widgetEventPrefix
-		// always use the name + a colon as the prefix, e.g., draggable:start
-		// don't prefix for widgets that aren't DOM-based
-		widgetEventPrefix: name
-	}, prototype, {
-		constructor: constructor,
-		namespace: namespace,
-		widgetName: name,
-		// TODO remove widgetBaseClass, see #8155
-		widgetBaseClass: fullName,
-		widgetFullName: fullName
-	});
-
-	// If this widget is being redefined then we need to find all widgets that
-	// are inheriting from it and redefine all of them so that they inherit from
-	// the new version of this widget. We're essentially trying to replace one
-	// level in the prototype chain.
-	if ( existingConstructor ) {
-		$.each( existingConstructor._childConstructors, function( i, child ) {
-			var childPrototype = child.prototype;
-
-			// redefine the child widget using the same prototype that was
-			// originally used, but inherit from the new version of the base
-			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
-		});
-		// remove the list of existing child constructors from the old constructor
-		// so the old child constructors can be garbage collected
-		delete existingConstructor._childConstructors;
-	} else {
-		base._childConstructors.push( constructor );
-	}
-
-	$.widget.bridge( name, constructor );
-};
-
-$.widget.extend = function( target ) {
-	var input = slice.call( arguments, 1 ),
-		inputIndex = 0,
-		inputLength = input.length,
-		key,
-		value;
-	for ( ; inputIndex < inputLength; inputIndex++ ) {
-		for ( key in input[ inputIndex ] ) {
-			value = input[ inputIndex ][ key ];
-			if (input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
-				target[ key ] = $.isPlainObject( value ) ? $.widget.extend( {}, target[ key ], value ) : value;
-			}
-		}
-	}
-	return target;
-};
-
-$.widget.bridge = function( name, object ) {
-	var fullName = object.prototype.widgetFullName;
-	$.fn[ name ] = function( options ) {
-		var isMethodCall = typeof options === "string",
-			args = slice.call( arguments, 1 ),
-			returnValue = this;
-
-		// allow multiple hashes to be passed on init
-		options = !isMethodCall && args.length ?
-			$.widget.extend.apply( null, [ options ].concat(args) ) :
-			options;
-
-		if ( isMethodCall ) {
-			this.each(function() {
-				var methodValue,
-					instance = $.data( this, fullName );
-				if ( !instance ) {
-					return $.error( "cannot call methods on " + name + " prior to initialization; " +
-						"attempted to call method '" + options + "'" );
-				}
-				if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
-					return $.error( "no such method '" + options + "' for " + name + " widget instance" );
-				}
-				methodValue = instance[ options ].apply( instance, args );
-				if ( methodValue !== instance && methodValue !== undefined ) {
-					returnValue = methodValue && methodValue.jquery ?
-						returnValue.pushStack( methodValue.get() ) :
-						methodValue;
-					return false;
-				}
-			});
-		} else {
-			this.each(function() {
-				var instance = $.data( this, fullName );
-				if ( instance ) {
-					instance.option( options || {} )._init();
-				} else {
-					new object( options, this );
-				}
-			});
-		}
-
-		return returnValue;
-	};
-};
-
-$.Widget = function( options, element ) {};
-$.Widget._childConstructors = [];
-
-$.Widget.prototype = {
-	widgetName: "widget",
-	widgetEventPrefix: "",
-	defaultElement: "<div>",
-	options: {
-		disabled: false,
-
-		// callbacks
-		create: null
-	},
-	_createWidget: function( options, element ) {
-		element = $( element || this.defaultElement || this )[ 0 ];
-		this.element = $( element );
-		this.uuid = uuid++;
-		this.eventNamespace = "." + this.widgetName + this.uuid;
-		this.options = $.widget.extend( {},
-			this.options,
-			this._getCreateOptions(),
-			options );
-
-		this.bindings = $();
-		this.hoverable = $();
-		this.focusable = $();
-
-		if ( element !== this ) {
-			// 1.9 BC for #7810
-			// TODO remove dual storage
-			$.data( element, this.widgetName, this );
-			$.data( element, this.widgetFullName, this );
-			this._on({ remove: "destroy" });
-			this.document = $( element.style ?
-				// element within the document
-				element.ownerDocument :
-				// element is window or document
-				element.document || element );
-			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
-		}
-
-		this._create();
-		this._trigger( "create", null, this._getCreateEventData() );
-		this._init();
-	},
-	_getCreateOptions: $.noop,
-	_getCreateEventData: $.noop,
-	_create: $.noop,
-	_init: $.noop,
-
-	destroy: function() {
-		this._destroy();
-		// we can probably remove the unbind calls in 2.0
-		// all event bindings should go through this._on()
-		this.element
-			.unbind( this.eventNamespace )
-			// 1.9 BC for #7810
-			// TODO remove dual storage
-			.removeData( this.widgetName )
-			.removeData( this.widgetFullName )
-			// support: jquery <1.6.3
-			// http://bugs.jquery.com/ticket/9413
-			.removeData( $.camelCase( this.widgetFullName ) );
-		this.widget()
-			.unbind( this.eventNamespace )
-			.removeAttr( "aria-disabled" )
-			.removeClass(
-				this.widgetFullName + "-disabled " +
-				"ui-state-disabled" );
-
-		// clean up events and states
-		this.bindings.unbind( this.eventNamespace );
-		this.hoverable.removeClass( "ui-state-hover" );
-		this.focusable.removeClass( "ui-state-focus" );
-	},
-	_destroy: $.noop,
-
-	widget: function() {
-		return this.element;
-	},
-
-	option: function( key, value ) {
-		var options = key,
-			parts,
-			curOption,
-			i;
-
-		if ( arguments.length === 0 ) {
-			// don't return a reference to the internal hash
-			return $.widget.extend( {}, this.options );
-		}
-
-		if ( typeof key === "string" ) {
-			// handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
-			options = {};
-			parts = key.split( "." );
-			key = parts.shift();
-			if ( parts.length ) {
-				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
-				for ( i = 0; i < parts.length - 1; i++ ) {
-					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
-					curOption = curOption[ parts[ i ] ];
-				}
-				key = parts.pop();
-				if ( value === undefined ) {
-					return curOption[ key ] === undefined ? null : curOption[ key ];
-				}
-				curOption[ key ] = value;
-			} else {
-				if ( value === undefined ) {
-					return this.options[ key ] === undefined ? null : this.options[ key ];
-				}
-				options[ key ] = value;
-			}
-		}
-
-		this._setOptions( options );
-
-		return this;
-	},
-	_setOptions: function( options ) {
-		var key;
-
-		for ( key in options ) {
-			this._setOption( key, options[ key ] );
-		}
-
-		return this;
-	},
-	_setOption: function( key, value ) {
-		this.options[ key ] = value;
-
-		if ( key === "disabled" ) {
-			this.widget()
-				.toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value )
-				.attr( "aria-disabled", value );
-			this.hoverable.removeClass( "ui-state-hover" );
-			this.focusable.removeClass( "ui-state-focus" );
-		}
-
-		return this;
-	},
-
-	enable: function() {
-		return this._setOption( "disabled", false );
-	},
-	disable: function() {
-		return this._setOption( "disabled", true );
-	},
-
-	_on: function( element, handlers ) {
-		// no element argument, shuffle and use this.element
-		if ( !handlers ) {
-			handlers = element;
-			element = this.element;
-		} else {
-			// accept selectors, DOM elements
-			element = $( element );
-			this.bindings = this.bindings.add( element );
-		}
-
-		var instance = this;
-		$.each( handlers, function( event, handler ) {
-			function handlerProxy() {
-				// allow widgets to customize the disabled handling
-				// - disabled as an array instead of boolean
-				// - disabled class as method for disabling individual parts
-				if ( instance.options.disabled === true ||
-						$( this ).hasClass( "ui-state-disabled" ) ) {
-					return;
-				}
-				return ( typeof handler === "string" ? instance[ handler ] : handler )
-					.apply( instance, arguments );
-			}
-
-			// copy the guid so direct unbinding works
-			if ( typeof handler !== "string" ) {
-				handlerProxy.guid = handler.guid =
-					handler.guid || handlerProxy.guid || $.guid++;
-			}
-
-			var match = event.match( /^(\w+)\s*(.*)$/ ),
-				eventName = match[1] + instance.eventNamespace,
-				selector = match[2];
-			if ( selector ) {
-				instance.widget().delegate( selector, eventName, handlerProxy );
-			} else {
-				element.bind( eventName, handlerProxy );
-			}
-		});
-	},
-
-	_off: function( element, eventName ) {
-		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
-		element.unbind( eventName ).undelegate( eventName );
-	},
-
-	_delay: function( handler, delay ) {
-		function handlerProxy() {
-			return ( typeof handler === "string" ? instance[ handler ] : handler )
-				.apply( instance, arguments );
-		}
-		var instance = this;
-		return setTimeout( handlerProxy, delay || 0 );
-	},
-
-	_hoverable: function( element ) {
-		this.hoverable = this.hoverable.add( element );
-		this._on( element, {
-			mouseenter: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-hover" );
-			},
-			mouseleave: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-hover" );
-			}
-		});
-	},
-
-	_focusable: function( element ) {
-		this.focusable = this.focusable.add( element );
-		this._on( element, {
-			focusin: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-focus" );
-			},
-			focusout: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-focus" );
-			}
-		});
-	},
-
-	_trigger: function( type, event, data ) {
-		var prop, orig,
-			callback = this.options[ type ];
-
-		data = data || {};
-		event = $.Event( event );
-		event.type = ( type === this.widgetEventPrefix ?
-			type :
-			this.widgetEventPrefix + type ).toLowerCase();
-		// the original event may come from any element
-		// so we need to reset the target on the new event
-		event.target = this.element[ 0 ];
-
-		// copy original event properties over to the new event
-		orig = event.originalEvent;
-		if ( orig ) {
-			for ( prop in orig ) {
-				if ( !( prop in event ) ) {
-					event[ prop ] = orig[ prop ];
-				}
-			}
-		}
-
-		this.element.trigger( event, data );
-		return !( $.isFunction( callback ) &&
-			callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
-			event.isDefaultPrevented() );
-	}
-};
-
-$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
-	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
-		if ( typeof options === "string" ) {
-			options = { effect: options };
-		}
-		var hasOptions,
-			effectName = !options ?
-				method :
-				options === true || typeof options === "number" ?
-					defaultEffect :
-					options.effect || defaultEffect;
-		options = options || {};
-		if ( typeof options === "number" ) {
-			options = { duration: options };
-		}
-		hasOptions = !$.isEmptyObject( options );
-		options.complete = callback;
-		if ( options.delay ) {
-			element.delay( options.delay );
-		}
-		if ( hasOptions && $.effects && ( $.effects.effect[ effectName ] || $.uiBackCompat !== false && $.effects[ effectName ] ) ) {
-			element[ method ]( options );
-		} else if ( effectName !== method && element[ effectName ] ) {
-			element[ effectName ]( options.duration, options.easing, callback );
-		} else {
-			element.queue(function( next ) {
-				$( this )[ method ]();
-				if ( callback ) {
-					callback.call( element[ 0 ] );
-				}
-				next();
-			});
-		}
-	};
-});
-
-// DEPRECATED
-if ( $.uiBackCompat !== false ) {
-	$.Widget.prototype._getCreateOptions = function() {
-		return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ];
-	};
-}
-
-})( jQuery );
-(function( $, undefined ) {
-
-var mouseHandled = false;
-$( document ).mouseup( function( e ) {
-	mouseHandled = false;
-});
-
-$.widget("ui.mouse", {
-	version: "1.9.0",
-	options: {
-		cancel: 'input,textarea,button,select,option',
-		distance: 1,
-		delay: 0
-	},
-	_mouseInit: function() {
-		var that = this;
-
-		this.element
-			.bind('mousedown.'+this.widgetName, function(event) {
-				return that._mouseDown(event);
-			})
-			.bind('click.'+this.widgetName, function(event) {
-				if (true === $.data(event.target, that.widgetName + '.preventClickEvent')) {
-					$.removeData(event.target, that.widgetName + '.preventClickEvent');
-					event.stopImmediatePropagation();
-					return false;
-				}
-			});
-
-		this.started = false;
-	},
-
-	// TODO: make sure destroying one instance of mouse doesn't mess with
-	// other instances of mouse
-	_mouseDestroy: function() {
-		this.element.unbind('.'+this.widgetName);
-		if ( this._mouseMoveDelegate ) {
-			$(document)
-				.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
-				.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
-		}
-	},
-
-	_mouseDown: function(event) {
-		// don't let more than one widget handle mouseStart
-		if( mouseHandled ) { return; }
-
-		// we may have missed mouseup (out of window)
-		(this._mouseStarted && this._mouseUp(event));
-
-		this._mouseDownEvent = event;
-
-		var that = this,
-			btnIsLeft = (event.which === 1),
-			// event.target.nodeName works around a bug in IE 8 with
-			// disabled inputs (#7620)
-			elIsCancel = (typeof this.options.cancel === "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false);
-		if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
-			return true;
-		}
-
-		this.mouseDelayMet = !this.options.delay;
-		if (!this.mouseDelayMet) {
-			this._mouseDelayTimer = setTimeout(function() {
-				that.mouseDelayMet = true;
-			}, this.options.delay);
-		}
-
-		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
-			this._mouseStarted = (this._mouseStart(event) !== false);
-			if (!this._mouseStarted) {
-				event.preventDefault();
-				return true;
-			}
-		}
-
-		// Click event may never have fired (Gecko & Opera)
-		if (true === $.data(event.target, this.widgetName + '.preventClickEvent')) {
-			$.removeData(event.target, this.widgetName + '.preventClickEvent');
-		}
-
-		// these delegates are required to keep context
-		this._mouseMoveDelegate = function(event) {
-			return that._mouseMove(event);
-		};
-		this._mouseUpDelegate = function(event) {
-			return that._mouseUp(event);
-		};
-		$(document)
-			.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
-			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
-
-		event.preventDefault();
-		
-		mouseHandled = true;
-		return true;
-	},
-
-	_mouseMove: function(event) {
-		// IE mouseup check - mouseup happened when mouse was out of window
-		if ($.browser.msie && !(document.documentMode >= 9) && !event.button) {
-			return this._mouseUp(event);
-		}
-
-		if (this._mouseStarted) {
-			this._mouseDrag(event);
-			return event.preventDefault();
-		}
-
-		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
-			this._mouseStarted =
-				(this._mouseStart(this._mouseDownEvent, event) !== false);
-			(this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
-		}
-
-		return !this._mouseStarted;
-	},
-
-	_mouseUp: function(event) {
-		$(document)
-			.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
-			.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
-
-		if (this._mouseStarted) {
-			this._mouseStarted = false;
-
-			if (event.target === this._mouseDownEvent.target) {
-				$.data(event.target, this.widgetName + '.preventClickEvent', true);
-			}
-
-			this._mouseStop(event);
-		}
-
-		return false;
-	},
-
-	_mouseDistanceMet: function(event) {
-		return (Math.max(
-				Math.abs(this._mouseDownEvent.pageX - event.pageX),
-				Math.abs(this._mouseDownEvent.pageY - event.pageY)
-			) >= this.options.distance
-		);
-	},
-
-	_mouseDelayMet: function(event) {
-		return this.mouseDelayMet;
-	},
-
-	// These are placeholder methods, to be overriden by extending plugin
-	_mouseStart: function(event) {},
-	_mouseDrag: function(event) {},
-	_mouseStop: function(event) {},
-	_mouseCapture: function(event) { return true; }
-});
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.widget("ui.sortable", $.ui.mouse, {
-	version: "1.9.0",
-	widgetEventPrefix: "sort",
-	ready: false,
-	options: {
-		appendTo: "parent",
-		axis: false,
-		connectWith: false,
-		containment: false,
-		cursor: 'auto',
-		cursorAt: false,
-		dropOnEmpty: true,
-		forcePlaceholderSize: false,
-		forceHelperSize: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		items: '> *',
-		opacity: false,
-		placeholder: false,
-		revert: false,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		scope: "default",
-		tolerance: "intersect",
-		zIndex: 1000
-	},
-	_create: function() {
-
-		var o = this.options;
-		this.containerCache = {};
-		this.element.addClass("ui-sortable");
-
-		//Get the items
-		this.refresh();
-
-		//Let's determine if the items are being displayed horizontally
-		this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
-
-		//Let's determine the parent's offset
-		this.offset = this.element.offset();
-
-		//Initialize mouse events for interaction
-		this._mouseInit();
-
-		//We're ready to go
-		this.ready = true
-
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass("ui-sortable ui-sortable-disabled");
-		this._mouseDestroy();
-
-		for ( var i = this.items.length - 1; i >= 0; i-- )
-			this.items[i].item.removeData(this.widgetName + "-item");
-
-		return this;
-	},
-
-	_setOption: function(key, value){
-		if ( key === "disabled" ) {
-			this.options[ key ] = value;
-
-			this.widget().toggleClass( "ui-sortable-disabled", !!value );
-		} else {
-			// Don't call widget base _setOption for disable as it adds ui-state-disabled class
-			$.Widget.prototype._setOption.apply(this, arguments);
-		}
-	},
-
-	_mouseCapture: function(event, overrideHandle) {
-		var that = this;
-
-		if (this.reverting) {
-			return false;
-		}
-
-		if(this.options.disabled || this.options.type == 'static') return false;
-
-		//We have to refresh the items data once first
-		this._refreshItems(event);
-
-		//Find out if the clicked node (or one of its parents) is a actual item in this.items
-		var currentItem = null, nodes = $(event.target).parents().each(function() {
-			if($.data(this, that.widgetName + '-item') == that) {
-				currentItem = $(this);
-				return false;
-			}
-		});
-		if($.data(event.target, that.widgetName + '-item') == that) currentItem = $(event.target);
-
-		if(!currentItem) return false;
-		if(this.options.handle && !overrideHandle) {
-			var validHandle = false;
-
-			$(this.options.handle, currentItem).find("*").andSelf().each(function() { if(this == event.target) validHandle = true; });
-			if(!validHandle) return false;
-		}
-
-		this.currentItem = currentItem;
-		this._removeCurrentsFromItems();
-		return true;
-
-	},
-
-	_mouseStart: function(event, overrideHandle, noActivation) {
-
-		var o = this.options;
-		this.currentContainer = this;
-
-		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
-		this.refreshPositions();
-
-		//Create and append the visible helper
-		this.helper = this._createHelper(event);
-
-		//Cache the helper size
-		this._cacheHelperProportions();
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		//Cache the margins of the original element
-		this._cacheMargins();
-
-		//Get the next scrolling parent
-		this.scrollParent = this.helper.scrollParent();
-
-		//The element's absolute position on the page minus margins
-		this.offset = this.currentItem.offset();
-		this.offset = {
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-
-		$.extend(this.offset, {
-			click: { //Where the click happened, relative to the element
-				left: event.pageX - this.offset.left,
-				top: event.pageY - this.offset.top
-			},
-			parent: this._getParentOffset(),
-			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
-		});
-
-		// Only after we got the offset, we can change the helper's position to absolute
-		// TODO: Still need to figure out a way to make relative sorting possible
-		this.helper.css("position", "absolute");
-		this.cssPosition = this.helper.css("position");
-
-		//Generate the original position
-		this.originalPosition = this._generatePosition(event);
-		this.originalPageX = event.pageX;
-		this.originalPageY = event.pageY;
-
-		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
-		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
-
-		//Cache the former DOM position
-		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
-
-		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
-		if(this.helper[0] != this.currentItem[0]) {
-			this.currentItem.hide();
-		}
-
-		//Create the placeholder
-		this._createPlaceholder();
-
-		//Set a containment if given in the options
-		if(o.containment)
-			this._setContainment();
-
-		if(o.cursor) { // cursor option
-			if ($('body').css("cursor")) this._storedCursor = $('body').css("cursor");
-			$('body').css("cursor", o.cursor);
-		}
-
-		if(o.opacity) { // opacity option
-			if (this.helper.css("opacity")) this._storedOpacity = this.helper.css("opacity");
-			this.helper.css("opacity", o.opacity);
-		}
-
-		if(o.zIndex) { // zIndex option
-			if (this.helper.css("zIndex")) this._storedZIndex = this.helper.css("zIndex");
-			this.helper.css("zIndex", o.zIndex);
-		}
-
-		//Prepare scrolling
-		if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML')
-			this.overflowOffset = this.scrollParent.offset();
-
-		//Call callbacks
-		this._trigger("start", event, this._uiHash());
-
-		//Recache the helper size
-		if(!this._preserveHelperProportions)
-			this._cacheHelperProportions();
-
-
-		//Post 'activate' events to possible containers
-		if(!noActivation) {
-			 for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i]._trigger("activate", event, this._uiHash(this)); }
-		}
-
-		//Prepare possible droppables
-		if($.ui.ddmanager)
-			$.ui.ddmanager.current = this;
-
-		if ($.ui.ddmanager && !o.dropBehaviour)
-			$.ui.ddmanager.prepareOffsets(this, event);
-
-		this.dragging = true;
-
-		this.helper.addClass("ui-sortable-helper");
-		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-		return true;
-
-	},
-
-	_mouseDrag: function(event) {
-
-		//Compute the helpers position
-		this.position = this._generatePosition(event);
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		if (!this.lastPositionAbs) {
-			this.lastPositionAbs = this.positionAbs;
-		}
-
-		//Do scrolling
-		if(this.options.scroll) {
-			var o = this.options, scrolled = false;
-			if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
-
-				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
-					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
-				else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity)
-					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
-
-				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
-					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
-				else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity)
-					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
-
-			} else {
-
-				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
-					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
-					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-
-				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
-					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
-					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-
-			}
-
-			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
-				$.ui.ddmanager.prepareOffsets(this, event);
-		}
-
-		//Regenerate the absolute position used for position checks
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		//Set the helper position
-		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
-		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
-
-		//Rearrange
-		for (var i = this.items.length - 1; i >= 0; i--) {
-
-			//Cache variables and intersection, continue if no intersection
-			var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
-			if (!intersection) continue;
-
-			// Only put the placeholder inside the current Container, skip all
-			// items form other containers. This works because when moving
-			// an item from one container to another the
-			// currentContainer is switched before the placeholder is moved.
-			//
-			// Without this moving items in "sub-sortables" can cause the placeholder to jitter
-			// beetween the outer and inner container.
-			if (item.instance !== this.currentContainer) continue;
-
-			if (itemElement != this.currentItem[0] //cannot intersect with itself
-				&&	this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
-				&&	!$.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
-				&& (this.options.type == 'semi-dynamic' ? !$.contains(this.element[0], itemElement) : true)
-				//&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
-			) {
-
-				this.direction = intersection == 1 ? "down" : "up";
-
-				if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
-					this._rearrange(event, item);
-				} else {
-					break;
-				}
-
-				this._trigger("change", event, this._uiHash());
-				break;
-			}
-		}
-
-		//Post events to containers
-		this._contactContainers(event);
-
-		//Interconnect with droppables
-		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
-
-		//Call callbacks
-		this._trigger('sort', event, this._uiHash());
-
-		this.lastPositionAbs = this.positionAbs;
-		return false;
-
-	},
-
-	_mouseStop: function(event, noPropagation) {
-
-		if(!event) return;
-
-		//If we are using droppables, inform the manager about the drop
-		if ($.ui.ddmanager && !this.options.dropBehaviour)
-			$.ui.ddmanager.drop(this, event);
-
-		if(this.options.revert) {
-			var that = this;
-			var cur = this.placeholder.offset();
-
-			this.reverting = true;
-
-			$(this.helper).animate({
-				left: cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
-				top: cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
-			}, parseInt(this.options.revert, 10) || 500, function() {
-				that._clear(event);
-			});
-		} else {
-			this._clear(event, noPropagation);
-		}
-
-		return false;
-
-	},
-
-	cancel: function() {
-
-		if(this.dragging) {
-
-			this._mouseUp({ target: null });
-
-			if(this.options.helper == "original")
-				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
-			else
-				this.currentItem.show();
-
-			//Post deactivating events to containers
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				this.containers[i]._trigger("deactivate", null, this._uiHash(this));
-				if(this.containers[i].containerCache.over) {
-					this.containers[i]._trigger("out", null, this._uiHash(this));
-					this.containers[i].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		if (this.placeholder) {
-			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-			if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-			if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
-
-			$.extend(this, {
-				helper: null,
-				dragging: false,
-				reverting: false,
-				_noFinalSort: null
-			});
-
-			if(this.domPosition.prev) {
-				$(this.domPosition.prev).after(this.currentItem);
-			} else {
-				$(this.domPosition.parent).prepend(this.currentItem);
-			}
-		}
-
-		return this;
-
-	},
-
-	serialize: function(o) {
-
-		var items = this._getItemsAsjQuery(o && o.connected);
-		var str = []; o = o || {};
-
-		$(items).each(function() {
-			var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-			if(res) str.push((o.key || res[1]+'[]')+'='+(o.key && o.expression ? res[1] : res[2]));
-		});
-
-		if(!str.length && o.key) {
-			str.push(o.key + '=');
-		}
-
-		return str.join('&');
-
-	},
-
-	toArray: function(o) {
-
-		var items = this._getItemsAsjQuery(o && o.connected);
-		var ret = []; o = o || {};
-
-		items.each(function() { ret.push($(o.item || this).attr(o.attribute || 'id') || ''); });
-		return ret;
-
-	},
-
-	/* Be careful with the following core functions */
-	_intersectsWith: function(item) {
-
-		var x1 = this.positionAbs.left,
-			x2 = x1 + this.helperProportions.width,
-			y1 = this.positionAbs.top,
-			y2 = y1 + this.helperProportions.height;
-
-		var l = item.left,
-			r = l + item.width,
-			t = item.top,
-			b = t + item.height;
-
-		var dyClick = this.offset.click.top,
-			dxClick = this.offset.click.left;
-
-		var isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r;
-
-		if(	   this.options.tolerance == "pointer"
-			|| this.options.forcePointerForContainers
-			|| (this.options.tolerance != "pointer" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])
-		) {
-			return isOverElement;
-		} else {
-
-			return (l < x1 + (this.helperProportions.width / 2) // Right Half
-				&& x2 - (this.helperProportions.width / 2) < r // Left Half
-				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
-				&& y2 - (this.helperProportions.height / 2) < b ); // Top Half
-
-		}
-	},
-
-	_intersectsWithPointer: function(item) {
-
-		var isOverElementHeight = (this.options.axis === 'x') || $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
-			isOverElementWidth = (this.options.axis === 'y') || $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
-			isOverElement = isOverElementHeight && isOverElementWidth,
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
-
-		if (!isOverElement)
-			return false;
-
-		return this.floating ?
-			( ((horizontalDirection && horizontalDirection == "right") || verticalDirection == "down") ? 2 : 1 )
-			: ( verticalDirection && (verticalDirection == "down" ? 2 : 1) );
-
-	},
-
-	_intersectsWithSides: function(item) {
-
-		var isOverBottomHalf = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
-			isOverRightHalf = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
-
-		if (this.floating && horizontalDirection) {
-			return ((horizontalDirection == "right" && isOverRightHalf) || (horizontalDirection == "left" && !isOverRightHalf));
-		} else {
-			return verticalDirection && ((verticalDirection == "down" && isOverBottomHalf) || (verticalDirection == "up" && !isOverBottomHalf));
-		}
-
-	},
-
-	_getDragVerticalDirection: function() {
-		var delta = this.positionAbs.top - this.lastPositionAbs.top;
-		return delta != 0 && (delta > 0 ? "down" : "up");
-	},
-
-	_getDragHorizontalDirection: function() {
-		var delta = this.positionAbs.left - this.lastPositionAbs.left;
-		return delta != 0 && (delta > 0 ? "right" : "left");
-	},
-
-	refresh: function(event) {
-		this._refreshItems(event);
-		this.refreshPositions();
-		return this;
-	},
-
-	_connectWith: function() {
-		var options = this.options;
-		return options.connectWith.constructor == String
-			? [options.connectWith]
-			: options.connectWith;
-	},
-
-	_getItemsAsjQuery: function(connected) {
-
-		var items = [];
-		var queries = [];
-		var connectWith = this._connectWith();
-
-		if(connectWith && connected) {
-			for (var i = connectWith.length - 1; i >= 0; i--){
-				var cur = $(connectWith[i]);
-				for (var j = cur.length - 1; j >= 0; j--){
-					var inst = $.data(cur[j], this.widgetName);
-					if(inst && inst != this && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]);
-					}
-				};
-			};
-		}
-
-		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), this]);
-
-		for (var i = queries.length - 1; i >= 0; i--){
-			queries[i][0].each(function() {
-				items.push(this);
-			});
-		};
-
-		return $(items);
-
-	},
-
-	_removeCurrentsFromItems: function() {
-
-		var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
-
-		for (var i=0; i < this.items.length; i++) {
-
-			for (var j=0; j < list.length; j++) {
-				if(list[j] == this.items[i].item[0])
-					this.items.splice(i,1);
-			};
-
-		};
-
-	},
-
-	_refreshItems: function(event) {
-
-		this.items = [];
-		this.containers = [this];
-		var items = this.items;
-		var queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]];
-		var connectWith = this._connectWith();
-
-		if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
-			for (var i = connectWith.length - 1; i >= 0; i--){
-				var cur = $(connectWith[i]);
-				for (var j = cur.length - 1; j >= 0; j--){
-					var inst = $.data(cur[j], this.widgetName);
-					if(inst && inst != this && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
-						this.containers.push(inst);
-					}
-				};
-			};
-		}
-
-		for (var i = queries.length - 1; i >= 0; i--) {
-			var targetData = queries[i][1];
-			var _queries = queries[i][0];
-
-			for (var j=0, queriesLength = _queries.length; j < queriesLength; j++) {
-				var item = $(_queries[j]);
-
-				item.data(this.widgetName + '-item', targetData); // Data for target checking (mouse manager)
-
-				items.push({
-					item: item,
-					instance: targetData,
-					width: 0, height: 0,
-					left: 0, top: 0
-				});
-			};
-		};
-
-	},
-
-	refreshPositions: function(fast) {
-
-		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
-		if(this.offsetParent && this.helper) {
-			this.offset.parent = this._getParentOffset();
-		}
-
-		for (var i = this.items.length - 1; i >= 0; i--){
-			var item = this.items[i];
-
-			//We ignore calculating positions of all connected containers when we're not over them
-			if(item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0])
-				continue;
-
-			var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
-
-			if (!fast) {
-				item.width = t.outerWidth();
-				item.height = t.outerHeight();
-			}
-
-			var p = t.offset();
-			item.left = p.left;
-			item.top = p.top;
-		};
-
-		if(this.options.custom && this.options.custom.refreshContainers) {
-			this.options.custom.refreshContainers.call(this);
-		} else {
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				var p = this.containers[i].element.offset();
-				this.containers[i].containerCache.left = p.left;
-				this.containers[i].containerCache.top = p.top;
-				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
-				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
-			};
-		}
-
-		return this;
-	},
-
-	_createPlaceholder: function(that) {
-		that = that || this;
-		var o = that.options;
-
-		if(!o.placeholder || o.placeholder.constructor == String) {
-			var className = o.placeholder;
-			o.placeholder = {
-				element: function() {
-
-					var el = $(document.createElement(that.currentItem[0].nodeName))
-						.addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
-						.removeClass("ui-sortable-helper")[0];
-
-					if(!className)
-						el.style.visibility = "hidden";
-
-					return el;
-				},
-				update: function(container, p) {
-
-					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
-					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
-					if(className && !o.forcePlaceholderSize) return;
-
-					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
-					if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css('paddingTop')||0, 10) - parseInt(that.currentItem.css('paddingBottom')||0, 10)); };
-					if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css('paddingLeft')||0, 10) - parseInt(that.currentItem.css('paddingRight')||0, 10)); };
-				}
-			};
-		}
-
-		//Create the placeholder
-		that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem));
-
-		//Append it after the actual current item
-		that.currentItem.after(that.placeholder);
-
-		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
-		o.placeholder.update(that, that.placeholder);
-
-	},
-
-	_contactContainers: function(event) {
-
-		// get innermost container that intersects with item
-		var innermostContainer = null, innermostIndex = null;
-
-
-		for (var i = this.containers.length - 1; i >= 0; i--){
-
-			// never consider a container that's located within the item itself
-			if($.contains(this.currentItem[0], this.containers[i].element[0]))
-				continue;
-
-			if(this._intersectsWith(this.containers[i].containerCache)) {
-
-				// if we've already found a container and it's more "inner" than this, then continue
-				if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0]))
-					continue;
-
-				innermostContainer = this.containers[i];
-				innermostIndex = i;
-
-			} else {
-				// container doesn't intersect. trigger "out" event if necessary
-				if(this.containers[i].containerCache.over) {
-					this.containers[i]._trigger("out", event, this._uiHash(this));
-					this.containers[i].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		// if no intersecting containers found, return
-		if(!innermostContainer) return;
-
-		// move the item into the container if it's not there already
-		if(this.containers.length === 1) {
-			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-			this.containers[innermostIndex].containerCache.over = 1;
-		} else if(this.currentContainer != this.containers[innermostIndex]) {
-
-			//When entering a new container, we will find the item with the least distance and append our item near it
-			var dist = 10000; var itemWithLeastDistance = null; var base = this.positionAbs[this.containers[innermostIndex].floating ? 'left' : 'top'];
-			for (var j = this.items.length - 1; j >= 0; j--) {
-				if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) continue;
-				var cur = this.containers[innermostIndex].floating ? this.items[j].item.offset().left : this.items[j].item.offset().top;
-				if(Math.abs(cur - base) < dist) {
-					dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
-					this.direction = (cur - base > 0) ? 'down' : 'up';
-				}
-			}
-
-			if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
-				return;
-
-			this.currentContainer = this.containers[innermostIndex];
-			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
-			this._trigger("change", event, this._uiHash());
-			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
-
-			//Update the placeholder
-			this.options.placeholder.update(this.currentContainer, this.placeholder);
-
-			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-			this.containers[innermostIndex].containerCache.over = 1;
-		}
-
-
-	},
-
-	_createHelper: function(event) {
-
-		var o = this.options;
-		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper == 'clone' ? this.currentItem.clone() : this.currentItem);
-
-		if(!helper.parents('body').length) //Add the helper to the DOM if that didn't happen already
-			$(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
-
-		if(helper[0] == this.currentItem[0])
-			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
-
-		if(helper[0].style.width == '' || o.forceHelperSize) helper.width(this.currentItem.width());
-		if(helper[0].style.height == '' || o.forceHelperSize) helper.height(this.currentItem.height());
-
-		return helper;
-
-	},
-
-	_adjustOffsetFromHelper: function(obj) {
-		if (typeof obj == 'string') {
-			obj = obj.split(' ');
-		}
-		if ($.isArray(obj)) {
-			obj = {left: +obj[0], top: +obj[1] || 0};
-		}
-		if ('left' in obj) {
-			this.offset.click.left = obj.left + this.margins.left;
-		}
-		if ('right' in obj) {
-			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
-		}
-		if ('top' in obj) {
-			this.offset.click.top = obj.top + this.margins.top;
-		}
-		if ('bottom' in obj) {
-			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
-		}
-	},
-
-	_getParentOffset: function() {
-
-
-		//Get the offsetParent and cache its position
-		this.offsetParent = this.helper.offsetParent();
-		var po = this.offsetParent.offset();
-
-		// This is a special case where we need to modify a offset calculated on start, since the following happened:
-		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
-		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
-		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
-			po.left += this.scrollParent.scrollLeft();
-			po.top += this.scrollParent.scrollTop();
-		}
-
-		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
-		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
-			po = { top: 0, left: 0 };
-
-		return {
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
-		};
-
-	},
-
-	_getRelativeOffset: function() {
-
-		if(this.cssPosition == "relative") {
-			var p = this.currentItem.position();
-			return {
-				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
-				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
-			};
-		} else {
-			return { top: 0, left: 0 };
-		}
-
-	},
-
-	_cacheMargins: function() {
-		this.margins = {
-			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
-			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
-		};
-	},
-
-	_cacheHelperProportions: function() {
-		this.helperProportions = {
-			width: this.helper.outerWidth(),
-			height: this.helper.outerHeight()
-		};
-	},
-
-	_setContainment: function() {
-
-		var o = this.options;
-		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
-		if(o.containment == 'document' || o.containment == 'window') this.containment = [
-			0 - this.offset.relative.left - this.offset.parent.left,
-			0 - this.offset.relative.top - this.offset.parent.top,
-			$(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
-			($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
-		];
-
-		if(!(/^(document|window|parent)$/).test(o.containment)) {
-			var ce = $(o.containment)[0];
-			var co = $(o.containment).offset();
-			var over = ($(ce).css("overflow") != 'hidden');
-
-			this.containment = [
-				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
-				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
-				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
-				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
-			];
-		}
-
-	},
-
-	_convertPositionTo: function(d, pos) {
-
-		if(!pos) pos = this.position;
-		var mod = d == "absolute" ? 1 : -1;
-		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
-		return {
-			top: (
-				pos.top																	// The absolute mouse position
-				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
-				- ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
-			),
-			left: (
-				pos.left																// The absolute mouse position
-				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
-				- ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
-			)
-		};
-
-	},
-
-	_generatePosition: function(event) {
-
-		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
-		// This is another very weird special case that only happens for relative elements:
-		// 1. If the css position is relative
-		// 2. and the scroll parent is the document or similar to the offset parent
-		// we have to refresh the relative offset during the scroll so there are no jumps
-		if(this.cssPosition == 'relative' && !(this.scrollParent[0] != document && this.scrollParent[0] != this.offsetParent[0])) {
-			this.offset.relative = this._getRelativeOffset();
-		}
-
-		var pageX = event.pageX;
-		var pageY = event.pageY;
-
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-
-		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
-
-			if(this.containment) {
-				if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
-				if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
-				if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
-				if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
-			}
-
-			if(o.grid) {
-				var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
-				pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-
-				var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
-				pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-			}
-
-		}
-
-		return {
-			top: (
-				pageY																// The absolute mouse position
-				- this.offset.click.top													// Click offset (relative to the element)
-				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
-				+ ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
-			),
-			left: (
-				pageX																// The absolute mouse position
-				- this.offset.click.left												// Click offset (relative to the element)
-				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
-				+ ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
-			)
-		};
-
-	},
-
-	_rearrange: function(event, i, a, hardRefresh) {
-
-		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
-
-		//Various things done here to improve the performance:
-		// 1. we create a setTimeout, that calls refreshPositions
-		// 2. on the instance, we have a counter variable, that get's higher after every append
-		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
-		// 4. this lets only the last addition to the timeout stack through
-		this.counter = this.counter ? ++this.counter : 1;
-		var counter = this.counter;
-
-		this._delay(function() {
-			if(counter == this.counter) this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
-		});
-
-	},
-
-	_clear: function(event, noPropagation) {
-
-		this.reverting = false;
-		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
-		// everything else normalized again
-		var delayedTriggers = [];
-
-		// We first have to update the dom position of the actual currentItem
-		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
-		if(!this._noFinalSort && this.currentItem.parent().length) this.placeholder.before(this.currentItem);
-		this._noFinalSort = null;
-
-		if(this.helper[0] == this.currentItem[0]) {
-			for(var i in this._storedCSS) {
-				if(this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') this._storedCSS[i] = '';
-			}
-			this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
-		} else {
-			this.currentItem.show();
-		}
-
-		if(this.fromOutside && !noPropagation) delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
-		if((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
-
-		// Check if the items Container has Changed and trigger appropriate
-		// events.
-		if (this !== this.currentContainer) {
-			if(!noPropagation) {
-				delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.currentContainer));
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.currentContainer));
-			}
-		}
-
-
-		//Post events to containers
-		for (var i = this.containers.length - 1; i >= 0; i--){
-			if(!noPropagation) delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
-			if(this.containers[i].containerCache.over) {
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
-				this.containers[i].containerCache.over = 0;
-			}
-		}
-
-		//Do what was originally in plugins
-		if(this._storedCursor) $('body').css("cursor", this._storedCursor); //Reset cursor
-		if(this._storedOpacity) this.helper.css("opacity", this._storedOpacity); //Reset opacity
-		if(this._storedZIndex) this.helper.css("zIndex", this._storedZIndex == 'auto' ? '' : this._storedZIndex); //Reset z-index
-
-		this.dragging = false;
-		if(this.cancelHelperRemoval) {
-			if(!noPropagation) {
-				this._trigger("beforeStop", event, this._uiHash());
-				for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
-				this._trigger("stop", event, this._uiHash());
-			}
-
-			this.fromOutside = false;
-			return false;
-		}
-
-		if(!noPropagation) this._trigger("beforeStop", event, this._uiHash());
-
-		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-
-		if(this.helper[0] != this.currentItem[0]) this.helper.remove(); this.helper = null;
-
-		if(!noPropagation) {
-			for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
-			this._trigger("stop", event, this._uiHash());
-		}
-
-		this.fromOutside = false;
-		return true;
-
-	},
-
-	_trigger: function() {
-		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
-			this.cancel();
-		}
-	},
-
-	_uiHash: function(_inst) {
-		var inst = _inst || this;
-		return {
-			helper: inst.helper,
-			placeholder: inst.placeholder || $([]),
-			position: inst.position,
-			originalPosition: inst.originalPosition,
-			offset: inst.positionAbs,
-			item: inst.currentItem,
-			sender: _inst ? _inst.element : null
-		};
-	}
-
-});
-
-})(jQuery);
-(function( $, undefined ) {
-
-var uid = 0,
-	hideProps = {},
-	showProps = {};
-
-hideProps.height = hideProps.paddingTop = hideProps.paddingBottom =
-	hideProps.borderTopWidth = hideProps.borderBottomWidth = "hide";
-showProps.height = showProps.paddingTop = showProps.paddingBottom =
-	showProps.borderTopWidth = showProps.borderBottomWidth = "show";
-
-$.widget( "ui.accordion", {
-	version: "1.9.0",
-	options: {
-		active: 0,
-		animate: {},
-		collapsible: false,
-		event: "click",
-		header: "> li > :first-child,> :not(li):even",
-		heightStyle: "auto",
-		icons: {
-			activeHeader: "ui-icon-triangle-1-s",
-			header: "ui-icon-triangle-1-e"
-		},
-
-		// callbacks
-		activate: null,
-		beforeActivate: null
-	},
-
-	_create: function() {
-		var accordionId = this.accordionId = "ui-accordion-" +
-				(this.element.attr( "id" ) || ++uid),
-			options = this.options;
-
-		this.prevShow = this.prevHide = $();
-		this.element.addClass( "ui-accordion ui-widget ui-helper-reset" );
-
-		this.headers = this.element.find( options.header )
-			.addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" );
-		this._hoverable( this.headers );
-		this._focusable( this.headers );
-
-		this.headers.next()
-			.addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" )
-			.hide();
-
-		// don't allow collapsible: false and active: false
-		if ( !options.collapsible && options.active === false ) {
-			options.active = 0;
-		}
-		// handle negative values
-		if ( options.active < 0 ) {
-			options.active += this.headers.length;
-		}
-		this.active = this._findActive( options.active )
-			.addClass( "ui-accordion-header-active ui-state-active" )
-			.toggleClass( "ui-corner-all ui-corner-top" );
-		this.active.next()
-			.addClass( "ui-accordion-content-active" )
-			.show();
-
-		this._createIcons();
-		this.originalHeight = this.element[0].style.height;
-		this.refresh();
-
-		// ARIA
-		this.element.attr( "role", "tablist" );
-
-		this.headers
-			.attr( "role", "tab" )
-			.each(function( i ) {
-				var header = $( this ),
-					headerId = header.attr( "id" ),
-					panel = header.next(),
-					panelId = panel.attr( "id" );
-				if ( !headerId ) {
-					headerId = accordionId + "-header-" + i;
-					header.attr( "id", headerId );
-				}
-				if ( !panelId ) {
-					panelId = accordionId + "-panel-" + i;
-					panel.attr( "id", panelId );
-				}
-				header.attr( "aria-controls", panelId );
-				panel.attr( "aria-labelledby", headerId );
-			})
-			.next()
-				.attr( "role", "tabpanel" );
-
-		this.headers
-			.not( this.active )
-			.attr({
-				"aria-selected": "false",
-				tabIndex: -1
-			})
-			.next()
-				.attr({
-					"aria-expanded": "false",
-					"aria-hidden": "true"
-				})
-				.hide();
-
-		// make sure at least one header is in the tab order
-		if ( !this.active.length ) {
-			this.headers.eq( 0 ).attr( "tabIndex", 0 );
-		} else {
-			this.active.attr({
-				"aria-selected": "true",
-				tabIndex: 0
-			})
-			.next()
-				.attr({
-					"aria-expanded": "true",
-					"aria-hidden": "false"
-				});
-		}
-
-		this._on( this.headers, { keydown: "_keydown" });
-		this._on( this.headers.next(), { keydown: "_panelKeyDown" });
-		this._setupEvents( options.event );
-	},
-
-	_getCreateEventData: function() {
-		return {
-			header: this.active,
-			content: !this.active.length ? $() : this.active.next()
-		};
-	},
-
-	_createIcons: function() {
-		var icons = this.options.icons;
-		if ( icons ) {
-			$( "<span>" )
-				.addClass( "ui-accordion-header-icon ui-icon " + icons.header )
-				.prependTo( this.headers );
-			this.active.children( ".ui-accordion-header-icon" )
-				.removeClass( icons.header )
-				.addClass( icons.activeHeader );
-			this.headers.addClass( "ui-accordion-icons" );
-		}
-	},
-
-	_destroyIcons: function() {
-		this.headers
-			.removeClass( "ui-accordion-icons" )
-			.children( ".ui-accordion-header-icon" )
-				.remove();
-	},
-
-	_destroy: function() {
-		var contents;
-
-		// clean up main element
-		this.element
-			.removeClass( "ui-accordion ui-widget ui-helper-reset" )
-			.removeAttr( "role" );
-
-		// clean up headers
-		this.headers
-			.removeClass( "ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-selected" )
-			.removeAttr( "aria-controls" )
-			.removeAttr( "tabIndex" )
-			.each(function() {
-				if ( /^ui-accordion/.test( this.id ) ) {
-					this.removeAttribute( "id" );
-				}
-			});
-		this._destroyIcons();
-
-		// clean up content panels
-		contents = this.headers.next()
-			.css( "display", "" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-expanded" )
-			.removeAttr( "aria-hidden" )
-			.removeAttr( "aria-labelledby" )
-			.removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled" )
-			.each(function() {
-				if ( /^ui-accordion/.test( this.id ) ) {
-					this.removeAttribute( "id" );
-				}
-			});
-		if ( this.options.heightStyle !== "content" ) {
-			this.element.css( "height", this.originalHeight );
-			contents.css( "height", "" );
-		}
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "active" ) {
-			// _activate() will handle invalid values and update this.options
-			this._activate( value );
-			return;
-		}
-
-		if ( key === "event" ) {
-			if ( this.options.event ) {
-				this._off( this.headers, this.options.event );
-			}
-			this._setupEvents( value );
-		}
-
-		this._super( key, value );
-
-		// setting collapsible: false while collapsed; open first panel
-		if ( key === "collapsible" && !value && this.options.active === false ) {
-			this._activate( 0 );
-		}
-
-		if ( key === "icons" ) {
-			this._destroyIcons();
-			if ( value ) {
-				this._createIcons();
-			}
-		}
-
-		// #5332 - opacity doesn't cascade to positioned elements in IE
-		// so we need to add the disabled class to the headers and panels
-		if ( key === "disabled" ) {
-			this.headers.add( this.headers.next() )
-				.toggleClass( "ui-state-disabled", !!value );
-		}
-	},
-
-	_keydown: function( event ) {
-		if ( event.altKey || event.ctrlKey ) {
-			return;
-		}
-
-		var keyCode = $.ui.keyCode,
-			length = this.headers.length,
-			currentIndex = this.headers.index( event.target ),
-			toFocus = false;
-
-		switch ( event.keyCode ) {
-			case keyCode.RIGHT:
-			case keyCode.DOWN:
-				toFocus = this.headers[ ( currentIndex + 1 ) % length ];
-				break;
-			case keyCode.LEFT:
-			case keyCode.UP:
-				toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
-				break;
-			case keyCode.SPACE:
-			case keyCode.ENTER:
-				this._eventHandler( event );
-				break;
-			case keyCode.HOME:
-				toFocus = this.headers[ 0 ];
-				break;
-			case keyCode.END:
-				toFocus = this.headers[ length - 1 ];
-				break;
-		}
-
-		if ( toFocus ) {
-			$( event.target ).attr( "tabIndex", -1 );
-			$( toFocus ).attr( "tabIndex", 0 );
-			toFocus.focus();
-			event.preventDefault();
-		}
-	},
-
-	_panelKeyDown : function( event ) {
-		if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) {
-			$( event.currentTarget ).prev().focus();
-		}
-	},
-
-	refresh: function() {
-		var maxHeight, overflow,
-			heightStyle = this.options.heightStyle,
-			parent = this.element.parent();
-
-		this.element.css( "height", this.originalHeight );
-
-		if ( heightStyle === "fill" ) {
-			// IE 6 treats height like minHeight, so we need to turn off overflow
-			// in order to get a reliable height
-			// we use the minHeight support test because we assume that only
-			// browsers that don't support minHeight will treat height as minHeight
-			if ( !$.support.minHeight ) {
-				overflow = parent.css( "overflow" );
-				parent.css( "overflow", "hidden");
-			}
-			maxHeight = parent.height();
-			this.element.siblings( ":visible" ).each(function() {
-				var elem = $( this ),
-					position = elem.css( "position" );
-
-				if ( position === "absolute" || position === "fixed" ) {
-					return;
-				}
-				maxHeight -= elem.outerHeight( true );
-			});
-			if ( overflow ) {
-				parent.css( "overflow", overflow );
-			}
-
-			this.headers.each(function() {
-				maxHeight -= $( this ).outerHeight( true );
-			});
-
-			this.headers.next()
-				.each(function() {
-					$( this ).height( Math.max( 0, maxHeight -
-						$( this ).innerHeight() + $( this ).height() ) );
-				})
-				.css( "overflow", "auto" );
-		} else if ( heightStyle === "auto" ) {
-			maxHeight = 0;
-			this.headers.next()
-				.each(function() {
-					maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
-				})
-				.height( maxHeight );
-		}
-
-		if ( heightStyle !== "content" ) {
-			this.element.height( this.element.height() );
-		}
-	},
-
-	_activate: function( index ) {
-		var active = this._findActive( index )[ 0 ];
-
-		// trying to activate the already active panel
-		if ( active === this.active[ 0 ] ) {
-			return;
-		}
-
-		// trying to collapse, simulate a click on the currently active header
-		active = active || this.active[ 0 ];
-
-		this._eventHandler({
-			target: active,
-			currentTarget: active,
-			preventDefault: $.noop
-		});
-	},
-
-	_findActive: function( selector ) {
-		return typeof selector === "number" ? this.headers.eq( selector ) : $();
-	},
-
-	_setupEvents: function( event ) {
-		var events = {};
-		if ( !event ) {
-			return;
-		}
-		$.each( event.split(" "), function( index, eventName ) {
-			events[ eventName ] = "_eventHandler";
-		});
-		this._on( this.headers, events );
-	},
-
-	_eventHandler: function( event ) {
-		var options = this.options,
-			active = this.active,
-			clicked = $( event.currentTarget ),
-			clickedIsActive = clicked[ 0 ] === active[ 0 ],
-			collapsing = clickedIsActive && options.collapsible,
-			toShow = collapsing ? $() : clicked.next(),
-			toHide = active.next(),
-			eventData = {
-				oldHeader: active,
-				oldPanel: toHide,
-				newHeader: collapsing ? $() : clicked,
-				newPanel: toShow
-			};
-
-		event.preventDefault();
-
-		if (
-				// click on active header, but not collapsible
-				( clickedIsActive && !options.collapsible ) ||
-				// allow canceling activation
-				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
-			return;
-		}
-
-		options.active = collapsing ? false : this.headers.index( clicked );
-
-		// when the call to ._toggle() comes after the class changes
-		// it causes a very odd bug in IE 8 (see #6720)
-		this.active = clickedIsActive ? $() : clicked;
-		this._toggle( eventData );
-
-		// switch classes
-		// corner classes on the previously active header stay after the animation
-		active.removeClass( "ui-accordion-header-active ui-state-active" );
-		if ( options.icons ) {
-			active.children( ".ui-accordion-header-icon" )
-				.removeClass( options.icons.activeHeader )
-				.addClass( options.icons.header );
-		}
-
-		if ( !clickedIsActive ) {
-			clicked
-				.removeClass( "ui-corner-all" )
-				.addClass( "ui-accordion-header-active ui-state-active ui-corner-top" );
-			if ( options.icons ) {
-				clicked.children( ".ui-accordion-header-icon" )
-					.removeClass( options.icons.header )
-					.addClass( options.icons.activeHeader );
-			}
-
-			clicked
-				.next()
-				.addClass( "ui-accordion-content-active" );
-		}
-	},
-
-	_toggle: function( data ) {
-		var toShow = data.newPanel,
-			toHide = this.prevShow.length ? this.prevShow : data.oldPanel;
-
-		// handle activating a panel during the animation for another activation
-		this.prevShow.add( this.prevHide ).stop( true, true );
-		this.prevShow = toShow;
-		this.prevHide = toHide;
-
-		if ( this.options.animate ) {
-			this._animate( toShow, toHide, data );
-		} else {
-			toHide.hide();
-			toShow.show();
-			this._toggleComplete( data );
-		}
-
-		toHide.attr({
-			"aria-expanded": "false",
-			"aria-hidden": "true"
-		});
-		toHide.prev().attr( "aria-selected", "false" );
-		// if we're switching panels, remove the old header from the tab order
-		// if we're opening from collapsed state, remove the previous header from the tab order
-		// if we're collapsing, then keep the collapsing header in the tab order
-		if ( toShow.length && toHide.length ) {
-			toHide.prev().attr( "tabIndex", -1 );
-		} else if ( toShow.length ) {
-			this.headers.filter(function() {
-				return $( this ).attr( "tabIndex" ) === 0;
-			})
-			.attr( "tabIndex", -1 );
-		}
-
-		toShow
-			.attr({
-				"aria-expanded": "true",
-				"aria-hidden": "false"
-			})
-			.prev()
-				.attr({
-					"aria-selected": "true",
-					tabIndex: 0
-				});
-	},
-
-	_animate: function( toShow, toHide, data ) {
-		var total, easing, duration,
-			that = this,
-			adjust = 0,
-			down = toShow.length &&
-				( !toHide.length || ( toShow.index() < toHide.index() ) ),
-			animate = this.options.animate || {},
-			options = down && animate.down || animate,
-			complete = function() {
-				that._toggleComplete( data );
-			};
-
-		if ( typeof options === "number" ) {
-			duration = options;
-		}
-		if ( typeof options === "string" ) {
-			easing = options;
-		}
-		// fall back from options to animation in case of partial down settings
-		easing = easing || options.easing || animate.easing;
-		duration = duration || options.duration || animate.duration;
-
-		if ( !toHide.length ) {
-			return toShow.animate( showProps, duration, easing, complete );
-		}
-		if ( !toShow.length ) {
-			return toHide.animate( hideProps, duration, easing, complete );
-		}
-
-		total = toShow.show().outerHeight();
-		toHide.animate( hideProps, {
-			duration: duration,
-			easing: easing,
-			step: function( now, fx ) {
-				fx.now = Math.round( now );
-			}
-		});
-		toShow
-			.hide()
-			.animate( showProps, {
-				duration: duration,
-				easing: easing,
-				complete: complete,
-				step: function( now, fx ) {
-					fx.now = Math.round( now );
-					if ( fx.prop !== "height" ) {
-						adjust += fx.now;
-					} else if ( that.options.heightStyle !== "content" ) {
-						fx.now = Math.round( total - toHide.outerHeight() - adjust );
-						adjust = 0;
-					}
-				}
-			});
-	},
-
-	_toggleComplete: function( data ) {
-		var toHide = data.oldPanel;
-
-		toHide
-			.removeClass( "ui-accordion-content-active" )
-			.prev()
-				.removeClass( "ui-corner-top" )
-				.addClass( "ui-corner-all" );
-
-		// Work around for rendering bug in IE (#5421)
-		if ( toHide.length ) {
-			toHide.parent()[0].className = toHide.parent()[0].className;
-		}
-
-		this._trigger( "activate", null, data );
-	}
-});
-
-
-
-// DEPRECATED
-if ( $.uiBackCompat !== false ) {
-	// navigation options
-	(function( $, prototype ) {
-		$.extend( prototype.options, {
-			navigation: false,
-			navigationFilter: function() {
-				return this.href.toLowerCase() === location.href.toLowerCase();
-			}
-		});
-
-		var _create = prototype._create;
-		prototype._create = function() {
-			if ( this.options.navigation ) {
-				var that = this,
-					headers = this.element.find( this.options.header ),
-					content = headers.next(),
-					current = headers.add( content )
-						.find( "a" )
-						.filter( this.options.navigationFilter )
-						[ 0 ];
-				if ( current ) {
-					headers.add( content ).each( function( index ) {
-						if ( $.contains( this, current ) ) {
-							that.options.active = Math.floor( index / 2 );
-							return false;
-						}
-					});
-				}
-			}
-			_create.call( this );
-		};
-	}( jQuery, jQuery.ui.accordion.prototype ) );
-
-	// height options
-	(function( $, prototype ) {
-		$.extend( prototype.options, {
-			heightStyle: null, // remove default so we fall back to old values
-			autoHeight: true, // use heightStyle: "auto"
-			clearStyle: false, // use heightStyle: "content"
-			fillSpace: false // use heightStyle: "fill"
-		});
-
-		var _create = prototype._create,
-			_setOption = prototype._setOption;
-
-		$.extend( prototype, {
-			_create: function() {
-				this.options.heightStyle = this.options.heightStyle ||
-					this._mergeHeightStyle();
-
-				_create.call( this );
-			},
-
-			_setOption: function( key, value ) {
-				if ( key === "autoHeight" || key === "clearStyle" || key === "fillSpace" ) {
-					this.options.heightStyle = this._mergeHeightStyle();
-				}
-				_setOption.apply( this, arguments );
-			},
-
-			_mergeHeightStyle: function() {
-				var options = this.options;
-
-				if ( options.fillSpace ) {
-					return "fill";
-				}
-
-				if ( options.clearStyle ) {
-					return "content";
-				}
-
-				if ( options.autoHeight ) {
-					return "auto";
-				}
-			}
-		});
-	}( jQuery, jQuery.ui.accordion.prototype ) );
-
-	// icon options
-	(function( $, prototype ) {
-		$.extend( prototype.options.icons, {
-			activeHeader: null, // remove default so we fall back to old values
-			headerSelected: "ui-icon-triangle-1-s"
-		});
-
-		var _createIcons = prototype._createIcons;
-		prototype._createIcons = function() {
-			if ( this.options.icons ) {
-				this.options.icons.activeHeader = this.options.icons.activeHeader ||
-					this.options.icons.headerSelected;
-			}
-			_createIcons.call( this );
-		};
-	}( jQuery, jQuery.ui.accordion.prototype ) );
-
-	// expanded active option, activate method
-	(function( $, prototype ) {
-		prototype.activate = prototype._activate;
-
-		var _findActive = prototype._findActive;
-		prototype._findActive = function( index ) {
-			if ( index === -1 ) {
-				index = false;
-			}
-			if ( index && typeof index !== "number" ) {
-				index = this.headers.index( this.headers.filter( index ) );
-				if ( index === -1 ) {
-					index = false;
-				}
-			}
-			return _findActive.call( this, index );
-		};
-	}( jQuery, jQuery.ui.accordion.prototype ) );
-
-	// resize method
-	jQuery.ui.accordion.prototype.resize = jQuery.ui.accordion.prototype.refresh;
-
-	// change events
-	(function( $, prototype ) {
-		$.extend( prototype.options, {
-			change: null,
-			changestart: null
-		});
-
-		var _trigger = prototype._trigger;
-		prototype._trigger = function( type, event, data ) {
-			var ret = _trigger.apply( this, arguments );
-			if ( !ret ) {
-				return false;
-			}
-
-			if ( type === "beforeActivate" ) {
-				ret = _trigger.call( this, "changestart", event, {
-					oldHeader: data.oldHeader,
-					oldContent: data.oldPanel,
-					newHeader: data.newHeader,
-					newContent: data.newPanel
-				});
-			} else if ( type === "activate" ) {
-				ret = _trigger.call( this, "change", event, {
-					oldHeader: data.oldHeader,
-					oldContent: data.oldPanel,
-					newHeader: data.newHeader,
-					newContent: data.newPanel
-				});
-			}
-			return ret;
-		};
-	}( jQuery, jQuery.ui.accordion.prototype ) );
-
-	// animated option
-	// NOTE: this only provides support for "slide", "bounceslide", and easings
-	// not the full $.ui.accordion.animations API
-	(function( $, prototype ) {
-		$.extend( prototype.options, {
-			animate: null,
-			animated: "slide"
-		});
-
-		var _create = prototype._create;
-		prototype._create = function() {
-			var options = this.options;
-			if ( options.animate === null ) {
-				if ( !options.animated ) {
-					options.animate = false;
-				} else if ( options.animated === "slide" ) {
-					options.animate = 300;
-				} else if ( options.animated === "bounceslide" ) {
-					options.animate = {
-						duration: 200,
-						down: {
-							easing: "easeOutBounce",
-							duration: 1000
-						}
-					};
-				} else {
-					options.animate = options.animated;
-				}
-			}
-
-			_create.call( this );
-		};
-	}( jQuery, jQuery.ui.accordion.prototype ) );
-}
-
-})( jQuery );
Index: dmin/js/jquery/jquery.constantfooter.js
===================================================================
--- admin/js/jquery/jquery.constantfooter.js	(revision 888)
+++ 	(revision )
@@ -1,151 +1,0 @@
-(function($)
-{
-	// This script was written by Steve Fenton
-	// http://www.stevefenton.co.uk/Content/Jquery-Constant-Footer/
-	// Feel free to use this jQuery Plugin
-	// Version: 3.0.3
-    // Contributions by: 
-	
-	var nextSetIdentifier = 0;
-	var classModifier = "";
-	
-	var feedItems;
-	var feedIndex;
-	var feedDelay = 10;
-	var feedTimer;
-	
-	function CycleFeedList(feedList, i) {
-		feedItems = feedList;
-		feedIndex = i;
-		ShowNextFeedItem();
-	}
-	
-	function ShowNextFeedItem() {
-		//put that feed content on the screen!
-		$("." + classModifier + " .content").fadeOut(1000, function () {
-			$("." + classModifier + " .content").html(feedItems[feedIndex]).fadeIn(1000);
-			PadDocument();
-			feedIndex++;
-			if (feedIndex >= feedItems.length) {
-				feedIndex = 0;
-			}
-			feedTimer = window.setTimeout(ShowNextFeedItem, (feedDelay * 1000));
-		});
-	}
-
-	// Gets rid of CDATA sections
-	function StripCdataEnclosure(string) {
-		if (string.indexOf("<![CDATA[") > -1) {
-			string = string.replace("<![CDATA[", "").replace("]]>", "");
-		}
-		return string;
-	}
-
-	// Add padding to the bottom of the document so it can be scrolled past the footer
-	function PadDocument() {
-		var paddingRequired = $("." + classModifier).height();
-		$("#" + classModifier + "padding").css({ paddingTop: paddingRequired+"px"});
-	}
-	
-	$.fn.constantfooter = function (settings) {
-	
-		var config = {
-			classmodifier: "constantfooter",
-			feed: "",
-			feedlink: "Read more &raquo;",
-			opacity: 0.8,
-			showclose: false,
-			closebutton: "[x]"
-		};
-		
-		if (settings) {
-			$.extend(config, settings);
-		}
-
-		return this.each(function () {
-			
-			classModifier = config.classmodifier;
-			
-			// Make sure opacity is a number between 0.1 and 1
-			var opacity = parseFloat(config.opacity);
-			if (opacity > 1) {
-				opacity = 1;
-			} else if (opacity < 0.1) {
-				opacity = 0.1;
-			}
-			
-			$This = $(this);
-
-			// Add a div used for body padding
-			$This.before("<div id=\"" + config.classmodifier + "padding\">&nbsp;</div>");
-			
-			// Hide it
-			$This.hide().addClass(classModifier).css({ position: "fixed", bottom: "0px", left: "0px", width: "100%" })
-			
-			// If there is a feed, we will replace the footer HTML with the feed
-			if (config.feed.length > 0) {
-				$This.html("");
-			}
-			
-			// Show a close button if required
-			if (config.showclose) {
-				$(this).prepend("<div style=\"float: right;\" class=\"" + classModifier + "close\">" + config.closebutton + "</div>");
-				$("." + classModifier + "close").css({ cursor: "pointer" });
-				$("." + classModifier + "close").click( function () {
-					$(this).parent().fadeOut();
-					window.clearTimeout(feedTimer);
-				});
-			}
-			
-			$This.append("<div class=\"content\"></div>");
-
-			// Show it
-			$This.fadeTo(1000, opacity);
-			
-			// Pad the bottom of the document
-			PadDocument();
-			
-			// Process any feeds
-			if (config.feed.length > 0) {
-		
-				var feedList = new Array();
-				
-				$.get(config.feed, function(xmlDoc) {
-					
-					var itemList = xmlDoc.getElementsByTagName("item");
-					
-					for (var i = 1; i <= itemList.length; i++) {
-					
-						var title = xmlDoc.getElementsByTagName("title")[i].childNodes[0].nodeValue;
-						var link = xmlDoc.getElementsByTagName("link")[i].childNodes[0].nodeValue;
-						var description = xmlDoc.getElementsByTagName("description")[i].childNodes[0].nodeValue;
-					
-						var article = "<div class=\"item\">";
-						
-						if (link != null) {
-							article += "<a href=\"" + link + "\">";
-						}
-						article += "<h2>" + title + "</h2>";
-						if (link != null) {
-							article += "</a>";
-						}
-						
-						article += "<div class=\"description\"><p>" + description + "</p></div>";
-						
-						if (link != null) {
-							article += "<div class=\"link\"><a href=\"" + link + "\">" + config.feedlink + "</a></div>";
-						}
-						
-						article += "</div>";
-			 
-						feedList[feedList.length] = article;
-					}
-					
-					if (feedList.length > 0) {
-						CycleFeedList(feedList, 0);
-					}
-				});
-			}
-		});
-	};
-})(jQuery);
Index: admin/js/jquery/jquery.js
===================================================================
--- admin/js/jquery/jquery.js	(revision 906)
+++ admin/js/jquery/jquery.js	(revision 679)
@@ -1,102 +1,80 @@
 /*!
- * jQuery JavaScript Library v1.8.2
+ * jQuery JavaScript Library v1.4.2
  * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * Includes Sizzle.js
  * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
  *
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: Thu Sep 20 2012 21:13:05 GMT-0400 (Eastern Daylight Time)
+ * Date: Sat Feb 13 22:33:48 2010 -0500
  */
 (function( window, undefined ) {
-var
+
+// Define a local copy of jQuery
+var jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context );
+	},
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$,
+
+	// Use the correct document accordingly with window argument (sandbox)
+	document = window.document,
+
 	// A central reference to the root jQuery(document)
 	rootjQuery,
 
-	// The deferred used on DOM ready
-	readyList,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-	location = window.location,
-	navigator = window.navigator,
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
+	// A simple way to check for HTML strings or ID strings
+	// (both of which we optimize for)
+	quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,
+
+	// Is it a simple selector
+	isSimple = /^.[^:#\[\.,]*$/,
+
+	// Check if a string has a non-whitespace character in it
+	rnotwhite = /\S/,
+
+	// Used for trimming whitespace
+	rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+
+	// Keep a UserAgent string for use with jQuery.browser
+	userAgent = navigator.userAgent,
+
+	// For matching the engine and version of the browser
+	browserMatch,
+	
+	// Has the ready events already been bound?
+	readyBound = false,
+	
+	// The functions to execute on DOM ready
+	readyList = [],
+
+	// The ready event handler
+	DOMContentLoaded,
 
 	// Save a reference to some core methods
-	core_push = Array.prototype.push,
-	core_slice = Array.prototype.slice,
-	core_indexOf = Array.prototype.indexOf,
-	core_toString = Object.prototype.toString,
-	core_hasOwn = Object.prototype.hasOwnProperty,
-	core_trim = String.prototype.trim,
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Used for matching numbers
-	core_pnum = /[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,
-
-	// Used for detecting and trimming whitespace
-	core_rnotwhite = /\S/,
-	core_rspace = /\s+/,
-
-	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	rquickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return ( letter + "" ).toUpperCase();
-	},
-
-	// The ready event handler and self cleanup method
-	DOMContentLoaded = function() {
-		if ( document.addEventListener ) {
-			document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-			jQuery.ready();
-		} else if ( document.readyState === "complete" ) {
-			// we're here because readyState === "complete" in oldIE
-			// which is good enough for us to call the dom ready!
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	},
-
-	// [[Class]] -> type pairs
-	class2type = {};
+	toString = Object.prototype.toString,
+	hasOwnProperty = Object.prototype.hasOwnProperty,
+	push = Array.prototype.push,
+	slice = Array.prototype.slice,
+	indexOf = Array.prototype.indexOf;
 
 jQuery.fn = jQuery.prototype = {
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
+	init: function( selector, context ) {
 		var match, elem, ret, doc;
 
-		// Handle $(""), $(null), $(undefined), $(false)
+		// Handle $(""), $(null), or $(undefined)
 		if ( !selector ) {
 			return this;
@@ -109,38 +87,51 @@
 			return this;
 		}
+		
+		// The body element only exists once, optimize finding it
+		if ( selector === "body" && !context ) {
+			this.context = document;
+			this[0] = document.body;
+			this.selector = "body";
+			this.length = 1;
+			return this;
+		}
 
 		// Handle HTML strings
 		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
+			// Are we dealing with HTML string or an ID?
+			match = quickExpr.exec( selector );
+
+			// Verify a match, and that no context was specified for #id
 			if ( match && (match[1] || !context) ) {
 
 				// HANDLE: $(html) -> $(array)
 				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-					doc = ( context && context.nodeType ? context.ownerDocument || context : document );
-
-					// scripts is true for back-compat
-					selector = jQuery.parseHTML( match[1], doc, true );
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						this.attr.call( selector, context, true );
+					doc = (context ? context.ownerDocument || context : document);
+
+					// If a single string is passed in and it's a single tag
+					// just do a createElement and skip the rest
+					ret = rsingleTag.exec( selector );
+
+					if ( ret ) {
+						if ( jQuery.isPlainObject( context ) ) {
+							selector = [ document.createElement( ret[1] ) ];
+							jQuery.fn.attr.call( selector, context, true );
+
+						} else {
+							selector = [ doc.createElement( ret[1] ) ];
+						}
+
+					} else {
+						ret = buildFragment( [ match[1] ], [ doc ] );
+						selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
 					}
-
+					
 					return jQuery.merge( this, selector );
-
-				// HANDLE: $(#id)
+					
+				// HANDLE: $("#id")
 				} else {
 					elem = document.getElementById( match[2] );
 
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
+					if ( elem ) {
 						// Handle the case where IE and Opera return items
 						// by name instead of ID
@@ -159,12 +150,19 @@
 				}
 
+			// HANDLE: $("TAG")
+			} else if ( !context && /^\w+$/.test( selector ) ) {
+				this.selector = selector;
+				this.context = document;
+				selector = document.getElementsByTagName( selector );
+				return jQuery.merge( this, selector );
+
 			// HANDLE: $(expr, $(...))
 			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
+				return (context || rootjQuery).find( selector );
 
 			// HANDLE: $(expr, context)
 			// (which is just equivalent to: $(context).find(expr)
 			} else {
-				return this.constructor( context ).find( selector );
+				return jQuery( context ).find( selector );
 			}
 
@@ -175,5 +173,5 @@
 		}
 
-		if ( selector.selector !== undefined ) {
+		if (selector.selector !== undefined) {
 			this.selector = selector.selector;
 			this.context = selector.context;
@@ -187,5 +185,5 @@
 
 	// The current version of jQuery being used
-	jquery: "1.8.2",
+	jquery: "1.4.2",
 
 	// The default length of a jQuery object is 0
@@ -198,5 +196,5 @@
 
 	toArray: function() {
-		return core_slice.call( this );
+		return slice.call( this, 0 );
 	},
 
@@ -210,5 +208,5 @@
 
 			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
+			( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
 	},
 
@@ -216,7 +214,13 @@
 	// (returning the new matched element set)
 	pushStack: function( elems, name, selector ) {
-
 		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
+		var ret = jQuery();
+
+		if ( jQuery.isArray( elems ) ) {
+			push.apply( ret, elems );
+		
+		} else {
+			jQuery.merge( ret, elems );
+		}
 
 		// Add the old object onto the stack (as a reference)
@@ -226,5 +230,5 @@
 
 		if ( name === "find" ) {
-			ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
+			ret.selector = this.selector + (this.selector ? " " : "") + selector;
 		} else if ( name ) {
 			ret.selector = this.selector + "." + name + "(" + selector + ")";
@@ -241,17 +245,27 @@
 		return jQuery.each( this, callback, args );
 	},
-
+	
 	ready: function( fn ) {
-		// Add the callback
-		jQuery.ready.promise().done( fn );
+		// Attach the listeners
+		jQuery.bindReady();
+
+		// If the DOM is already ready
+		if ( jQuery.isReady ) {
+			// Execute the function immediately
+			fn.call( document, jQuery );
+
+		// Otherwise, remember the function for later
+		} else if ( readyList ) {
+			// Add the function to the wait list
+			readyList.push( fn );
+		}
 
 		return this;
 	},
-
+	
 	eq: function( i ) {
-		i = +i;
 		return i === -1 ?
 			this.slice( i ) :
-			this.slice( i, i + 1 );
+			this.slice( i, +i + 1 );
 	},
 
@@ -265,6 +279,6 @@
 
 	slice: function() {
-		return this.pushStack( core_slice.apply( this, arguments ),
-			"slice", core_slice.call(arguments).join(",") );
+		return this.pushStack( slice.apply( this, arguments ),
+			"slice", slice.call(arguments).join(",") );
 	},
 
@@ -274,12 +288,12 @@
 		}));
 	},
-
+	
 	end: function() {
-		return this.prevObject || this.constructor(null);
+		return this.prevObject || jQuery(null);
 	},
 
 	// For internal use only.
 	// Behaves like an Array's method, not like a jQuery method.
-	push: core_push,
+	push: push,
 	sort: [].sort,
 	splice: [].splice
@@ -290,9 +304,6 @@
 
 jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
+	// copy reference to target object
+	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy;
 
 	// Handle a deep copy situation
@@ -328,13 +339,8 @@
 				}
 
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
+				// Recurse if we're merging object literal values or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) {
+					var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src
+						: jQuery.isArray(copy) ? [] : {};
 
 					// Never move original objects, clone them
@@ -355,9 +361,7 @@
 jQuery.extend({
 	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
+		window.$ = _$;
+
+		if ( deep ) {
 			window.jQuery = _jQuery;
 		}
@@ -365,48 +369,80 @@
 		return jQuery;
 	},
-
+	
 	// Is the DOM ready to be used? Set to true once it occurs.
 	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
+	
 	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
+	ready: function() {
+		// Make sure that the DOM is not already loaded
+		if ( !jQuery.isReady ) {
+			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+			if ( !document.body ) {
+				return setTimeout( jQuery.ready, 13 );
+			}
+
+			// Remember that the DOM is ready
+			jQuery.isReady = true;
+
+			// If there are functions bound, to execute
+			if ( readyList ) {
+				// Execute all of them
+				var fn, i = 0;
+				while ( (fn = readyList[ i++ ]) ) {
+					fn.call( document, jQuery );
+				}
+
+				// Reset the list of functions
+				readyList = null;
+			}
+
+			// Trigger any bound ready events
+			if ( jQuery.fn.triggerHandler ) {
+				jQuery( document ).triggerHandler( "ready" );
+			}
+		}
+	},
+	
+	bindReady: function() {
+		if ( readyBound ) {
 			return;
 		}
 
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready, 1 );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
+		readyBound = true;
+
+		// Catch cases where $(document).ready() is called after the
+		// browser event has already occurred.
+		if ( document.readyState === "complete" ) {
+			return jQuery.ready();
+		}
+
+		// Mozilla, Opera and webkit nightlies currently support this event
+		if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+			
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", jQuery.ready, false );
+
+		// If IE event model is used
+		} else if ( document.attachEvent ) {
+			// ensure firing before onload,
+			// maybe late but safe also for iframes
+			document.attachEvent("onreadystatechange", DOMContentLoaded);
+			
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", jQuery.ready );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var toplevel = false;
+
+			try {
+				toplevel = window.frameElement == null;
+			} catch(e) {}
+
+			if ( document.documentElement.doScroll && toplevel ) {
+				doScrollCheck();
+			}
 		}
 	},
@@ -416,23 +452,9 @@
 	// aren't supported. They return false on IE (#2968).
 	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		return obj == null ?
-			String( obj ) :
-			class2type[ core_toString.call(obj) ] || "object";
+		return toString.call(obj) === "[object Function]";
+	},
+
+	isArray: function( obj ) {
+		return toString.call(obj) === "[object Array]";
 	},
 
@@ -441,67 +463,37 @@
 		// Because of IE, we also have to check the presence of the constructor property.
 		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+		if ( !obj || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) {
 			return false;
 		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!core_hasOwn.call(obj, "constructor") &&
-				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
+		
+		// Not own constructor property must be Object
+		if ( obj.constructor
+			&& !hasOwnProperty.call(obj, "constructor")
+			&& !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
 			return false;
 		}
-
+		
 		// Own properties are enumerated firstly, so to speed up,
 		// if last one is own, then all properties are own.
-
+	
 		var key;
 		for ( key in obj ) {}
-
-		return key === undefined || core_hasOwn.call( obj, key );
+		
+		return key === undefined || hasOwnProperty.call( obj, key );
 	},
 
 	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
+		for ( var name in obj ) {
 			return false;
 		}
 		return true;
 	},
-
+	
 	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	// data: string of html
-	// context (optional): If specified, the fragment will be created in this context, defaults to document
-	// scripts (optional): If true, will include scripts passed in the html string
-	parseHTML: function( data, context, scripts ) {
-		var parsed;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		if ( typeof context === "boolean" ) {
-			scripts = context;
-			context = 0;
-		}
-		context = context || document;
-
-		// Single tag
-		if ( (parsed = rsingleTag.exec( data )) ) {
-			return [ context.createElement( parsed[1] ) ];
-		}
-
-		parsed = jQuery.buildFragment( [ data ], context, scripts ? null : [] );
-		return jQuery.merge( [],
-			(parsed.cacheable ? jQuery.clone( parsed.fragment ) : parsed.fragment).childNodes );
-	},
-
+		throw msg;
+	},
+	
 	parseJSON: function( data ) {
-		if ( !data || typeof data !== "string") {
+		if ( typeof data !== "string" || !data ) {
 			return null;
 		}
@@ -509,83 +501,60 @@
 		// Make sure leading/trailing whitespace is removed (IE can't handle it)
 		data = jQuery.trim( data );
-
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
+		
 		// Make sure the incoming data is actual JSON
 		// Logic borrowed from http://json.org/json2.js
-		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-			.replace( rvalidtokens, "]" )
-			.replace( rvalidbraces, "")) ) {
-
-			return ( new Function( "return " + data ) )();
-
-		}
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
+		if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
+			.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
+			.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
+
+			// Try to use the native JSON parser first
+			return window.JSON && window.JSON.parse ?
+				window.JSON.parse( data ) :
+				(new Function("return " + data))();
+
+		} else {
+			jQuery.error( "Invalid JSON: " + data );
+		}
 	},
 
 	noop: function() {},
 
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+	// Evalulates a script in a global context
 	globalEval: function( data ) {
-		if ( data && core_rnotwhite.test( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+		if ( data && rnotwhite.test(data) ) {
+			// Inspired by code by Andrea Giammarchi
+			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
+			var head = document.getElementsByTagName("head")[0] || document.documentElement,
+				script = document.createElement("script");
+
+			script.type = "text/javascript";
+
+			if ( jQuery.support.scriptEval ) {
+				script.appendChild( document.createTextNode( data ) );
+			} else {
+				script.text = data;
+			}
+
+			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709).
+			head.insertBefore( script, head.firstChild );
+			head.removeChild( script );
+		}
 	},
 
 	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
 	},
 
 	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var name,
-			i = 0,
-			length = obj.length,
-			isObj = length === undefined || jQuery.isFunction( obj );
+	each: function( object, callback, args ) {
+		var name, i = 0,
+			length = object.length,
+			isObj = length === undefined || jQuery.isFunction(object);
 
 		if ( args ) {
 			if ( isObj ) {
-				for ( name in obj ) {
-					if ( callback.apply( obj[ name ], args ) === false ) {
+				for ( name in object ) {
+					if ( callback.apply( object[ name ], args ) === false ) {
 						break;
 					}
@@ -593,5 +562,5 @@
 			} else {
 				for ( ; i < length; ) {
-					if ( callback.apply( obj[ i++ ], args ) === false ) {
+					if ( callback.apply( object[ i++ ], args ) === false ) {
 						break;
 					}
@@ -602,50 +571,34 @@
 		} else {
 			if ( isObj ) {
-				for ( name in obj ) {
-					if ( callback.call( obj[ name ], name, obj[ name ] ) === false ) {
+				for ( name in object ) {
+					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
 						break;
 					}
 				}
 			} else {
-				for ( ; i < length; ) {
-					if ( callback.call( obj[ i ], i, obj[ i++ ] ) === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-		function( text ) {
-			return text == null ?
-				"" :
-				core_trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				( text + "" ).replace( rtrim, "" );
-		},
+				for ( var value = object[0];
+					i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
+			}
+		}
+
+		return object;
+	},
+
+	trim: function( text ) {
+		return (text || "").replace( rtrim, "" );
+	},
 
 	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var type,
-			ret = results || [];
-
-		if ( arr != null ) {
+	makeArray: function( array, results ) {
+		var ret = results || [];
+
+		if ( array != null ) {
 			// The window, strings (and functions) also have 'length'
-			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
-			type = jQuery.type( arr );
-
-			if ( arr.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( arr ) ) {
-				core_push.call( ret, arr );
+			// The extra typeof function check is to prevent crashes
+			// in Safari 2 (See: #3039)
+			if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) {
+				push.call( ret, array );
 			} else {
-				jQuery.merge( ret, arr );
+				jQuery.merge( ret, array );
 			}
 		}
@@ -654,20 +607,12 @@
 	},
 
-	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( core_indexOf ) {
-				return core_indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
+	inArray: function( elem, array ) {
+		if ( array.indexOf ) {
+			return array.indexOf( elem );
+		}
+
+		for ( var i = 0, length = array.length; i < length; i++ ) {
+			if ( array[ i ] === elem ) {
+				return i;
 			}
 		}
@@ -677,13 +622,11 @@
 
 	merge: function( first, second ) {
-		var l = second.length,
-			i = first.length,
-			j = 0;
-
-		if ( typeof l === "number" ) {
-			for ( ; j < l; j++ ) {
+		var i = first.length, j = 0;
+
+		if ( typeof second.length === "number" ) {
+			for ( var l = second.length; j < l; j++ ) {
 				first[ i++ ] = second[ j ];
 			}
-
+		
 		} else {
 			while ( second[j] !== undefined ) {
@@ -698,15 +641,10 @@
 
 	grep: function( elems, callback, inv ) {
-		var retVal,
-			ret = [],
-			i = 0,
-			length = elems.length;
-		inv = !!inv;
+		var ret = [];
 
 		// Go through the array, only saving the items
 		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			if ( !inv !== !callback( elems[ i ], i ) ) {
 				ret.push( elems[ i ] );
 			}
@@ -718,33 +656,16 @@
 	// arg is for internal usage only
 	map: function( elems, callback, arg ) {
-		var value, key,
-			ret = [],
-			i = 0,
-			length = elems.length,
-			// jquery objects are treated as arrays
-			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
+		var ret = [], value;
 
 		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( key in elems ) {
-				value = callback( elems[ key ], key, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
+		// new value (or values).
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			value = callback( elems[ i ], i, arg );
+
+			if ( value != null ) {
+				ret[ ret.length ] = value;
+			}
+		}
+
 		return ret.concat.apply( [], ret );
 	},
@@ -753,526 +674,176 @@
 	guid: 1,
 
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var tmp, args, proxy;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = core_slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context, args.concat( core_slice.call( arguments ) ) );
-		};
+	proxy: function( fn, proxy, thisObject ) {
+		if ( arguments.length === 2 ) {
+			if ( typeof proxy === "string" ) {
+				thisObject = fn;
+				fn = thisObject[ proxy ];
+				proxy = undefined;
+
+			} else if ( proxy && !jQuery.isFunction( proxy ) ) {
+				thisObject = proxy;
+				proxy = undefined;
+			}
+		}
+
+		if ( !proxy && fn ) {
+			proxy = function() {
+				return fn.apply( thisObject || this, arguments );
+			};
+		}
 
 		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
+		if ( fn ) {
+			proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+		}
+
+		// So proxy can be declared as an argument
 		return proxy;
 	},
 
-	// Multifunctional method to get and set values of a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, pass ) {
-		var exec,
-			bulk = key == null,
-			i = 0,
-			length = elems.length;
-
-		// Sets many values
-		if ( key && typeof key === "object" ) {
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], 1, emptyGet, value );
-			}
-			chainable = 1;
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			// Optionally, function values get executed if exec is true
-			exec = pass === undefined && jQuery.isFunction( value );
-
-			if ( bulk ) {
-				// Bulk operations only iterate when executing function values
-				if ( exec ) {
-					exec = fn;
-					fn = function( elem, key, value ) {
-						return exec.call( jQuery( elem ), value );
-					};
-
-				// Otherwise they run against the entire set
-				} else {
-					fn.call( elems, value );
-					fn = null;
-				}
-			}
-
-			if ( fn ) {
-				for (; i < length; i++ ) {
-					fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
-				}
-			}
-
-			chainable = 1;
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
-	now: function() {
-		return ( new Date() ).getTime();
-	}
+	// Use of jQuery.browser is frowned upon.
+	// More details: http://docs.jquery.com/Utilities/jQuery.browser
+	uaMatch: function( ua ) {
+		ua = ua.toLowerCase();
+
+		var match = /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+			/(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) ||
+			/(msie) ([\w.]+)/.exec( ua ) ||
+			!/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) ||
+		  	[];
+
+		return { browser: match[1] || "", version: match[2] || "0" };
+	},
+
+	browser: {}
 });
 
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready, 1 );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", DOMContentLoaded );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
+browserMatch = jQuery.uaMatch( userAgent );
+if ( browserMatch.browser ) {
+	jQuery.browser[ browserMatch.browser ] = true;
+	jQuery.browser.version = browserMatch.version;
+}
+
+// Deprecated, use jQuery.browser.webkit instead
+if ( jQuery.browser.webkit ) {
+	jQuery.browser.safari = true;
+}
+
+if ( indexOf ) {
+	jQuery.inArray = function( elem, array ) {
+		return indexOf.call( array, elem );
+	};
+}
 
 // All jQuery objects should point back to these
 rootjQuery = jQuery(document);
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.split( core_rspace ), function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
+
+// Cleanup functions for the document ready method
+if ( document.addEventListener ) {
+	DOMContentLoaded = function() {
+		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+		jQuery.ready();
+	};
+
+} else if ( document.attachEvent ) {
+	DOMContentLoaded = function() {
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( document.readyState === "complete" ) {
+			document.detachEvent( "onreadystatechange", DOMContentLoaded );
+			jQuery.ready();
+		}
+	};
 }
 
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// Flag to know if list is currently firing
-		firing,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" && ( !options.unique || !self.has( arg ) ) ) {
-								list.push( arg );
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Control if a given callback is in the list
-			has: function( fn ) {
-				return jQuery.inArray( fn, list ) > -1;
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				args = args || [];
-				args = [ context, args.slice ? args.slice() : args ];
-				if ( list && ( !fired || stack ) ) {
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var action = tuple[ 0 ],
-								fn = fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ]( jQuery.isFunction( fn ) ?
-								function() {
-									var returned = fn.apply( this, arguments );
-									if ( returned && jQuery.isFunction( returned.promise ) ) {
-										returned.promise()
-											.done( newDefer.resolve )
-											.fail( newDefer.reject )
-											.progress( newDefer.notify );
-									} else {
-										newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] );
-									}
-								} :
-								newDefer[ action ]
-							);
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ] = list.fire
-			deferred[ tuple[0] ] = list.fire;
-			deferred[ tuple[0] + "With" ] = list.fireWith;
+// The DOM ready check for Internet Explorer
+function doScrollCheck() {
+	if ( jQuery.isReady ) {
+		return;
+	}
+
+	try {
+		// If IE is used, use the trick by Diego Perini
+		// http://javascript.nwbox.com/IEContentLoaded/
+		document.documentElement.doScroll("left");
+	} catch( error ) {
+		setTimeout( doScrollCheck, 1 );
+		return;
+	}
+
+	// and execute any waiting functions
+	jQuery.ready();
+}
+
+function evalScript( i, elem ) {
+	if ( elem.src ) {
+		jQuery.ajax({
+			url: elem.src,
+			async: false,
+			dataType: "script"
 		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = core_slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-					if( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-jQuery.support = (function() {
-
-	var support,
-		all,
-		a,
-		select,
-		opt,
-		input,
-		fragment,
-		eventName,
-		i,
-		isSupported,
-		clickFn,
-		div = document.createElement("div");
-
-	// Preliminary tests
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-
-	all = div.getElementsByTagName("*");
-	a = div.getElementsByTagName("a")[ 0 ];
-	a.style.cssText = "top:1px;float:left;opacity:.5";
+	} else {
+		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+	}
+
+	if ( elem.parentNode ) {
+		elem.parentNode.removeChild( elem );
+	}
+}
+
+// Mutifunctional method to get and set values to a collection
+// The value/s can be optionally by executed if its a function
+function access( elems, key, value, exec, fn, pass ) {
+	var length = elems.length;
+	
+	// Setting many attributes
+	if ( typeof key === "object" ) {
+		for ( var k in key ) {
+			access( elems, k, key[k], exec, fn, value );
+		}
+		return elems;
+	}
+	
+	// Setting one attribute
+	if ( value !== undefined ) {
+		// Optionally, function values get executed if exec is true
+		exec = !pass && exec && jQuery.isFunction(value);
+		
+		for ( var i = 0; i < length; i++ ) {
+			fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+		}
+		
+		return elems;
+	}
+	
+	// Getting an attribute
+	return length ? fn( elems[0], key ) : undefined;
+}
+
+function now() {
+	return (new Date).getTime();
+}
+(function() {
+
+	jQuery.support = {};
+
+	var root = document.documentElement,
+		script = document.createElement("script"),
+		div = document.createElement("div"),
+		id = "script" + now();
+
+	div.style.display = "none";
+	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+
+	var all = div.getElementsByTagName("*"),
+		a = div.getElementsByTagName("a")[0];
 
 	// Can't get basic test support
-	if ( !all || !all.length ) {
-		return {};
-	}
-
-	// First batch of supports tests
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
-
-	support = {
+	if ( !all || !all.length || !a ) {
+		return;
+	}
+
+	jQuery.support = {
 		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
+		leadingWhitespace: div.firstChild.nodeType === 3,
 
 		// Make sure that tbody elements aren't automatically inserted
@@ -1285,15 +856,15 @@
 
 		// Get the style information from getAttribute
-		// (IE uses .cssText instead)
-		style: /top/.test( a.getAttribute("style") ),
+		// (IE uses .cssText insted)
+		style: /red/.test( a.getAttribute("style") ),
 
 		// Make sure that URLs aren't manipulated
 		// (IE normalizes it by default)
-		hrefNormalized: ( a.getAttribute("href") === "/a" ),
+		hrefNormalized: a.getAttribute("href") === "/a",
 
 		// Make sure that element opacity exists
 		// (IE uses filter instead)
 		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.5/.test( a.style.opacity ),
+		opacity: /^0.55$/.test( a.style.opacity ),
 
 		// Verify style float existence
@@ -1304,220 +875,119 @@
 		// that it defaults to "on".
 		// (WebKit defaults to "" instead)
-		checkOn: ( input.value === "on" ),
+		checkOn: div.getElementsByTagName("input")[0].value === "on",
 
 		// Make sure that a selected-by-default option has a working selected property.
 		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: opt.selected,
-
-		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-		getSetAttribute: div.className !== "t",
-
-		// Tests for enctype support on a form(#6743)
-		enctype: !!document.createElement("form").enctype,
-
-		// Makes sure cloning an html5 element does not cause problems
-		// Where outerHTML is undefined, this still works
-		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
-
-		// jQuery.support.boxModel DEPRECATED in 1.8 since we don't support Quirks Mode
-		boxModel: ( document.compatMode === "CSS1Compat" ),
+		optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected,
+
+		parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null,
 
 		// Will be defined later
-		submitBubbles: true,
-		changeBubbles: true,
-		focusinBubbles: false,
 		deleteExpando: true,
+		checkClone: false,
+		scriptEval: false,
 		noCloneEvent: true,
-		inlineBlockNeedsLayout: false,
-		shrinkWrapBlocks: false,
-		reliableMarginRight: true,
-		boxSizingReliable: true,
-		pixelPosition: false
+		boxModel: null
 	};
 
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
+	script.type = "text/javascript";
+	try {
+		script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
+	} catch(e) {}
+
+	root.insertBefore( script, root.firstChild );
+
+	// Make sure that the execution of code works by injecting a script
+	// tag with appendChild/createTextNode
+	// (IE doesn't support this, fails, and uses .text instead)
+	if ( window[ id ] ) {
+		jQuery.support.scriptEval = true;
+		delete window[ id ];
+	}
 
 	// Test to see if it's possible to delete an expando from an element
 	// Fails in Internet Explorer
 	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
-		div.attachEvent( "onclick", clickFn = function() {
+		delete script.test;
+	
+	} catch(e) {
+		jQuery.support.deleteExpando = false;
+	}
+
+	root.removeChild( script );
+
+	if ( div.attachEvent && div.fireEvent ) {
+		div.attachEvent("onclick", function click() {
 			// Cloning a node shouldn't copy over any
 			// bound event handlers (IE does this)
-			support.noCloneEvent = false;
+			jQuery.support.noCloneEvent = false;
+			div.detachEvent("onclick", click);
 		});
-		div.cloneNode( true ).fireEvent("onclick");
-		div.detachEvent( "onclick", clickFn );
-	}
-
-	// Check if a radio maintains its value
-	// after being appended to the DOM
-	input = document.createElement("input");
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-
-	input.setAttribute( "checked", "checked" );
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( div.lastChild );
+		div.cloneNode(true).fireEvent("onclick");
+	}
+
+	div = document.createElement("div");
+	div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
+
+	var fragment = document.createDocumentFragment();
+	fragment.appendChild( div.firstChild );
 
 	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	fragment.removeChild( input );
-	fragment.appendChild( div );
+	jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
+
+	// Figure out if the W3C box model works as expected
+	// document.body must exist before we can do this
+	jQuery(function() {
+		var div = document.createElement("div");
+		div.style.width = div.style.paddingLeft = "1px";
+
+		document.body.appendChild( div );
+		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
+		document.body.removeChild( div ).style.display = 'none';
+
+		div = null;
+	});
 
 	// Technique from Juriy Zaytsev
-	// http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
-	// We only care about the case where non-standard event systems
-	// are used, namely in IE. Short-circuiting here helps us to
-	// avoid an eval call (in setAttribute) which can cause CSP
-	// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
-	if ( div.attachEvent ) {
-		for ( i in {
-			submit: true,
-			change: true,
-			focusin: true
-		}) {
-			eventName = "on" + i;
-			isSupported = ( eventName in div );
-			if ( !isSupported ) {
-				div.setAttribute( eventName, "return;" );
-				isSupported = ( typeof div[ eventName ] === "function" );
-			}
-			support[ i + "Bubbles" ] = isSupported;
-		}
-	}
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, div, tds, marginDiv,
-			divReset = "padding:0;margin:0;border:0;display:block;overflow:hidden;",
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
-
-		container = document.createElement("div");
-		container.style.cssText = "visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px";
-		body.insertBefore( container, body.firstChild );
-
-		// Construct the test element
-		div = document.createElement("div");
-		container.appendChild( div );
-
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		// (only IE 8 fails this test)
-		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-		tds = div.getElementsByTagName("td");
-		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Check if empty table cells still have offsetWidth/Height
-		// (IE <= 8 fail this test)
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check box-sizing and margin behavior
-		div.innerHTML = "";
-		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
-		support.boxSizing = ( div.offsetWidth === 4 );
-		support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 );
-
-		// NOTE: To any future maintainer, we've window.getComputedStyle
-		// because jsdom on node.js will break without it.
-		if ( window.getComputedStyle ) {
-			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. For more
-			// info see bug #3333
-			// Fails in WebKit before Feb 2011 nightlies
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			marginDiv = document.createElement("div");
-			marginDiv.style.cssText = div.style.cssText = divReset;
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-			div.appendChild( marginDiv );
-			support.reliableMarginRight =
-				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
-		}
-
-		if ( typeof div.style.zoom !== "undefined" ) {
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			// (IE < 8 does this)
-			div.innerHTML = "";
-			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
-			// Check if elements with layout shrink-wrap their children
-			// (IE 6 does this)
-			div.style.display = "block";
-			div.style.overflow = "visible";
-			div.innerHTML = "<div></div>";
-			div.firstChild.style.width = "5px";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
-
-			container.style.zoom = 1;
-		}
-
-		// Null elements to avoid leaks in IE
-		body.removeChild( container );
-		container = div = tds = marginDiv = null;
-	});
-
-	// Null elements to avoid leaks in IE
-	fragment.removeChild( div );
-	all = a = select = opt = input = fragment = div = null;
-
-	return support;
+	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
+	var eventSupported = function( eventName ) { 
+		var el = document.createElement("div"); 
+		eventName = "on" + eventName; 
+
+		var isSupported = (eventName in el); 
+		if ( !isSupported ) { 
+			el.setAttribute(eventName, "return;"); 
+			isSupported = typeof el[eventName] === "function"; 
+		} 
+		el = null; 
+
+		return isSupported; 
+	};
+	
+	jQuery.support.submitBubbles = eventSupported("submit");
+	jQuery.support.changeBubbles = eventSupported("change");
+
+	// release memory in IE
+	root = script = div = all = a = null;
 })();
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
-	rmultiDash = /([A-Z])/g;
+
+jQuery.props = {
+	"for": "htmlFor",
+	"class": "className",
+	readonly: "readOnly",
+	maxlength: "maxLength",
+	cellspacing: "cellSpacing",
+	rowspan: "rowSpan",
+	colspan: "colSpan",
+	tabindex: "tabIndex",
+	usemap: "useMap",
+	frameborder: "frameBorder"
+};
+var expando = "jQuery" + now(), uuid = 0, windowData = {};
 
 jQuery.extend({
 	cache: {},
-
-	deletedIds: [],
-
-	// Remove at next major release (1.9/2.0)
-	uuid: 0,
-
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
+	
+	expando:expando,
 
 	// The following elements throw uncatchable exceptions if you
@@ -1525,199 +995,84 @@
 	noData: {
 		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
+		"object": true,
 		"applet": true
 	},
 
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
-		if ( !jQuery.acceptData( elem ) ) {
+	data: function( elem, name, data ) {
+		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
 			return;
 		}
 
-		var thisCache, ret,
-			internalKey = jQuery.expando,
-			getByName = typeof name === "string",
-
-			// We have to handle DOM nodes and JS objects differently because IE6-7
-			// can't GC object references properly across the DOM-JS boundary
-			isNode = elem.nodeType,
-
-			// Only DOM nodes need the global jQuery cache; JS object data is
-			// attached directly to the object so GC can occur automatically
-			cache = isNode ? jQuery.cache : elem,
-
-			// Only defining an ID for JS objects if its cache already exists allows
-			// the code to shortcut on the same path as a DOM node with no cache
-			id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-		// Avoid doing any more work than we need to when trying to get data on an
-		// object that has no data at all
-		if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) {
+		elem = elem == window ?
+			windowData :
+			elem;
+
+		var id = elem[ expando ], cache = jQuery.cache, thisCache;
+
+		if ( !id && typeof name === "string" && data === undefined ) {
+			return null;
+		}
+
+		// Compute a unique ID for the element
+		if ( !id ) { 
+			id = ++uuid;
+		}
+
+		// Avoid generating a new cache unless none exists and we
+		// want to manipulate it.
+		if ( typeof name === "object" ) {
+			elem[ expando ] = id;
+			thisCache = cache[ id ] = jQuery.extend(true, {}, name);
+
+		} else if ( !cache[ id ] ) {
+			elem[ expando ] = id;
+			cache[ id ] = {};
+		}
+
+		thisCache = cache[ id ];
+
+		// Prevent overriding the named cache with undefined values
+		if ( data !== undefined ) {
+			thisCache[ name ] = data;
+		}
+
+		return typeof name === "string" ? thisCache[ name ] : thisCache;
+	},
+
+	removeData: function( elem, name ) {
+		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
 			return;
 		}
 
-		if ( !id ) {
-			// Only DOM nodes need a new unique ID for each element since their data
-			// ends up in the global cache
-			if ( isNode ) {
-				elem[ internalKey ] = id = jQuery.deletedIds.pop() || jQuery.guid++;
-			} else {
-				id = internalKey;
-			}
-		}
-
-		if ( !cache[ id ] ) {
-			cache[ id ] = {};
-
-			// Avoids exposing jQuery metadata on plain JS objects when the object
-			// is serialized using JSON.stringify
-			if ( !isNode ) {
-				cache[ id ].toJSON = jQuery.noop;
-			}
-		}
-
-		// An object can be passed to jQuery.data instead of a key/value pair; this gets
-		// shallow copied over onto the existing cache
-		if ( typeof name === "object" || typeof name === "function" ) {
-			if ( pvt ) {
-				cache[ id ] = jQuery.extend( cache[ id ], name );
-			} else {
-				cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-			}
-		}
-
-		thisCache = cache[ id ];
-
-		// jQuery data() is stored in a separate object inside the object's internal data
-		// cache in order to avoid key collisions between internal data and user-defined
-		// data.
-		if ( !pvt ) {
-			if ( !thisCache.data ) {
-				thisCache.data = {};
-			}
-
-			thisCache = thisCache.data;
-		}
-
-		if ( data !== undefined ) {
-			thisCache[ jQuery.camelCase( name ) ] = data;
-		}
-
-		// Check for both converted-to-camel and non-converted data property names
-		// If a data property was specified
-		if ( getByName ) {
-
-			// First Try to find as-is property data
-			ret = thisCache[ name ];
-
-			// Test for null|undefined property data
-			if ( ret == null ) {
-
-				// Try to find the camelCased property
-				ret = thisCache[ jQuery.camelCase( name ) ];
-			}
+		elem = elem == window ?
+			windowData :
+			elem;
+
+		var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
+
+		// If we want to remove a specific section of the element's data
+		if ( name ) {
+			if ( thisCache ) {
+				// Remove the section of cache data
+				delete thisCache[ name ];
+
+				// If we've removed all the data, remove the element's cache
+				if ( jQuery.isEmptyObject(thisCache) ) {
+					jQuery.removeData( elem );
+				}
+			}
+
+		// Otherwise, we want to remove all of the element's data
 		} else {
-			ret = thisCache;
-		}
-
-		return ret;
-	},
-
-	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
-
-		var thisCache, i, l,
-
-			isNode = elem.nodeType,
-
-			// See jQuery.data for more information
-			cache = isNode ? jQuery.cache : elem,
-			id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-		// If there is already no cache entry for this object, there is no
-		// purpose in continuing
-		if ( !cache[ id ] ) {
-			return;
-		}
-
-		if ( name ) {
-
-			thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-			if ( thisCache ) {
-
-				// Support array or space separated string names for data keys
-				if ( !jQuery.isArray( name ) ) {
-
-					// try the string as a key before any manipulation
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-
-						// split the camel cased version by spaces unless a key with the spaces exists
-						name = jQuery.camelCase( name );
-						if ( name in thisCache ) {
-							name = [ name ];
-						} else {
-							name = name.split(" ");
-						}
-					}
-				}
-
-				for ( i = 0, l = name.length; i < l; i++ ) {
-					delete thisCache[ name[i] ];
-				}
-
-				// If there is no data left in the cache, we want to continue
-				// and let the cache object itself get destroyed
-				if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
-					return;
-				}
-			}
-		}
-
-		// See jQuery.data for more information
-		if ( !pvt ) {
-			delete cache[ id ].data;
-
-			// Don't destroy the parent cache unless the internal data object
-			// had been the only thing left in it
-			if ( !isEmptyDataObject( cache[ id ] ) ) {
-				return;
-			}
-		}
-
-		// Destroy the cache
-		if ( isNode ) {
-			jQuery.cleanData( [ elem ], true );
-
-		// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-		} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
+			if ( jQuery.support.deleteExpando ) {
+				delete elem[ jQuery.expando ];
+
+			} else if ( elem.removeAttribute ) {
+				elem.removeAttribute( jQuery.expando );
+			}
+
+			// Completely remove the data cache
 			delete cache[ id ];
-
-		// When all else fails, null
-		} else {
-			cache[ id ] = null;
-		}
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return jQuery.data( elem, name, data, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-		// nodes accept data unless otherwise specified; rejection can be conditional
-		return !noData || noData !== true && elem.getAttribute("classid") === noData;
+		}
 	}
 });
@@ -1725,34 +1080,8 @@
 jQuery.fn.extend({
 	data: function( key, value ) {
-		var parts, part, attr, name, l,
-			elem = this[0],
-			i = 0,
-			data = null;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attr = elem.attributes;
-					for ( l = attr.length; i < l; i++ ) {
-						name = attr[i].name;
-
-						if ( !name.indexOf( "data-" ) ) {
-							name = jQuery.camelCase( name.substring(5) );
-
-							dataAttr( elem, name, data[ name ] );
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
+		if ( typeof key === "undefined" && this.length ) {
+			return jQuery.data( this[0] );
+
+		} else if ( typeof key === "object" ) {
 			return this.each(function() {
 				jQuery.data( this, key );
@@ -1760,33 +1089,21 @@
 		}
 
-		parts = key.split( ".", 2 );
+		var parts = key.split(".");
 		parts[1] = parts[1] ? "." + parts[1] : "";
-		part = parts[1] + "!";
-
-		return jQuery.access( this, function( value ) {
-
-			if ( value === undefined ) {
-				data = this.triggerHandler( "getData" + part, [ parts[0] ] );
-
-				// Try to fetch any internally stored data first
-				if ( data === undefined && elem ) {
-					data = jQuery.data( elem, key );
-					data = dataAttr( elem, key, data );
-				}
-
-				return data === undefined && parts[1] ?
-					this.data( parts[0] ) :
-					data;
-			}
-
-			parts[1] = value;
-			this.each(function() {
-				var self = jQuery( this );
-
-				self.triggerHandler( "setData" + part, parts );
+
+		if ( value === undefined ) {
+			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+			if ( data === undefined && this.length ) {
+				data = jQuery.data( this[0], key );
+			}
+			return data === undefined && parts[1] ?
+				this.data( parts[0] ) :
+				data;
+		} else {
+			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
 				jQuery.data( this, key, value );
-				self.triggerHandler( "changeData" + part, parts );
 			});
-		}, null, value, arguments.length > 1, null, false );
+		}
 	},
 
@@ -1797,70 +1114,26 @@
 	}
 });
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-				data === "false" ? false :
-				data === "null" ? null :
-				// Only convert to a number if it doesn't change the string
-				+data + "" === data ? +data :
-				rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
 jQuery.extend({
 	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
+		if ( !elem ) {
+			return;
+		}
+
+		type = (type || "fx") + "queue";
+		var q = jQuery.data( elem, type );
+
+		// Speed up dequeue by getting out quickly if this is just a lookup
+		if ( !data ) {
+			return q || [];
+		}
+
+		if ( !q || jQuery.isArray(data) ) {
+			q = jQuery.data( elem, type, jQuery.makeArray(data) );
+
+		} else {
+			q.push( data );
+		}
+
+		return q;
 	},
 
@@ -1868,45 +1141,22 @@
 		type = type || "fx";
 
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
+		var queue = jQuery.queue( elem, type ), fn = queue.shift();
 
 		// If the fx queue is dequeued, always remove the progress sentinel
 		if ( fn === "inprogress" ) {
 			fn = queue.shift();
-			startLength--;
 		}
 
 		if ( fn ) {
-
 			// Add a progress sentinel to prevent the fx queue from being
 			// automatically dequeued
 			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				jQuery.removeData( elem, type + "queue", true );
-				jQuery.removeData( elem, key, true );
-			})
-		});
+				queue.unshift("inprogress");
+			}
+
+			fn.call(elem, function() {
+				jQuery.dequeue(elem, type);
+			});
+		}
 	}
 });
@@ -1914,28 +1164,19 @@
 jQuery.fn.extend({
 	queue: function( type, data ) {
-		var setter = 2;
-
 		if ( typeof type !== "string" ) {
 			data = type;
 			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
+		}
+
+		if ( data === undefined ) {
 			return jQuery.queue( this[0], type );
 		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
+		return this.each(function( i, elem ) {
+			var queue = jQuery.queue( this, type, data );
+
+			if ( type === "fx" && queue[0] !== "inprogress" ) {
+				jQuery.dequeue( this, type );
+			}
+		});
 	},
 	dequeue: function( type ) {
@@ -1944,112 +1185,69 @@
 		});
 	},
+
 	// Based off of the plugin by Clint Helfers, with permission.
 	// http://blindsignals.com/index.php/2009/07/jquery-delay/
 	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
 		type = type || "fx";
 
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
+		return this.queue( type, function() {
+			var elem = this;
+			setTimeout(function() {
+				jQuery.dequeue( elem, type );
+			}, time );
 		});
 	},
+
 	clearQueue: function( type ) {
 		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
 	}
 });
-var nodeHook, boolHook, fixSpecified,
-	rclass = /[\t\r\n]/g,
+var rclass = /[\n\t]/g,
+	rspace = /\s+/,
 	rreturn = /\r/g,
-	rtype = /^(?:button|input)$/i,
-	rfocusable = /^(?:button|input|object|select|textarea)$/i,
-	rclickable = /^a(?:rea|)$/i,
-	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute;
+	rspecialurl = /href|src|style/,
+	rtype = /(button|input)/i,
+	rfocusable = /(button|input|object|select|textarea)/i,
+	rclickable = /^(a|area)$/i,
+	rradiocheck = /radio|checkbox/;
 
 jQuery.fn.extend({
 	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
+		return access( this, name, value, true, jQuery.attr );
+	},
+
+	removeAttr: function( name, fn ) {
+		return this.each(function(){
+			jQuery.attr( this, name, "" );
+			if ( this.nodeType === 1 ) {
+				this.removeAttribute( name );
+			}
 		});
 	},
 
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
 	addClass: function( value ) {
-		var classNames, i, l, elem,
-			setClass, c, cl;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call(this, j, this.className) );
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.addClass( value.call(this, i, self.attr("class")) );
 			});
 		}
 
 		if ( value && typeof value === "string" ) {
-			classNames = value.split( core_rspace );
-
-			for ( i = 0, l = this.length; i < l; i++ ) {
-				elem = this[ i ];
+			var classNames = (value || "").split( rspace );
+
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var elem = this[i];
 
 				if ( elem.nodeType === 1 ) {
-					if ( !elem.className && classNames.length === 1 ) {
+					if ( !elem.className ) {
 						elem.className = value;
 
 					} else {
-						setClass = " " + elem.className + " ";
-
-						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
-							if ( setClass.indexOf( " " + classNames[ c ] + " " ) < 0 ) {
-								setClass += classNames[ c ] + " ";
+						var className = " " + elem.className + " ", setClass = elem.className;
+						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
+								setClass += " " + classNames[c];
 							}
 						}
@@ -2064,42 +1262,42 @@
 
 	removeClass: function( value ) {
-		var removes, className, elem, c, cl, i, l;
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.removeClass( value.call(this, i, self.attr("class")) );
+			});
+		}
+
+		if ( (value && typeof value === "string") || value === undefined ) {
+			var classNames = (value || "").split(rspace);
+
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var elem = this[i];
+
+				if ( elem.nodeType === 1 && elem.className ) {
+					if ( value ) {
+						var className = (" " + elem.className + " ").replace(rclass, " ");
+						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+							className = className.replace(" " + classNames[c] + " ", " ");
+						}
+						elem.className = jQuery.trim( className );
+
+					} else {
+						elem.className = "";
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value, isBool = typeof stateVal === "boolean";
 
 		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call(this, j, this.className) );
-			});
-		}
-		if ( (value && typeof value === "string") || value === undefined ) {
-			removes = ( value || "" ).split( core_rspace );
-
-			for ( i = 0, l = this.length; i < l; i++ ) {
-				elem = this[ i ];
-				if ( elem.nodeType === 1 && elem.className ) {
-
-					className = (" " + elem.className + " ").replace( rclass, " " );
-
-					// loop over each item in the removal list
-					for ( c = 0, cl = removes.length; c < cl; c++ ) {
-						// Remove until there is nothing to remove,
-						while ( className.indexOf(" " + removes[ c ] + " ") >= 0 ) {
-							className = className.replace( " " + removes[ c ] + " " , " " );
-						}
-					}
-					elem.className = value ? jQuery.trim( className ) : "";
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
 			});
 		}
@@ -2108,12 +1306,10 @@
 			if ( type === "string" ) {
 				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
+				var className, i = 0, self = jQuery(this),
 					state = stateVal,
-					classNames = value.split( core_rspace );
+					classNames = value.split( rspace );
 
 				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
+					// check each className given, space seperated list
 					state = isBool ? state : !self.hasClass( className );
 					self[ state ? "addClass" : "removeClass" ]( className );
@@ -2123,9 +1319,9 @@
 				if ( this.className ) {
 					// store className if set
-					jQuery._data( this, "__className__", this.className );
+					jQuery.data( this, "__className__", this.className );
 				}
 
 				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+				this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
 			}
 		});
@@ -2133,9 +1329,7 @@
 
 	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
+		var className = " " + selector + " ";
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
 				return true;
 			}
@@ -2146,32 +1340,63 @@
 
 	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
+		if ( value === undefined ) {
+			var elem = this[0];
+
 			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val,
-				self = jQuery(this);
+				if ( jQuery.nodeName( elem, "option" ) ) {
+					return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+				}
+
+				// We need to handle select boxes special
+				if ( jQuery.nodeName( elem, "select" ) ) {
+					var index = elem.selectedIndex,
+						values = [],
+						options = elem.options,
+						one = elem.type === "select-one";
+
+					// Nothing was selected
+					if ( index < 0 ) {
+						return null;
+					}
+
+					// Loop through all the selected options
+					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+						var option = options[ i ];
+
+						if ( option.selected ) {
+							// Get the specifc value for the option
+							value = jQuery(option).val();
+
+							// We don't need an array for one selects
+							if ( one ) {
+								return value;
+							}
+
+							// Multi-Selects return an array
+							values.push( value );
+						}
+					}
+
+					return values;
+				}
+
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
+					return elem.getAttribute("value") === null ? "on" : elem.value;
+				}
+				
+
+				// Everything else, we just grab the value
+				return (elem.value || "").replace(rreturn, "");
+
+			}
+
+			return undefined;
+		}
+
+		var isFunction = jQuery.isFunction(value);
+
+		return this.each(function(i) {
+			var self = jQuery(this), val = value;
 
 			if ( this.nodeType !== 1 ) {
@@ -2180,547 +1405,241 @@
 
 			if ( isFunction ) {
-				val = value.call( this, i, self.val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
+				val = value.call(this, i, self.val());
+			}
+
+			// Typecast each time if the value is a Function and the appended
+			// value is therefore different each time.
+			if ( typeof val === "number" ) {
 				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// attributes.value is undefined in Blackberry 4.7 but
-				// uses .value. See #6932
-				var val = elem.attributes.value;
-				return !val || val.specified ? elem.value : elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, i, max, option,
-					index = elem.selectedIndex,
-					values = [],
-					options = elem.options,
-					one = elem.type === "select-one";
-
-				// Nothing was selected
-				if ( index < 0 ) {
-					return null;
-				}
-
-				// Loop through all the selected options
-				i = one ? index : 0;
-				max = one ? index + 1 : options.length;
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// Don't return options that are disabled or in a disabled optgroup
-					if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
-							(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
-				if ( one && !values.length && options.length ) {
-					return jQuery( options[ index ] ).val();
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var values = jQuery.makeArray( value );
-
-				jQuery(elem).find("option").each(function() {
+			}
+
+			if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
+				this.checked = jQuery.inArray( self.val(), val ) >= 0;
+
+			} else if ( jQuery.nodeName( this, "select" ) ) {
+				var values = jQuery.makeArray(val);
+
+				jQuery( "option", this ).each(function() {
 					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
 				});
 
 				if ( !values.length ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	},
-
-	// Unused in 1.8, left in so attrFn-stabbers won't die; remove in 1.9
-	attrFn: {},
-
+					this.selectedIndex = -1;
+				}
+
+			} else {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	attrFn: {
+		val: true,
+		css: true,
+		html: true,
+		text: true,
+		data: true,
+		width: true,
+		height: true,
+		offset: true
+	},
+		
 	attr: function( elem, name, value, pass ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		if ( pass && jQuery.isFunction( jQuery.fn[ name ] ) ) {
-			return jQuery( elem )[ name ]( value );
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === "undefined" ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( notxml ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-				return;
-
-			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-
-			ret = elem.getAttribute( name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret === null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var propName, attrNames, name, isBool,
-			i = 0;
-
-		if ( value && elem.nodeType === 1 ) {
-
-			attrNames = value.split( core_rspace );
-
-			for ( ; i < attrNames.length; i++ ) {
-				name = attrNames[ i ];
-
-				if ( name ) {
-					propName = jQuery.propFix[ name ] || name;
-					isBool = rboolean.test( name );
-
-					// See #9699 for explanation of this approach (setting first, then removal)
-					// Do not do this for boolean attributes (see #10870)
-					if ( !isBool ) {
-						jQuery.attr( elem, name, "" );
+		// don't set attributes on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return undefined;
+		}
+
+		if ( pass && name in jQuery.attrFn ) {
+			return jQuery(elem)[name](value);
+		}
+
+		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
+			// Whether we are setting (or getting)
+			set = value !== undefined;
+
+		// Try to normalize/fix the name
+		name = notxml && jQuery.props[ name ] || name;
+
+		// Only do all the following if this is a node (faster for style)
+		if ( elem.nodeType === 1 ) {
+			// These attributes require special treatment
+			var special = rspecialurl.test( name );
+
+			// Safari mis-reports the default selected property of an option
+			// Accessing the parent's selectedIndex property fixes it
+			if ( name === "selected" && !jQuery.support.optSelected ) {
+				var parent = elem.parentNode;
+				if ( parent ) {
+					parent.selectedIndex;
+	
+					// Make sure that it also works with optgroups, see #5701
+					if ( parent.parentNode ) {
+						parent.parentNode.selectedIndex;
 					}
-					elem.removeAttribute( getSetAttribute ? name : propName );
-
-					// Set corresponding property to false for boolean attributes
-					if ( isBool && propName in elem ) {
-						elem[ propName ] = false;
+				}
+			}
+
+			// If applicable, access the attribute via the DOM 0 way
+			if ( name in elem && notxml && !special ) {
+				if ( set ) {
+					// We can't allow the type property to be changed (since it causes problems in IE)
+					if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
+						jQuery.error( "type property can't be changed" );
 					}
-				}
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				// We can't allow the type property to be changed (since it causes problems in IE)
-				if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
-					jQuery.error( "type property can't be changed" );
-				} else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to it's default in case type is set after value
-					// This is for element creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		},
-		// Use the value property for back compat
-		// Use the nodeHook for button elements in IE6/7 (#1954)
-		value: {
-			get: function( elem, name ) {
-				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
-					return nodeHook.get( elem, name );
-				}
-				return name in elem ?
-					elem.value :
-					null;
-			},
-			set: function( elem, value, name ) {
-				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
-					return nodeHook.set( elem, value, name );
-				}
-				// Does not return so that setAttribute is also used
-				elem.value = value;
-			}
-		}
-	},
-
-	propFix: {
-		tabindex: "tabIndex",
-		readonly: "readOnly",
-		"for": "htmlFor",
-		"class": "className",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing",
-		cellpadding: "cellPadding",
-		rowspan: "rowSpan",
-		colspan: "colSpan",
-		usemap: "useMap",
-		frameborder: "frameBorder",
-		contenteditable: "contentEditable"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				return ( elem[ name ] = value );
-			}
-
-		} else {
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-				return ret;
-
-			} else {
-				return elem[ name ];
-			}
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
+
+					elem[ name ] = value;
+				}
+
+				// browsers index elements by id/name on forms, give priority to attributes.
+				if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
+					return elem.getAttributeNode( name ).nodeValue;
+				}
+
 				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
 				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				var attributeNode = elem.getAttributeNode("tabindex");
-
-				return attributeNode && attributeNode.specified ?
-					parseInt( attributeNode.value, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						undefined;
-			}
-		}
+				if ( name === "tabIndex" ) {
+					var attributeNode = elem.getAttributeNode( "tabIndex" );
+
+					return attributeNode && attributeNode.specified ?
+						attributeNode.value :
+						rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+							0 :
+							undefined;
+				}
+
+				return elem[ name ];
+			}
+
+			if ( !jQuery.support.style && notxml && name === "style" ) {
+				if ( set ) {
+					elem.style.cssText = "" + value;
+				}
+
+				return elem.style.cssText;
+			}
+
+			if ( set ) {
+				// convert the value to a string (all browsers do this but IE) see #1070
+				elem.setAttribute( name, "" + value );
+			}
+
+			var attr = !jQuery.support.hrefNormalized && notxml && special ?
+					// Some attributes require a special call on IE
+					elem.getAttribute( name, 2 ) :
+					elem.getAttribute( name );
+
+			// Non-existent attributes return null, we normalize to undefined
+			return attr === null ? undefined : attr;
+		}
+
+		// elem is actually elem.style ... set the style
+		// Using attr for specific style information is now deprecated. Use style instead.
+		return jQuery.style( elem, name, value );
 	}
 });
-
-// Hook for boolean attributes
-boolHook = {
-	get: function( elem, name ) {
-		// Align boolean attributes with corresponding properties
-		// Fall back to attribute presence where some booleans are not supported
-		var attrNode,
-			property = jQuery.prop( elem, name );
-		return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
-			name.toLowerCase() :
-			undefined;
-	},
-	set: function( elem, value, name ) {
-		var propName;
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else {
-			// value is true since we know at this point it's type boolean and not false
-			// Set boolean attributes to the same name and set the DOM property
-			propName = jQuery.propFix[ name ] || name;
-			if ( propName in elem ) {
-				// Only set the IDL specifically if it already exists on the element
-				elem[ propName ] = true;
-			}
-
-			elem.setAttribute( name, name.toLowerCase() );
-		}
-		return name;
-	}
-};
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	fixSpecified = {
-		name: true,
-		id: true,
-		coords: true
+var rnamespaces = /\.(.*)$/,
+	fcleanup = function( nm ) {
+		return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
+			return "\\" + ch;
+		});
 	};
 
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret;
-			ret = elem.getAttributeNode( name );
-			return ret && ( fixSpecified[ name ] ? ret.value !== "" : ret.specified ) ?
-				ret.value :
-				undefined;
-		},
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				ret = document.createAttribute( name );
-				elem.setAttributeNode( ret );
-			}
-			return ( ret.value = value + "" );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		});
-	});
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		get: nodeHook.get,
-		set: function( elem, value, name ) {
-			if ( value === "" ) {
-				value = "false";
-			}
-			nodeHook.set( elem, value, name );
-		}
-	};
-}
-
-
-// Some attributes require a special call on IE
-if ( !jQuery.support.hrefNormalized ) {
-	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			get: function( elem ) {
-				var ret = elem.getAttribute( name, 2 );
-				return ret === null ? undefined : ret;
-			}
-		});
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Normalize to lowercase since IE uppercases css property names
-			return elem.style.cssText.toLowerCase() || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	});
-}
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-if ( !jQuery.support.checkOn ) {
-	jQuery.each([ "radio", "checkbox" ], function() {
-		jQuery.valHooks[ this ] = {
-			get: function( elem ) {
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				return elem.getAttribute("value") === null ? "on" : elem.value;
-			}
-		};
-	});
-}
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	});
-});
-var rformElems = /^(?:textarea|input|select)$/i,
-	rtypenamespace = /^([^\.]*|)(?:\.(.+)|)$/,
-	rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	hoverHack = function( events ) {
-		return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
-	};
-
 /*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code originated from
+ * Dean Edwards' addEvent library.
  */
 jQuery.event = {
 
-	add: function( elem, types, handler, data, selector ) {
-
-		var elemData, eventHandle, events,
-			t, tns, type, namespaces, handleObj,
-			handleObjIn, handlers, special;
-
-		// Don't attach events to noData or text/comment nodes (allow plain objects tho)
-		if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) {
+	// Bind an event to an element
+	// Original by Dean Edwards
+	add: function( elem, types, handler, data ) {
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
 			return;
 		}
 
-		// Caller can pass in an object of custom data in lieu of the handler
+		// For whatever reason, IE has trouble passing the window object
+		// around, causing it to be cloned in the process
+		if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) {
+			elem = window;
+		}
+
+		var handleObjIn, handleObj;
+
 		if ( handler.handler ) {
 			handleObjIn = handler;
 			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
+		}
+
+		// Make sure that the function being executed has a unique ID
 		if ( !handler.guid ) {
 			handler.guid = jQuery.guid++;
 		}
 
-		// Init the element's event structure and main handler, if this is the first
-		events = elemData.events;
-		if ( !events ) {
-			elemData.events = events = {};
-		}
-		eventHandle = elemData.handle;
+		// Init the element's event structure
+		var elemData = jQuery.data( elem );
+
+		// If no elemData is found then we must be trying to bind to one of the
+		// banned noData elements
+		if ( !elemData ) {
+			return;
+		}
+
+		var events = elemData.events = elemData.events || {},
+			eventHandle = elemData.handle, eventHandle;
+
 		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
+			elemData.handle = eventHandle = function() {
+				// Handle the second event of a trigger and when
+				// an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
+					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
 					undefined;
 			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
+		}
+
+		// Add elem as a property of the handle function
+		// This is to prevent a memory leak with non-native events in IE.
+		eventHandle.elem = elem;
 
 		// Handle multiple events separated by a space
 		// jQuery(...).bind("mouseover mouseout", fn);
-		types = jQuery.trim( hoverHack(types) ).split( " " );
-		for ( t = 0; t < types.length; t++ ) {
-
-			tns = rtypenamespace.exec( types[t] ) || [];
-			type = tns[1];
-			namespaces = ( tns[2] || "" ).split( "." ).sort();
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: tns[1],
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			handlers = events[ type ];
+		types = types.split(" ");
+
+		var type, i = 0, namespaces;
+
+		while ( (type = types[ i++ ]) ) {
+			handleObj = handleObjIn ?
+				jQuery.extend({}, handleObjIn) :
+				{ handler: handler, data: data };
+
+			// Namespaced event handlers
+			if ( type.indexOf(".") > -1 ) {
+				namespaces = type.split(".");
+				type = namespaces.shift();
+				handleObj.namespace = namespaces.slice(0).sort().join(".");
+
+			} else {
+				namespaces = [];
+				handleObj.namespace = "";
+			}
+
+			handleObj.type = type;
+			handleObj.guid = handler.guid;
+
+			// Get the current list of functions bound to this event
+			var handlers = events[ type ],
+				special = jQuery.event.special[ type ] || {};
+
+			// Init the event handler queue
 			if ( !handlers ) {
 				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
+
+				// Check for a special event handler
+				// Only use addEventListener/attachEvent if the special
+				// events handler returns false
 				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
 					// Bind the global event handler to the element
@@ -2733,7 +1652,7 @@
 				}
 			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
+			
+			if ( special.add ) { 
+				special.add.call( elem, handleObj ); 
 
 				if ( !handleObj.handler.guid ) {
@@ -2742,12 +1661,8 @@
 			}
 
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
+			// Add the function to the element's handler list
+			handlers.push( handleObj );
+
+			// Keep track of which events have been used, for global triggering
 			jQuery.event.global[ type ] = true;
 		}
@@ -2760,61 +1675,103 @@
 
 	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var t, tns, type, origType, namespaces, origCount,
-			j, events, special, eventType, handleObj,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
+	remove: function( elem, types, handler, pos ) {
+		// don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
 			return;
 		}
 
-		// Once for each type.namespace in types; type may be omitted
-		types = jQuery.trim( hoverHack( types || "" ) ).split(" ");
-		for ( t = 0; t < types.length; t++ ) {
-			tns = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tns[1];
-			namespaces = tns[2];
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
+		var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
+			elemData = jQuery.data( elem ),
+			events = elemData && elemData.events;
+
+		if ( !elemData || !events ) {
+			return;
+		}
+
+		// types is actually an event object here
+		if ( types && types.type ) {
+			handler = types.handler;
+			types = types.type;
+		}
+
+		// Unbind all events for the element
+		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
+			types = types || "";
+
+			for ( type in events ) {
+				jQuery.event.remove( elem, type + types );
+			}
+
+			return;
+		}
+
+		// Handle multiple events separated by a space
+		// jQuery(...).unbind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		while ( (type = types[ i++ ]) ) {
+			origType = type;
+			handleObj = null;
+			all = type.indexOf(".") < 0;
+			namespaces = [];
+
+			if ( !all ) {
+				// Namespaced event handlers
+				namespaces = type.split(".");
+				type = namespaces.shift();
+
+				namespace = new RegExp("(^|\\.)" + 
+					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)")
+			}
+
+			eventType = events[ type ];
+
+			if ( !eventType ) {
 				continue;
 			}
 
+			if ( !handler ) {
+				for ( var j = 0; j < eventType.length; j++ ) {
+					handleObj = eventType[ j ];
+
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						jQuery.event.remove( elem, origType, handleObj.handler, j );
+						eventType.splice( j--, 1 );
+					}
+				}
+
+				continue;
+			}
+
 			special = jQuery.event.special[ type ] || {};
-			type = ( selector? special.delegateType : special.bindType ) || type;
-			eventType = events[ type ] || [];
-			origCount = eventType.length;
-			namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.|)") + "(\\.|$)") : null;
-
-			// Remove matching events
-			for ( j = 0; j < eventType.length; j++ ) {
+
+			for ( var j = pos || 0; j < eventType.length; j++ ) {
 				handleObj = eventType[ j ];
 
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					 ( !handler || handler.guid === handleObj.guid ) &&
-					 ( !namespaces || namespaces.test( handleObj.namespace ) ) &&
-					 ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					eventType.splice( j--, 1 );
-
-					if ( handleObj.selector ) {
-						eventType.delegateCount--;
+				if ( handler.guid === handleObj.guid ) {
+					// remove the given handler for the given type
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						if ( pos == null ) {
+							eventType.splice( j--, 1 );
+						}
+
+						if ( special.remove ) {
+							special.remove.call( elem, handleObj );
+						}
 					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
+
+					if ( pos != null ) {
+						break;
 					}
 				}
 			}
 
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( eventType.length === 0 && origCount !== eventType.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
+			// remove generic event handler if no more handlers exist
+			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
+					removeEvent( elem, type, elemData.handle );
+				}
+
+				ret = null;
 				delete events[ type ];
 			}
@@ -2823,243 +1780,159 @@
 		// Remove the expando if it's no longer used
 		if ( jQuery.isEmptyObject( events ) ) {
+			var handle = elemData.handle;
+			if ( handle ) {
+				handle.elem = null;
+			}
+
+			delete elemData.events;
 			delete elemData.handle;
 
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery.removeData( elem, "events", true );
-		}
-	},
-
-	// Events that are safe to short-circuit if no handlers are attached.
-	// Native DOM events should not be added, they may have inline handlers.
-	customEvent: {
-		"getData": true,
-		"setData": true,
-		"changeData": true
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		// Don't do events on text and comment nodes
-		if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) {
-			return;
-		}
-
+			if ( jQuery.isEmptyObject( elemData ) ) {
+				jQuery.removeData( elem );
+			}
+		}
+	},
+
+	// bubbling is internal
+	trigger: function( event, data, elem /*, bubbling */ ) {
 		// Event object or event type
-		var cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType,
-			type = event.type || event,
-			namespaces = [];
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf( "!" ) >= 0 ) {
-			// Exclusive events trigger only for the exact event (no namespaces)
-			type = type.slice(0, -1);
-			exclusive = true;
-		}
-
-		if ( type.indexOf( "." ) >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-
-		if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
-			// No jQuery handlers for this event type, and it can't have inline handlers
-			return;
-		}
-
-		// Caller can pass in an Event, Object, or just an event type string
-		event = typeof event === "object" ?
-			// jQuery.Event object
-			event[ jQuery.expando ] ? event :
-			// Object literal
-			new jQuery.Event( type, event ) :
-			// Just the event type (string)
-			new jQuery.Event( type );
-
-		event.type = type;
-		event.isTrigger = true;
-		event.exclusive = exclusive;
-		event.namespace = namespaces.join( "." );
-		event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)") : null;
-		ontype = type.indexOf( ":" ) < 0 ? "on" + type : "";
-
-		// Handle a global trigger
-		if ( !elem ) {
-
-			// TODO: Stop taunting the data cache; remove global events and always attach to document
-			cache = jQuery.cache;
-			for ( i in cache ) {
-				if ( cache[ i ].events && cache[ i ].events[ type ] ) {
-					jQuery.event.trigger( event, data, cache[ i ].handle.elem, true );
-				}
-			}
-			return;
-		}
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
+		var type = event.type || event,
+			bubbling = arguments[3];
+
+		if ( !bubbling ) {
+			event = typeof event === "object" ?
+				// jQuery.Event object
+				event[expando] ? event :
+				// Object literal
+				jQuery.extend( jQuery.Event(type), event ) :
+				// Just the event type (string)
+				jQuery.Event(type);
+
+			if ( type.indexOf("!") >= 0 ) {
+				event.type = type = type.slice(0, -1);
+				event.exclusive = true;
+			}
+
+			// Handle a global trigger
+			if ( !elem ) {
+				// Don't bubble custom events when global (to avoid too much overhead)
+				event.stopPropagation();
+
+				// Only trigger if we've ever bound an event for it
+				if ( jQuery.event.global[ type ] ) {
+					jQuery.each( jQuery.cache, function() {
+						if ( this.events && this.events[type] ) {
+							jQuery.event.trigger( event, data, this.handle.elem );
+						}
+					});
+				}
+			}
+
+			// Handle triggering a single element
+
+			// don't do events on text and comment nodes
+			if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+				return undefined;
+			}
+
+			// Clean up in case it is reused
+			event.result = undefined;
 			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data != null ? jQuery.makeArray( data ) : [];
-		data.unshift( event );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		eventPath = [[ elem, special.bindType || type ]];
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode;
-			for ( old = elem; cur; cur = cur.parentNode ) {
-				eventPath.push([ cur, bubbleType ]);
-				old = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( old === (elem.ownerDocument || document) ) {
-				eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]);
-			}
-		}
-
-		// Fire handlers on the event path
-		for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) {
-
-			cur = eventPath[i][0];
-			event.type = eventPath[i][1];
-
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-			// Note that this is a bare JS function and not a jQuery handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
-				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				// IE<9 dies on focus/blur to hidden element (#1486)
-				if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					old = elem[ ontype ];
-
-					if ( old ) {
-						elem[ ontype ] = null;
+
+			// Clone the incoming data, if any
+			data = jQuery.makeArray( data );
+			data.unshift( event );
+		}
+
+		event.currentTarget = elem;
+
+		// Trigger the event, it is assumed that "handle" is a function
+		var handle = jQuery.data( elem, "handle" );
+		if ( handle ) {
+			handle.apply( elem, data );
+		}
+
+		var parent = elem.parentNode || elem.ownerDocument;
+
+		// Trigger an inline bound script
+		try {
+			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
+				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
+					event.result = false;
+				}
+			}
+
+		// prevent IE from throwing an error for some elements with some event types, see #3533
+		} catch (e) {}
+
+		if ( !event.isPropagationStopped() && parent ) {
+			jQuery.event.trigger( event, data, parent, true );
+
+		} else if ( !event.isDefaultPrevented() ) {
+			var target = event.target, old,
+				isClick = jQuery.nodeName(target, "a") && type === "click",
+				special = jQuery.event.special[ type ] || {};
+
+			if ( (!special._default || special._default.call( elem, event ) === false) && 
+				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
+
+				try {
+					if ( target[ type ] ) {
+						// Make sure that we don't accidentally re-trigger the onFOO events
+						old = target[ "on" + type ];
+
+						if ( old ) {
+							target[ "on" + type ] = null;
+						}
+
+						jQuery.event.triggered = true;
+						target[ type ]();
 					}
 
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					elem[ type ]();
-					jQuery.event.triggered = undefined;
-
-					if ( old ) {
-						elem[ ontype ] = old;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event || window.event );
-
-		var i, j, cur, ret, selMatch, matched, matches, handleObj, sel, related,
-			handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
-			delegateCount = handlers.delegateCount,
-			args = core_slice.call( arguments ),
-			run_all = !event.exclusive && !event.namespace,
-			special = jQuery.event.special[ event.type ] || {},
-			handlerQueue = [];
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers that should run if there are delegated events
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && !(event.button && event.type === "click") ) {
-
-			for ( cur = event.target; cur != this; cur = cur.parentNode || this ) {
-
-				// Don't process clicks (ONLY) on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.disabled !== true || event.type !== "click" ) {
-					selMatch = {};
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-						sel = handleObj.selector;
-
-						if ( selMatch[ sel ] === undefined ) {
-							selMatch[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( selMatch[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, matches: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( handlers.length > delegateCount ) {
-			handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) });
-		}
-
-		// Run delegates first; they may want to stop propagation beneath us
-		for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) {
-			matched = handlerQueue[ i ];
-			event.currentTarget = matched.elem;
-
-			for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) {
-				handleObj = matched.matches[ j ];
-
-				// Triggered event must either 1) be non-exclusive and have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) {
-
+				// prevent IE from throwing an error for some elements with some event types, see #3533
+				} catch (e) {}
+
+				if ( old ) {
+					target[ "on" + type ] = old;
+				}
+
+				jQuery.event.triggered = false;
+			}
+		}
+	},
+
+	handle: function( event ) {
+		var all, handlers, namespaces, namespace, events;
+
+		event = arguments[0] = jQuery.event.fix( event || window.event );
+		event.currentTarget = this;
+
+		// Namespaced event handlers
+		all = event.type.indexOf(".") < 0 && !event.exclusive;
+
+		if ( !all ) {
+			namespaces = event.type.split(".");
+			event.type = namespaces.shift();
+			namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
+		}
+
+		var events = jQuery.data(this, "events"), handlers = events[ event.type ];
+
+		if ( events && handlers ) {
+			// Clone the handlers to prevent manipulation
+			handlers = handlers.slice(0);
+
+			for ( var j = 0, l = handlers.length; j < l; j++ ) {
+				var handleObj = handlers[ j ];
+
+				// Filter the functions by class
+				if ( all || namespace.test( handleObj.namespace ) ) {
+					// Pass in a reference to the handler function itself
+					// So that we can later remove it
+					event.handler = handleObj.handler;
 					event.data = handleObj.data;
 					event.handleObj = handleObj;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
+	
+					var ret = handleObj.handler.apply( this, arguments );
 
 					if ( ret !== undefined ) {
@@ -3070,11 +1943,10 @@
 						}
 					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
+
+					if ( event.isImmediatePropagationStopped() ) {
+						break;
+					}
+				}
+			}
 		}
 
@@ -3082,100 +1954,96 @@
 	},
 
-	// Includes some event props shared by KeyEvent and MouseEvent
-	// *** attrChange attrName relatedNode srcElement  are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
-	props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
+	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+
+	fix: function( event ) {
+		if ( event[ expando ] ) {
 			return event;
 		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop,
-			originalEvent = event,
-			fixHook = jQuery.event.fixHooks[ event.type ] || {},
-			copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
+
+		// store a copy of the original event object
+		// and "clone" to set read-only properties
+		var originalEvent = event;
 		event = jQuery.Event( originalEvent );
 
-		for ( i = copy.length; i; ) {
-			prop = copy[ --i ];
+		for ( var i = this.props.length, prop; i; ) {
+			prop = this.props[ --i ];
 			event[ prop ] = originalEvent[ prop ];
 		}
 
-		// Fix target property, if necessary (#1925, IE 6/7/8 & Safari2)
+		// Fix target property, if necessary
 		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Target should not be a text node (#504, Safari)
+			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
+		}
+
+		// check if target is a textnode (safari)
 		if ( event.target.nodeType === 3 ) {
 			event.target = event.target.parentNode;
 		}
 
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328; IE6/7/8)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter? fixHook.filter( event, originalEvent ) : event;
-	},
+		// Add relatedTarget, if necessary
+		if ( !event.relatedTarget && event.fromElement ) {
+			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
+		}
+
+		// Calculate pageX/Y if missing and clientX/Y available
+		if ( event.pageX == null && event.clientX != null ) {
+			var doc = document.documentElement, body = document.body;
+			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
+			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
+		}
+
+		// Add which for key events
+		if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) {
+			event.which = event.charCode || event.keyCode;
+		}
+
+		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+		if ( !event.metaKey && event.ctrlKey ) {
+			event.metaKey = event.ctrlKey;
+		}
+
+		// Add which for click: 1 === left; 2 === middle; 3 === right
+		// Note: button is not normalized, so don't use it
+		if ( !event.which && event.button !== undefined ) {
+			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+		}
+
+		return event;
+	},
+
+	// Deprecated, use jQuery.guid instead
+	guid: 1E8,
+
+	// Deprecated, use jQuery.proxy instead
+	proxy: jQuery.proxy,
 
 	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
+		ready: {
+			// Make sure the ready event is setup
+			setup: jQuery.bindReady,
+			teardown: jQuery.noop
 		},
 
-		focus: {
-			delegateType: "focusin"
-		},
-		blur: {
-			delegateType: "focusout"
+		live: {
+			add: function( handleObj ) {
+				jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) ); 
+			},
+
+			remove: function( handleObj ) {
+				var remove = true,
+					type = handleObj.origType.replace(rnamespaces, "");
+				
+				jQuery.each( jQuery.data(this, "events").live || [], function() {
+					if ( type === this.origType.replace(rnamespaces, "") ) {
+						remove = false;
+						return false;
+					}
+				});
+
+				if ( remove ) {
+					jQuery.event.remove( this, handleObj.origType, liveHandler );
+				}
+			}
+
 		},
 
@@ -3183,9 +2051,10 @@
 			setup: function( data, namespaces, eventHandle ) {
 				// We only want to do this special case on windows
-				if ( jQuery.isWindow( this ) ) {
+				if ( this.setInterval ) {
 					this.onbeforeunload = eventHandle;
 				}
+
+				return false;
 			},
-
 			teardown: function( namespaces, eventHandle ) {
 				if ( this.onbeforeunload === eventHandle ) {
@@ -3194,58 +2063,19 @@
 			}
 		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{ type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
 	}
 };
 
-// Some plugins are using, but it's undocumented/deprecated and will be removed.
-// The 1.7 special event interface should provide all the hooks needed now.
-jQuery.event.handle = jQuery.event.dispatch;
-
-jQuery.removeEvent = document.removeEventListener ?
+var removeEvent = document.removeEventListener ?
 	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
+		elem.removeEventListener( type, handle, false );
+	} : 
 	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8 –
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === "undefined" ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
+		elem.detachEvent( "on" + type, handle );
 	};
 
-jQuery.Event = function( src, props ) {
+jQuery.Event = function( src ) {
 	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
+	if ( !this.preventDefault ) {
+		return new jQuery.Event( src );
 	}
 
@@ -3254,10 +2084,4 @@
 		this.originalEvent = src;
 		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
-
 	// Event type
 	} else {
@@ -3265,14 +2089,10 @@
 	}
 
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
+	// timeStamp is buggy for some events on Firefox(#3843)
+	// So we won't rely on the native value
+	this.timeStamp = now();
 
 	// Mark it as fixed
-	this[ jQuery.expando ] = true;
+	this[ expando ] = true;
 };
 
@@ -3294,13 +2114,11 @@
 			return;
 		}
-
+		
 		// if preventDefault exists run it on the original event
 		if ( e.preventDefault ) {
 			e.preventDefault();
-
+		}
 		// otherwise set the returnValue property of the original event to false (IE)
-		} else {
-			e.returnValue = false;
-		}
+		e.returnValue = false;
 	},
 	stopPropagation: function() {
@@ -3327,5 +2145,38 @@
 };
 
-// Create mouseenter/leave events using mouseover/out and event-time checks
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function( event ) {
+	// Check if mouse(over|out) are still within the same parent element
+	var parent = event.relatedTarget;
+
+	// Firefox sometimes assigns relatedTarget a XUL element
+	// which we cannot access the parentNode property of
+	try {
+		// Traverse up the tree
+		while ( parent && parent !== this ) {
+			parent = parent.parentNode;
+		}
+
+		if ( parent !== this ) {
+			// set the correct event type
+			event.type = event.data;
+
+			// handle event if we actually just moused on to a non sub-element
+			jQuery.event.handle.apply( this, arguments );
+		}
+
+	// assuming we've left the element since we most likely mousedover a xul element
+	} catch(e) { }
+},
+
+// In case of event delegation, we only need to rename the event.type,
+// liveHandler will take care of the rest.
+delegate = function( event ) {
+	event.type = event.data;
+	jQuery.event.handle.apply( this, arguments );
+};
+
+// Create mouseenter and mouseleave events
 jQuery.each({
 	mouseenter: "mouseover",
@@ -3333,271 +2184,242 @@
 }, function( orig, fix ) {
 	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj,
-				selector = handleObj.selector;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
+		setup: function( data ) {
+			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
+		},
+		teardown: function( data ) {
+			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
 		}
 	};
 });
 
-// IE submit delegation
+// submit delegation
 if ( !jQuery.support.submitBubbles ) {
 
 	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
+		setup: function( data, namespaces ) {
+			if ( this.nodeName.toLowerCase() !== "form" ) {
+				jQuery.event.add(this, "click.specialSubmit", function( e ) {
+					var elem = e.target, type = elem.type;
+
+					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
+						return trigger( "submit", this, arguments );
+					}
+				});
+	 
+				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
+					var elem = e.target, type = elem.type;
+
+					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
+						return trigger( "submit", this, arguments );
+					}
+				});
+
+			} else {
 				return false;
 			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "_submit_attached" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "_submit_attached", true );
-				}
-			});
-			// return undefined since we don't need an event listener
 		},
 
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
-				}
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialSubmit" );
+		}
+	};
+
+}
+
+// change delegation, happens here so we have bind.
+if ( !jQuery.support.changeBubbles ) {
+
+	var formElems = /textarea|input|select/i,
+
+	changeFilters,
+
+	getVal = function( elem ) {
+		var type = elem.type, val = elem.value;
+
+		if ( type === "radio" || type === "checkbox" ) {
+			val = elem.checked;
+
+		} else if ( type === "select-multiple" ) {
+			val = elem.selectedIndex > -1 ?
+				jQuery.map( elem.options, function( elem ) {
+					return elem.selected;
+				}).join("-") :
+				"";
+
+		} else if ( elem.nodeName.toLowerCase() === "select" ) {
+			val = elem.selectedIndex;
+		}
+
+		return val;
+	},
+
+	testChange = function testChange( e ) {
+		var elem = e.target, data, val;
+
+		if ( !formElems.test( elem.nodeName ) || elem.readOnly ) {
+			return;
+		}
+
+		data = jQuery.data( elem, "_change_data" );
+		val = getVal(elem);
+
+		// the current data will be also retrieved by beforeactivate
+		if ( e.type !== "focusout" || elem.type !== "radio" ) {
+			jQuery.data( elem, "_change_data", val );
+		}
+		
+		if ( data === undefined || val === data ) {
+			return;
+		}
+
+		if ( data != null || val ) {
+			e.type = "change";
+			return jQuery.event.trigger( e, arguments[1], elem );
+		}
+	};
+
+	jQuery.event.special.change = {
+		filters: {
+			focusout: testChange, 
+
+			click: function( e ) {
+				var elem = e.target, type = elem.type;
+
+				if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
+					return testChange.call( this, e );
+				}
+			},
+
+			// Change has to be called before submit
+			// Keydown will be called before keypress, which is used in submit-event delegation
+			keydown: function( e ) {
+				var elem = e.target, type = elem.type;
+
+				if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
+					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
+					type === "select-multiple" ) {
+					return testChange.call( this, e );
+				}
+			},
+
+			// Beforeactivate happens also before the previous element is blurred
+			// with this event you can't trigger a change event, but you can store
+			// information/focus[in] is not needed anymore
+			beforeactivate: function( e ) {
+				var elem = e.target;
+				jQuery.data( elem, "_change_data", getVal(elem) );
 			}
 		},
 
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
+		setup: function( data, namespaces ) {
+			if ( this.type === "file" ) {
 				return false;
 			}
 
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
+			for ( var type in changeFilters ) {
+				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
+			}
+
+			return formElems.test( this.nodeName );
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialChange" );
+
+			return formElems.test( this.nodeName );
 		}
 	};
+
+	changeFilters = jQuery.event.special.change.filters;
 }
 
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-						}
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "_change_attached" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					jQuery._data( elem, "_change_attached", true );
-				}
-			});
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
+function trigger( type, elem, args ) {
+	args[0].type = type;
+	return jQuery.event.handle.apply( elem, args );
 }
 
 // Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
+if ( document.addEventListener ) {
 	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
 		jQuery.event.special[ fix ] = {
 			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
+				this.addEventListener( orig, handler, true );
+			}, 
+			teardown: function() { 
+				this.removeEventListener( orig, handler, true );
 			}
 		};
+
+		function handler( e ) { 
+			e = jQuery.event.fix( e );
+			e.type = fix;
+			return jQuery.event.handle.call( this, e );
+		}
 	});
 }
 
+jQuery.each(["bind", "one"], function( i, name ) {
+	jQuery.fn[ name ] = function( type, data, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" ) {
+			for ( var key in type ) {
+				this[ name ](key, data, type[key], fn);
+			}
+			return this;
+		}
+		
+		if ( jQuery.isFunction( data ) ) {
+			fn = data;
+			data = undefined;
+		}
+
+		var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
+			jQuery( this ).unbind( event, handler );
+			return fn.apply( this, arguments );
+		}) : fn;
+
+		if ( type === "unload" && name !== "one" ) {
+			this.one( type, data, fn );
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.add( this[i], type, handler, data );
+			}
+		}
+
+		return this;
+	};
+});
+
 jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var origFn, type;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) { // && selector != null
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	live: function( types, data, fn ) {
-		jQuery( this.context ).on( types, this.selector, data, fn );
+	unbind: function( type, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" && !type.preventDefault ) {
+			for ( var key in type ) {
+				this.unbind(key, type[key]);
+			}
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.remove( this[i], type, fn );
+			}
+		}
+
 		return this;
 	},
-	die: function( types, fn ) {
-		jQuery( this.context ).off( types, this.selector || "**", fn );
-		return this;
-	},
-
+	
 	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
+		return this.live( types, data, fn, selector );
+	},
+	
 	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-	},
-
+		if ( arguments.length === 0 ) {
+				return this.unbind( "live" );
+		
+		} else {
+			return this.die( types, null, fn, selector );
+		}
+	},
+	
 	trigger: function( type, data ) {
 		return this.each(function() {
@@ -3605,7 +2427,12 @@
 		});
 	},
+
 	triggerHandler: function( type, data ) {
 		if ( this[0] ) {
-			return jQuery.event.trigger( type, data, this[0], true );
+			var event = jQuery.Event( type );
+			event.preventDefault();
+			event.stopPropagation();
+			jQuery.event.trigger( event, data, this[0] );
+			return event.result;
 		}
 	},
@@ -3613,26 +2440,22 @@
 	toggle: function( fn ) {
 		// Save reference to arguments for access in closure
-		var args = arguments,
-			guid = fn.guid || jQuery.guid++,
-			i = 0,
-			toggler = function( event ) {
-				// Figure out which function to execute
-				var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-				jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-				// Make sure that clicks stop
-				event.preventDefault();
-
-				// and execute the function
-				return args[ lastToggle ].apply( this, arguments ) || false;
-			};
+		var args = arguments, i = 1;
 
 		// link all the functions, so any of them can unbind this click handler
-		toggler.guid = guid;
 		while ( i < args.length ) {
-			args[ i++ ].guid = guid;
-		}
-
-		return this.click( toggler );
+			jQuery.proxy( fn, args[ i++ ] );
+		}
+
+		return this.click( jQuery.proxy( fn, function( event ) {
+			// Figure out which function to execute
+			var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+			jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+			// Make sure that clicks stop
+			event.preventDefault();
+
+			// and execute the function
+			return args[ lastToggle ].apply( this, arguments ) || false;
+		}));
 	},
 
@@ -3642,1731 +2465,1266 @@
 });
 
+var liveMap = {
+	focus: "focusin",
+	blur: "focusout",
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+};
+
+jQuery.each(["live", "die"], function( i, name ) {
+	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
+		var type, i = 0, match, namespaces, preType,
+			selector = origSelector || this.selector,
+			context = origSelector ? this : jQuery( this.context );
+
+		if ( jQuery.isFunction( data ) ) {
+			fn = data;
+			data = undefined;
+		}
+
+		types = (types || "").split(" ");
+
+		while ( (type = types[ i++ ]) != null ) {
+			match = rnamespaces.exec( type );
+			namespaces = "";
+
+			if ( match )  {
+				namespaces = match[0];
+				type = type.replace( rnamespaces, "" );
+			}
+
+			if ( type === "hover" ) {
+				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
+				continue;
+			}
+
+			preType = type;
+
+			if ( type === "focus" || type === "blur" ) {
+				types.push( liveMap[ type ] + namespaces );
+				type = type + namespaces;
+
+			} else {
+				type = (liveMap[ type ] || type) + namespaces;
+			}
+
+			if ( name === "live" ) {
+				// bind live handler
+				context.each(function(){
+					jQuery.event.add( this, liveConvert( type, selector ),
+						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
+				});
+
+			} else {
+				// unbind live handler
+				context.unbind( liveConvert( type, selector ), fn );
+			}
+		}
+		
+		return this;
+	}
+});
+
+function liveHandler( event ) {
+	var stop, elems = [], selectors = [], args = arguments,
+		related, match, handleObj, elem, j, i, l, data,
+		events = jQuery.data( this, "events" );
+
+	// Make sure we avoid non-left-click bubbling in Firefox (#3861)
+	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
+		return;
+	}
+
+	event.liveFired = this;
+
+	var live = events.live.slice(0);
+
+	for ( j = 0; j < live.length; j++ ) {
+		handleObj = live[j];
+
+		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
+			selectors.push( handleObj.selector );
+
+		} else {
+			live.splice( j--, 1 );
+		}
+	}
+
+	match = jQuery( event.target ).closest( selectors, event.currentTarget );
+
+	for ( i = 0, l = match.length; i < l; i++ ) {
+		for ( j = 0; j < live.length; j++ ) {
+			handleObj = live[j];
+
+			if ( match[i].selector === handleObj.selector ) {
+				elem = match[i].elem;
+				related = null;
+
+				// Those two events require additional checking
+				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
+					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
+				}
+
+				if ( !related || related !== elem ) {
+					elems.push({ elem: elem, handleObj: handleObj });
+				}
+			}
+		}
+	}
+
+	for ( i = 0, l = elems.length; i < l; i++ ) {
+		match = elems[i];
+		event.currentTarget = match.elem;
+		event.data = match.handleObj.data;
+		event.handleObj = match.handleObj;
+
+		if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) {
+			stop = false;
+			break;
+		}
+	}
+
+	return stop;
+}
+
+function liveConvert( type, selector ) {
+	return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&");
+}
+
 jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
 	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
 
 	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		if ( fn == null ) {
-			fn = data;
-			data = null;
-		}
-
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
+	jQuery.fn[ name ] = function( fn ) {
+		return fn ? this.bind( name, fn ) : this.trigger( name );
 	};
 
-	if ( rkeyEvent.test( name ) ) {
-		jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
-	}
-
-	if ( rmouseEvent.test( name ) ) {
-		jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
+	if ( jQuery.attrFn ) {
+		jQuery.attrFn[ name ] = true;
 	}
 });
+
+// Prevent memory leaks in IE
+// Window isn't included so as not to unbind existing unload events
+// More info:
+//  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
+if ( window.attachEvent && !window.addEventListener ) {
+	window.attachEvent("onunload", function() {
+		for ( var id in jQuery.cache ) {
+			if ( jQuery.cache[ id ].handle ) {
+				// Try/Catch is to handle iframes being unloaded, see #4280
+				try {
+					jQuery.event.remove( jQuery.cache[ id ].handle.elem );
+				} catch(e) {}
+			}
+		}
+	});
+}
 /*!
- * Sizzle CSS Selector Engine
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license
- * http://sizzlejs.com/
+ * Sizzle CSS Selector Engine - v1.0
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
  */
-(function( window, undefined ) {
-
-var cachedruns,
-	assertGetIdNotName,
-	Expr,
-	getText,
-	isXML,
-	contains,
-	compile,
-	sortOrder,
-	hasDuplicate,
-	outermostContext,
-
-	baseHasDuplicate = true,
-	strundefined = "undefined",
-
-	expando = ( "sizcache" + Math.random() ).replace( ".", "" ),
-
-	Token = String,
-	document = window.document,
-	docElem = document.documentElement,
-	dirruns = 0,
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
 	done = 0,
-	pop = [].pop,
-	push = [].push,
-	slice = [].slice,
-	// Use a stripped-down indexOf if a native one is unavailable
-	indexOf = [].indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	// Augment a function for special use by Sizzle
-	markFunction = function( fn, value ) {
-		fn[ expando ] = value == null || value;
-		return fn;
-	},
-
-	createCache = function() {
-		var cache = {},
-			keys = [];
-
-		return markFunction(function( key, value ) {
-			// Only keep the most recent entries
-			if ( keys.push( key ) > Expr.cacheLength ) {
-				delete cache[ keys.shift() ];
-			}
-
-			return (cache[ key ] = value);
-		}, cache );
-	},
-
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-
-	// Regex
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier (http://www.w3.org/TR/css3-selectors/#attribute-selectors)
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	operators = "([*^$|!~]?=)",
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-	// Prefer arguments not in parens/brackets,
-	//   then attribute selectors and non-pseudos (denoted by :),
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:" + attributes + ")|[^:]|\\\\.)*|.*))\\)|)",
-
-	// For matchExpr.POS and matchExpr.needsContext
-	pos = ":(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace +
-		"*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([\\x20\\t\\r\\n\\f>+~])" + whitespace + "*" ),
-	rpseudo = new RegExp( pseudos ),
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,
-
-	rnot = /^:not/,
-	rsibling = /[\x20\t\r\n\f]*[+~]/,
-	rendsWithNot = /:not\($/,
-
-	rheader = /h\d/i,
-	rinputs = /input|select|textarea|button/i,
-
-	rbackslash = /\\(?!\\)/g,
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"NAME": new RegExp( "^\\[name=['\"]?(" + characterEncoding + ")['\"]?\\]" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"POS": new RegExp( pos, "i" ),
-		"CHILD": new RegExp( "^:(only|nth|first|last)-child(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		// For use in libraries implementing .is()
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|" + pos, "i" )
-	},
-
-	// Support
-
-	// Used for testing something on an element
-	assert = function( fn ) {
-		var div = document.createElement("div");
-
-		try {
-			return fn( div );
-		} catch (e) {
-			return false;
-		} finally {
-			// release memory in IE
-			div = null;
-		}
-	},
-
-	// Check if getElementsByTagName("*") returns only elements
-	assertTagNameNoComments = assert(function( div ) {
-		div.appendChild( document.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	}),
-
-	// Check if getAttribute returns normalized href attributes
-	assertHrefNotNormalized = assert(function( div ) {
-		div.innerHTML = "<a href='#'></a>";
-		return div.firstChild && typeof div.firstChild.getAttribute !== strundefined &&
-			div.firstChild.getAttribute("href") === "#";
-	}),
-
-	// Check if attributes should be retrieved by attribute nodes
-	assertAttributes = assert(function( div ) {
-		div.innerHTML = "<select></select>";
-		var type = typeof div.lastChild.getAttribute("multiple");
-		// IE8 returns a string for some attributes even when not present
-		return type !== "boolean" && type !== "string";
-	}),
-
-	// Check if getElementsByClassName can be trusted
-	assertUsableClassName = assert(function( div ) {
-		// Opera can't find a second classname (in 9.6)
-		div.innerHTML = "<div class='hidden e'></div><div class='hidden'></div>";
-		if ( !div.getElementsByClassName || !div.getElementsByClassName("e").length ) {
-			return false;
-		}
-
-		// Safari 3.2 caches class attributes and doesn't catch changes
-		div.lastChild.className = "e";
-		return div.getElementsByClassName("e").length === 2;
-	}),
-
-	// Check if getElementById returns elements by name
-	// Check if getElementsByName privileges form controls or returns elements by ID
-	assertUsableName = assert(function( div ) {
-		// Inject content
-		div.id = expando + 0;
-		div.innerHTML = "<a name='" + expando + "'></a><div name='" + expando + "'></div>";
-		docElem.insertBefore( div, docElem.firstChild );
-
-		// Test
-		var pass = document.getElementsByName &&
-			// buggy browsers will return fewer than the correct 2
-			document.getElementsByName( expando ).length === 2 +
-			// buggy browsers will return more than the correct 0
-			document.getElementsByName( expando + 0 ).length;
-		assertGetIdNotName = !document.getElementById( expando );
-
-		// Cleanup
-		docElem.removeChild( div );
-
-		return pass;
-	});
-
-// If slice is not available, provide a backup
-try {
-	slice.call( docElem.childNodes, 0 )[0].nodeType;
-} catch ( e ) {
-	slice = function( i ) {
-		var elem,
-			results = [];
-		for ( ; (elem = this[i]); i++ ) {
-			results.push( elem );
-		}
-		return results;
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
+	toString = Object.prototype.toString,
+	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 || [];
-	context = context || document;
-	var match, elem, xml, m,
-		nodeType = context.nodeType;
-
+	var origContext = context = context || document;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+	
 	if ( !selector || typeof selector !== "string" ) {
 		return results;
 	}
 
-	if ( nodeType !== 1 && nodeType !== 9 ) {
+	var parts = [], m, set, checkSet, extra, prune = true, contextXML = isXML(context),
+		soFar = selector;
+	
+	// Reset the position of the chunker regexp (start from head)
+	while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) {
+		soFar = m[3];
+		
+		parts.push( m[1] );
+		
+		if ( m[2] ) {
+			extra = m[3];
+			break;
+		}
+	}
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context );
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] ) {
+					selector += parts.shift();
+				}
+				
+				set = posProcess( selector, set );
+			}
+		}
+	} else {
+		// Take a shortcut and set the context if the root selector is an ID
+		// (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 );
+			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
+		}
+
+		if ( context ) {
+			var 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;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray(set);
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				var cur = parts.pop(), pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		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])) ) {
+					results.push( set[i] );
+				}
+			}
+		} else {
+			for ( var i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function(results){
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort(sortOrder);
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[i-1] ) {
+					results.splice(i--, 1);
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function(expr, set){
+	return Sizzle(expr, null, null, set);
+};
+
+Sizzle.find = function(expr, context, isXML){
+	var set, match;
+
+	if ( !expr ) {
 		return [];
 	}
 
-	xml = isXML( context );
-
-	if ( !xml && !seed ) {
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
+	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+		var type = Expr.order[i], match;
+		
+		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, "");
+				set = Expr.find[ type ]( match, context, isXML );
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = context.getElementsByTagName("*");
+	}
+
+	return {set: set, expr: expr};
+};
+
+Sizzle.filter = function(expr, set, inplace, not){
+	var old = expr, result = [], curLoop = set, match, anyFound,
+		isXMLFilter = set && set[0] && isXML(set[0]);
+
+	while ( expr && set.length ) {
+		for ( var type in Expr.filter ) {
+			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
+				var filter = Expr.filter[ type ], found, item, left = match[1];
+				anyFound = false;
+
+				match.splice(1,1);
+
+				if ( left.substr( left.length - 1 ) === "\\" ) {
+					continue;
+				}
+
+				if ( curLoop === result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+					} else if ( match === true ) {
+						continue;
 					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, slice.call(context.getElementsByTagName( selector ), 0) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && assertUsableClassName && context.getElementsByClassName ) {
-				push.apply( results, slice.call(context.getElementsByClassName( m ), 0) );
-				return results;
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed, xml );
-}
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	return Sizzle( expr, null, null, [ elem ] ).length > 0;
-};
-
-// Returns a function to use in pseudos for input types
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-// Returns a function to use in pseudos for buttons
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-// Returns a function to use in pseudos for positionals
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( nodeType ) {
-		if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-			// Use textContent for elements
-			// innerText usage removed for consistency of new lines (see #11153)
-			if ( typeof elem.textContent === "string" ) {
-				return elem.textContent;
-			} else {
-				// Traverse its children
-				for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-					ret += getText( elem );
-				}
-			}
-		} else if ( nodeType === 3 || nodeType === 4 ) {
-			return elem.nodeValue;
-		}
-		// Do not include comment or processing instruction nodes
-	} else {
-
-		// If no nodeType, this is expected to be an array
-		for ( ; (node = elem[i]); i++ ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	}
-	return ret;
-};
-
-isXML = 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).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-// Element contains another
-contains = Sizzle.contains = docElem.contains ?
-	function( a, b ) {
-		var adown = a.nodeType === 9 ? a.documentElement : a,
-			bup = b && b.parentNode;
-		return a === bup || !!( bup && bup.nodeType === 1 && adown.contains && adown.contains(bup) );
-	} :
-	docElem.compareDocumentPosition ?
-	function( a, b ) {
-		return b && !!( a.compareDocumentPosition( b ) & 16 );
-	} :
-	function( a, b ) {
-		while ( (b = b.parentNode) ) {
-			if ( b === a ) {
-				return true;
-			}
-		}
-		return false;
-	};
-
-Sizzle.attr = function( elem, name ) {
-	var val,
-		xml = isXML( elem );
-
-	if ( !xml ) {
-		name = name.toLowerCase();
-	}
-	if ( (val = Expr.attrHandle[ name ]) ) {
-		return val( elem );
-	}
-	if ( xml || assertAttributes ) {
-		return elem.getAttribute( name );
-	}
-	val = elem.getAttributeNode( name );
-	return val ?
-		typeof elem[ name ] === "boolean" ?
-			elem[ name ] ? name : null :
-			val.specified ? val.value : null :
-		null;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	// IE6/7 return a modified href
-	attrHandle: assertHrefNotNormalized ?
-		{} :
-		{
-			"href": function( elem ) {
-				return elem.getAttribute( "href", 2 );
-			},
-			"type": function( elem ) {
-				return elem.getAttribute("type");
-			}
-		},
-
-	find: {
-		"ID": assertGetIdNotName ?
-			function( id, context, xml ) {
-				if ( typeof context.getElementById !== strundefined && !xml ) {
-					var m = context.getElementById( id );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					return m && m.parentNode ? [m] : [];
-				}
-			} :
-			function( id, context, xml ) {
-				if ( typeof context.getElementById !== strundefined && !xml ) {
-					var m = context.getElementById( id );
-
-					return m ?
-						m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ?
-							[m] :
-							undefined :
-						[];
-				}
-			},
-
-		"TAG": assertTagNameNoComments ?
-			function( tag, context ) {
-				if ( typeof context.getElementsByTagName !== strundefined ) {
-					return context.getElementsByTagName( tag );
-				}
-			} :
-			function( tag, context ) {
-				var results = context.getElementsByTagName( tag );
-
-				// Filter out possible comments
-				if ( tag === "*" ) {
-					var elem,
-						tmp = [],
-						i = 0;
-
-					for ( ; (elem = results[i]); i++ ) {
-						if ( elem.nodeType === 1 ) {
-							tmp.push( elem );
+				}
+
+				if ( match ) {
+					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							var pass = not ^ !!found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+								} else {
+									curLoop[i] = false;
+								}
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
 						}
 					}
-
-					return tmp;
-				}
-				return results;
-			},
-
-		"NAME": assertUsableName && function( tag, context ) {
-			if ( typeof context.getElementsByName !== strundefined ) {
-				return context.getElementsByName( name );
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		// Improper expression
+		if ( expr === old ) {
+			if ( anyFound == null ) {
+				Sizzle.error( expr );
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	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\))?/
+	},
+	leftMatch: {},
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+	attrHandle: {
+		href: function(elem){
+			return elem.getAttribute("href");
+		}
+	},
+	relative: {
+		"+": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !/\W/.test(part),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			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.toLowerCase() === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
 			}
 		},
-
-		"CLASS": assertUsableClassName && function( className, context, xml ) {
-			if ( typeof context.getElementsByClassName !== strundefined && !xml ) {
-				return context.getElementsByClassName( className );
-			}
-		}
-	},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
+		">": function(checkSet, part){
+			var isPartStr = typeof part === "string";
+
+			if ( isPartStr && !/\W/.test(part) ) {
+				part = part.toLowerCase();
+
+				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+					var elem = checkSet[i];
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+					}
+				}
+			} else {
+				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+					var elem = checkSet[i];
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+		"": function(checkSet, part, isXML){
+			var doneName = done++, checkFn = dirCheck;
+
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				var nodeCheck = part = part.toLowerCase();
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+		},
+		"~": function(checkSet, part, isXML){
+			var doneName = done++, checkFn = dirCheck;
+
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				var nodeCheck = part = part.toLowerCase();
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
+		}
+	},
+	find: {
+		ID: function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				return m ? [m] : [];
+			}
+		},
+		NAME: function(match, context){
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [], results = context.getElementsByName(match[1]);
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+		TAG: function(match, context){
+			return context.getElementsByTagName(match[1]);
+		}
+	},
 	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( rbackslash, "" );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( rbackslash, "" );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
+		CLASS: function(match, curLoop, inplace, result, not, isXML){
+			match = " " + match[1].replace(/\\/g, "") + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
+						if ( !inplace ) {
+							result.push( elem );
+						}
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
 		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				3 xn-component of xn+y argument ([+-]?\d*n|)
-				4 sign of xn-component
-				5 x of xn-component
-				6 sign of y-component
-				7 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
+		ID: function(match){
+			return match[1].replace(/\\/g, "");
+		},
+		TAG: function(match, curLoop){
+			return match[1].toLowerCase();
+		},
+		CHILD: function(match){
 			if ( match[1] === "nth" ) {
-				// nth-child requires argument
-				if ( !match[2] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[3] = +( match[3] ? match[4] + (match[5] || 1) : 2 * ( match[2] === "even" || match[2] === "odd" ) );
-				match[4] = +( ( match[6] + match[7] ) || match[2] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[2] ) {
-				Sizzle.error( match[0] );
-			}
+				// 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" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				// calculate the numbers (first)n+(last) including if they are negative
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+
+			// TODO: Move to normal caching system
+			match[0] = done++;
 
 			return match;
 		},
-
-		"PSEUDO": function( match ) {
-			var unquoted, excess;
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			if ( match[3] ) {
-				match[2] = match[3];
-			} else if ( (unquoted = match[4]) ) {
-				// Only check arguments that contain a pseudo
-				if ( rpseudo.test(unquoted) &&
-					// Get excess from tokenize (recursively)
-					(excess = tokenize( unquoted, true )) &&
-					// advance to the next closing parenthesis
-					(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-					// excess is a negative index
-					unquoted = unquoted.slice( 0, excess );
-					match[0] = match[0].slice( 0, excess );
-				}
-				match[2] = unquoted;
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
+		ATTR: function(match, curLoop, inplace, result, not, isXML){
+			var name = match[1].replace(/\\/g, "");
+			
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+		PSEUDO: function(match, curLoop, inplace, result, not){
+			if ( match[1] === "not" ) {
+				// If we're dealing with a complex expression, or a simple one
+				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);
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+					return false;
+				}
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+			
+			return match;
+		},
+		POS: function(match){
+			match.unshift( true );
+			return match;
+		}
+	},
+	filters: {
+		enabled: function(elem){
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+		disabled: function(elem){
+			return elem.disabled === true;
+		},
+		checked: function(elem){
+			return elem.checked === true;
+		},
+		selected: function(elem){
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			elem.parentNode.selectedIndex;
+			return elem.selected === true;
+		},
+		parent: function(elem){
+			return !!elem.firstChild;
+		},
+		empty: function(elem){
+			return !elem.firstChild;
+		},
+		has: function(elem, i, match){
+			return !!Sizzle( match[3], elem ).length;
+		},
+		header: function(elem){
+			return /h\d/i.test( elem.nodeName );
+		},
+		text: function(elem){
+			return "text" === elem.type;
+		},
+		radio: function(elem){
+			return "radio" === elem.type;
+		},
+		checkbox: function(elem){
+			return "checkbox" === elem.type;
+		},
+		file: function(elem){
+			return "file" === elem.type;
+		},
+		password: function(elem){
+			return "password" === elem.type;
+		},
+		submit: function(elem){
+			return "submit" === elem.type;
+		},
+		image: function(elem){
+			return "image" === elem.type;
+		},
+		reset: function(elem){
+			return "reset" === elem.type;
+		},
+		button: function(elem){
+			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
+		},
+		input: function(elem){
+			return /input|select|textarea|button/i.test(elem.nodeName);
+		}
+	},
+	setFilters: {
+		first: function(elem, i){
+			return i === 0;
+		},
+		last: function(elem, i, match, array){
+			return i === array.length - 1;
+		},
+		even: function(elem, i){
+			return i % 2 === 0;
+		},
+		odd: function(elem, i){
+			return i % 2 === 1;
+		},
+		lt: function(elem, i, match){
+			return i < match[3] - 0;
+		},
+		gt: function(elem, i, match){
+			return i > match[3] - 0;
+		},
+		nth: function(elem, i, match){
+			return match[3] - 0 === i;
+		},
+		eq: function(elem, i, match){
+			return match[3] - 0 === i;
+		}
+	},
 	filter: {
-		"ID": assertGetIdNotName ?
-			function( id ) {
-				id = id.replace( rbackslash, "" );
-				return function( elem ) {
-					return elem.getAttribute("id") === id;
-				};
-			} :
-			function( id ) {
-				id = id.replace( rbackslash, "" );
-				return function( elem ) {
-					var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-					return node && node.value === id;
-				};
-			},
-
-		"TAG": function( nodeName ) {
-			if ( nodeName === "*" ) {
-				return function() { return true; };
-			}
-			nodeName = nodeName.replace( rbackslash, "" ).toLowerCase();
-
-			return function( elem ) {
-				return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-			};
+		PSEUDO: function(elem, match, i, array){
+			var name = match[1], filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || 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 ) {
+						return false;
+					}
+				}
+
+				return true;
+			} else {
+				Sizzle.error( "Syntax error, unrecognized expression: " + name );
+			}
 		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ expando ][ className ];
-			if ( !pattern ) {
-				pattern = classCache( className, new RegExp("(^|" + whitespace + ")" + className + "(" + whitespace + "|$)") );
-			}
-			return function( elem ) {
-				return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
-			};
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem, context ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
+		CHILD: function(elem, match){
+			var type = match[1], node = elem;
+			switch (type) {
+				case 'only':
+				case 'first':
+					while ( (node = node.previousSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+					if ( type === "first" ) { 
+						return true; 
+					}
+					node = elem;
+				case 'last':
+					while ( (node = node.nextSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
 					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.substr( result.length - check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.substr( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, argument, first, last ) {
-
-			if ( type === "nth" ) {
-				return function( elem ) {
-					var node, diff,
-						parent = elem.parentNode;
+				case 'nth':
+					var first = match[2], last = match[3];
 
 					if ( first === 1 && last === 0 ) {
 						return true;
 					}
-
-					if ( parent ) {
-						diff = 0;
+					
+					var doneName = match[0],
+						parent = elem.parentNode;
+	
+					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+						var count = 0;
 						for ( node = parent.firstChild; node; node = node.nextSibling ) {
 							if ( node.nodeType === 1 ) {
-								diff++;
-								if ( elem === node ) {
-									break;
-								}
+								node.nodeIndex = ++count;
 							}
+						} 
+						parent.sizcache = doneName;
+					}
+					
+					var diff = elem.nodeIndex - last;
+					if ( first === 0 ) {
+						return diff === 0;
+					} else {
+						return ( diff % first === 0 && diff / first >= 0 );
+					}
+			}
+		},
+		ID: function(elem, match){
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+		TAG: function(elem, match){
+			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
+		},
+		CLASS: function(elem, match){
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+		ATTR: function(elem, match){
+			var name = match[1],
+				result = Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value !== check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+		POS: function(elem, match, i, array){
+			var name = match[2], filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS;
+
+for ( var type in Expr.match ) {
+	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, function(all, num){
+		return "\\" + (num - 0 + 1);
+	}));
+}
+
+var makeArray = function(array, results) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+	
+	return array;
+};
+
+// 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, 0 )[0].nodeType;
+
+// Provide a fallback method if it does not work
+} catch(e){
+	makeArray = function(array, results) {
+		var ret = results || [];
+
+		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++ ) {
+					ret.push( array[i] );
+				}
+			} else {
+				for ( var i = 0; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+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;
+		}
+		return ret;
+	};
+} 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;
+		}
+		return ret;
+	};
+} 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);
+		bRange.setStart(b, 0);
+		bRange.setEnd(b, 0);
+		var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+}
+
+// Utility function for retreiving the text value of an array of DOM nodes
+function getText( 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 += 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();
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	// Inject it into the root element, check its status, and remove it quickly
+	var root = document.documentElement;
+	root.insertBefore( form, root.firstChild );
+
+	// The workaround has to do additional checks after a getElementById
+	// Which slows things down for other browsers (hence the branching)
+	if ( document.getElementById( id ) ) {
+		Expr.find.ID = function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
+			}
+		};
+
+		Expr.filter.ID = function(elem, match){
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+	root = form = null; // release memory in IE
+})();
+
+(function(){
+	// Check to see if the browser returns only elements
+	// when doing getElementsByTagName("*")
+
+	// Create a fake element
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	// Make sure no comments are found
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function(match, context){
+			var results = context.getElementsByTagName(match[1]);
+
+			// Filter out possible comments
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	// Check to see if an attribute returns normalized href attributes
+	div.innerHTML = "<a href='#'></a>";
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+		Expr.attrHandle.href = function(elem){
+			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>";
+
+		// 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;
+
+			// 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){}
+			}
+		
+			return oldSizzle(query, context, extra, seed);
+		};
+
+		for ( var prop in oldSizzle ) {
+			Sizzle[ prop ] = oldSizzle[ prop ];
+		}
+
+		div = null; // release memory in IE
+	})();
+}
+
+(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)
+	// 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 ) {
+		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 ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem.sizcache = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName.toLowerCase() === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem.sizcache = doneName;
+						elem.sizset = i;
+					}
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
 						}
-					}
-
-					// Incorporate the offset (or cast to NaN), then check against cycle size
-					diff -= last;
-					return diff === first || ( diff % first === 0 && diff / first >= 0 );
-				};
-			}
-
-			return function( elem ) {
-				var node = elem;
-
-				switch ( type ) {
-					case "only":
-					case "first":
-						while ( (node = node.previousSibling) ) {
-							if ( node.nodeType === 1 ) {
-								return false;
-							}
-						}
-
-						if ( type === "first" ) {
-							return true;
-						}
-
-						node = elem;
-
-						/* falls through */
-					case "last":
-						while ( (node = node.nextSibling) ) {
-							if ( node.nodeType === 1 ) {
-								return false;
-							}
-						}
-
-						return true;
-				}
-			};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-			//   not comment, processing instructions, or others
-			// Thanks to Diego Perini for the nodeName shortcut
-			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
-			var nodeType;
-			elem = elem.firstChild;
-			while ( elem ) {
-				if ( elem.nodeName > "@" || (nodeType = elem.nodeType) === 3 || nodeType === 4 ) {
-					return false;
-				}
-				elem = elem.nextSibling;
-			}
-			return true;
-		},
-
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"text": function( elem ) {
-			var type, attr;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" &&
-				(type = elem.type) === "text" &&
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === type );
-		},
-
-		// Input types
-		"radio": createInputPseudo("radio"),
-		"checkbox": createInputPseudo("checkbox"),
-		"file": createInputPseudo("file"),
-		"password": createInputPseudo("password"),
-		"image": createInputPseudo("image"),
-
-		"submit": createButtonPseudo("submit"),
-		"reset": createButtonPseudo("reset"),
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"focus": function( elem ) {
-			var doc = elem.ownerDocument;
-			return elem === doc.activeElement && (!doc.hasFocus || doc.hasFocus()) && !!(elem.type || elem.href);
-		},
-
-		"active": function( elem ) {
-			return elem === elem.ownerDocument.activeElement;
-		},
-
-		// Positional types
-		"first": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			for ( var i = 0; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			for ( var i = 1; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			for ( var i = argument < 0 ? argument + length : argument; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			for ( var i = argument < 0 ? argument + length : argument; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-function siblingCheck( a, b, ret ) {
-	if ( a === b ) {
-		return ret;
-	}
-
-	var cur = a.nextSibling;
-
-	while ( cur ) {
-		if ( cur === b ) {
-			return -1;
-		}
-
-		cur = cur.nextSibling;
-	}
-
-	return 1;
-}
-
-sortOrder = docElem.compareDocumentPosition ?
-	function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		return ( !a.compareDocumentPosition || !b.compareDocumentPosition ?
-			a.compareDocumentPosition :
-			a.compareDocumentPosition(b) & 4
-		) ? -1 : 1;
-	} :
-	function( a, b ) {
-		// The nodes are identical, we can exit early
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Fallback to using sourceIndex (in IE) if it's available on both nodes
-		} else if ( a.sourceIndex && b.sourceIndex ) {
-			return a.sourceIndex - b.sourceIndex;
-		}
-
-		var al, bl,
-			ap = [],
-			bp = [],
-			aup = a.parentNode,
-			bup = b.parentNode,
-			cur = aup;
-
-		// If the nodes are siblings (or identical) we can do a quick check
-		if ( aup === bup ) {
-			return siblingCheck( a, b );
-
-		// If no parents were found then the nodes are disconnected
-		} else if ( !aup ) {
-			return -1;
-
-		} else if ( !bup ) {
-			return 1;
-		}
-
-		// Otherwise they're somewhere else in the tree so we need
-		// to build up a full list of the parentNodes for comparison
-		while ( cur ) {
-			ap.unshift( cur );
-			cur = cur.parentNode;
-		}
-
-		cur = bup;
-
-		while ( cur ) {
-			bp.unshift( cur );
-			cur = cur.parentNode;
-		}
-
-		al = ap.length;
-		bl = bp.length;
-
-		// Start walking down the tree looking for a discrepancy
-		for ( var i = 0; i < al && i < bl; i++ ) {
-			if ( ap[i] !== bp[i] ) {
-				return siblingCheck( ap[i], bp[i] );
-			}
-		}
-
-		// We ended someplace up the tree so do a sibling check
-		return i === al ?
-			siblingCheck( a, bp[i], -1 ) :
-			siblingCheck( ap[i], b, 1 );
-	};
-
-// Always assume the presence of duplicates if sort doesn't
-// pass them to our comparison function (as in Google Chrome).
-[0, 0].sort( sortOrder );
-baseHasDuplicate = !hasDuplicate;
-
-// Document sorting and removing duplicates
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		i = 1;
-
-	hasDuplicate = baseHasDuplicate;
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		for ( ; (elem = results[i]); i++ ) {
-			if ( elem === results[ i - 1 ] ) {
-				results.splice( i--, 1 );
-			}
-		}
-	}
-
-	return results;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type, soFar, groups, preFilters,
-		cached = tokenCache[ expando ][ selector ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				soFar = soFar.slice( match[0].length );
-			}
-			groups.push( tokens = [] );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			tokens.push( matched = new Token( match.shift() ) );
-			soFar = soFar.slice( matched.length );
-
-			// Cast descendant combinators to space
-			matched.type = match[0].replace( rtrim, " " );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				// The last two arguments here are (context, xml) for backCompat
-				(match = preFilters[ type ]( match, document, true ))) ) {
-
-				tokens.push( matched = new Token( match.shift() ) );
-				soFar = soFar.slice( matched.length );
-				matched.type = type;
-				matched.matches = match;
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && combinator.dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( checkNonElements || elem.nodeType === 1  ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( !xml ) {
-				var cache,
-					dirkey = dirruns + " " + doneName + " ",
-					cachedkey = dirkey + cachedruns;
-				while ( (elem = elem[ dir ]) ) {
-					if ( checkNonElements || elem.nodeType === 1 ) {
-						if ( (cache = elem[ expando ]) === cachedkey ) {
-							return elem.sizset;
-						} else if ( typeof cache === "string" && cache.indexOf(dirkey) === 0 ) {
-							if ( elem.sizset ) {
-								return elem;
-							}
-						} else {
-							elem[ expando ] = cachedkey;
-							if ( matcher( elem, context, xml ) ) {
-								elem.sizset = true;
-								return elem;
-							}
-							elem.sizset = false;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( checkNonElements || elem.nodeType === 1 ) {
-						if ( matcher( elem, context, xml ) ) {
-							return elem;
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		// Positional selectors apply to seed elements, so it is invalid to follow them with relative ones
-		if ( seed && postFinder ) {
-			return;
-		}
-
-		var i, elem, postFilterIn,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [], seed ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			postFilterIn = condense( matcherOut, postMap );
-			postFilter( postFilterIn, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = postFilterIn.length;
-			while ( i-- ) {
-				if ( (elem = postFilterIn[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		// Keep seed and results synchronized
-		if ( seed ) {
-			// Ignore postFinder because it can't coexist with seed
-			i = preFilter && matcherOut.length;
-			while ( i-- ) {
-				if ( (elem = matcherOut[i]) ) {
-					seed[ preMap[i] ] = !(results[ preMap[i] ] = elem);
-				}
-			}
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ];
-		} else {
-			// The concatenated values are (context, xml) for backCompat
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
 						break;
 					}
 				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && tokens.slice( 0, i - 1 ).join("").replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && tokens.join("")
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
 }
 
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, expandContext ) {
-			var elem, j, matcher,
-				setMatched = [],
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				outermost = expandContext != null,
-				contextBackup = outermostContext,
-				// We must always have either seed elements or context
-				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
-				// Nested matchers should use non-integer dirruns
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.E);
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-				cachedruns = superMatcher.el;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			for ( ; (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					for ( j = 0; (matcher = elementMatchers[j]); j++ ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-						cachedruns = ++superMatcher.el;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				for ( j = 0; (matcher = setMatchers[j]); j++ ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	superMatcher.el = 0;
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ expando ][ selector ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
-		}
-		i = group.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-	}
-	return cached;
+var contains = document.compareDocumentPosition ? function(a, b){
+	return !!(a.compareDocumentPosition(b) & 16);
+} : function(a, b){
+	return a !== b && (a.contains ? a.contains(b) : true);
 };
 
-function multipleContexts( selector, contexts, results, seed ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results, seed );
-	}
-	return results;
-}
-
-function select( selector, context, results, seed, xml ) {
-	var i, tokens, token, type, find,
-		match = tokenize( selector ),
-		j = match.length;
-
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
-
-			// Take a shortcut and set the context if the root selector is an ID
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-					context.nodeType === 9 && !xml &&
-					Expr.relative[ tokens[1].type ] ) {
-
-				context = Expr.find["ID"]( token.matches[0].replace( rbackslash, "" ), context, xml )[0];
-				if ( !context ) {
-					return results;
-				}
-
-				selector = selector.slice( tokens.shift().length );
-			}
-
-			// Fetch a seed set for right-to-left matching
-			for ( i = matchExpr["POS"].test( selector ) ? -1 : tokens.length - 1; i >= 0; i-- ) {
-				token = tokens[i];
-
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( rbackslash, "" ),
-						rsibling.test( tokens[0].type ) && context.parentNode || context,
-						xml
-					)) ) {
-
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && tokens.join("");
-						if ( !selector ) {
-							push.apply( results, slice.call( seed, 0 ) );
-							return results;
-						}
-
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function
-	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
-		seed,
-		context,
-		xml,
-		results,
-		rsibling.test( selector )
-	);
-	return results;
-}
-
-if ( document.querySelectorAll ) {
-	(function() {
-		var disconnectedMatch,
-			oldSelect = select,
-			rescape = /'|\\/g,
-			rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
-
-			// qSa(:focus) reports false when true (Chrome 21),
-			// A support test would require too much code (would include document ready)
-			rbuggyQSA = [":focus"],
-
-			// matchesSelector(:focus) reports false when true (Chrome 21),
-			// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-			// A support test would require too much code (would include document ready)
-			// just skip matchesSelector for :active
-			rbuggyMatches = [ ":active", ":focus" ],
-			matches = docElem.matchesSelector ||
-				docElem.mozMatchesSelector ||
-				docElem.webkitMatchesSelector ||
-				docElem.oMatchesSelector ||
-				docElem.msMatchesSelector;
-
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explictly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "<select><option selected=''></option></select>";
-
-			// IE8 - Some boolean attributes are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here (do not put tests after this one)
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-
-			// Opera 10-12/IE9 - ^= $= *= and empty values
-			// Should not select anything
-			div.innerHTML = "<p test=''></p>";
-			if ( div.querySelectorAll("[test^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here (do not put tests after this one)
-			div.innerHTML = "<input type='hidden'/>";
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push(":enabled", ":disabled");
-			}
-		});
-
-		// rbuggyQSA always contains :focus, so no need for a length check
-		rbuggyQSA = /* rbuggyQSA.length && */ new RegExp( rbuggyQSA.join("|") );
-
-		select = function( selector, context, results, seed, xml ) {
-			// Only use querySelectorAll when not filtering,
-			// when this is not xml,
-			// and when no QSA bugs apply
-			if ( !seed && !xml && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-				var groups, i,
-					old = true,
-					nid = expando,
-					newContext = context,
-					newSelector = context.nodeType === 9 && selector;
-
-				// qSA works strangely on Element-rooted queries
-				// We can work around this by specifying an extra ID on the root
-				// and working up from there (Thanks to Andrew Dupont for the technique)
-				// IE 8 doesn't work on object elements
-				if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-					groups = tokenize( selector );
-
-					if ( (old = context.getAttribute("id")) ) {
-						nid = old.replace( rescape, "\\$&" );
-					} else {
-						context.setAttribute( "id", nid );
-					}
-					nid = "[id='" + nid + "'] ";
-
-					i = groups.length;
-					while ( i-- ) {
-						groups[i] = nid + groups[i].join("");
-					}
-					newContext = rsibling.test( selector ) && context.parentNode || context;
-					newSelector = groups.join(",");
-				}
-
-				if ( newSelector ) {
-					try {
-						push.apply( results, slice.call( newContext.querySelectorAll(
-							newSelector
-						), 0 ) );
-						return results;
-					} catch(qsaError) {
-					} finally {
-						if ( !old ) {
-							context.removeAttribute("id");
-						}
-					}
-				}
-			}
-
-			return oldSelect( selector, context, results, seed, xml );
-		};
-
-		if ( matches ) {
-			assert(function( div ) {
-				// Check to see if it's possible to do matchesSelector
-				// on a disconnected node (IE 9)
-				disconnectedMatch = matches.call( div, "div" );
-
-				// This should fail with an exception
-				// Gecko does not error, returns false instead
-				try {
-					matches.call( div, "[test!='']:sizzle" );
-					rbuggyMatches.push( "!=", pseudos );
-				} catch ( e ) {}
-			});
-
-			// rbuggyMatches always contains :active and :focus, so no need for a length check
-			rbuggyMatches = /* rbuggyMatches.length && */ new RegExp( rbuggyMatches.join("|") );
-
-			Sizzle.matchesSelector = function( elem, expr ) {
-				// Make sure that attribute selectors are quoted
-				expr = expr.replace( rattributeQuotes, "='$1']" );
-
-				// rbuggyMatches always contains :active, so no need for an existence check
-				if ( !isXML( elem ) && !rbuggyMatches.test( expr ) && (!rbuggyQSA || !rbuggyQSA.test( expr )) ) {
-					try {
-						var ret = matches.call( elem, expr );
-
-						// IE 9's matchesSelector returns false on disconnected nodes
-						if ( ret || disconnectedMatch ||
-								// As well, disconnected nodes are said to be in a document
-								// fragment in IE 9
-								elem.document && elem.document.nodeType !== 11 ) {
-							return ret;
-						}
-					} catch(e) {}
-				}
-
-				return Sizzle( expr, null, null, [ elem ] ).length > 0;
-			};
-		}
-	})();
-}
-
-// Deprecated
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Back-compat
-function setFilters() {}
-Expr.filters = setFilters.prototype = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-// Override sizzle attribute retrieval
-Sizzle.attr = jQuery.attr;
+var 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){
+	var tmpSet = [], later = "", match,
+		root = context.nodeType ? [context] : context;
+
+	// Position selectors must be done after the filter
+	// And so must :not(positional) so we move all PSEUDOs to the end
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet );
+	}
+
+	return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
 jQuery.find = Sizzle;
 jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
+jQuery.expr[":"] = jQuery.expr.filters;
 jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})( window );
+jQuery.text = getText;
+jQuery.isXMLDoc = isXML;
+jQuery.contains = contains;
+
+return;
+
+window.Sizzle = Sizzle;
+
+})();
 var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	isSimple = /^.[^:#\[\.,]*$/,
-	rneedsContext = jQuery.expr.match.needsContext,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
+	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
+	// Note: This RegExp should be improved, or likely pulled from Sizzle
+	rmultiselector = /,/,
+	slice = Array.prototype.slice;
+
+// Implement the identical functionality for filter and not
+var winnow = function( elements, qualifier, keep ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return !!qualifier.call( elem, i, elem ) === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return (elem === qualifier) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem, i ) {
+		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
+	});
+};
 
 jQuery.fn.extend({
 	find: function( selector ) {
-		var i, l, length, n, r, ret,
-			self = this;
-
-		if ( typeof selector !== "string" ) {
-			return jQuery( selector ).filter(function() {
-				for ( i = 0, l = self.length; i < l; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			});
-		}
-
-		ret = this.pushStack( "", "find", selector );
-
-		for ( i = 0, l = this.length; i < l; i++ ) {
+		var ret = this.pushStack( "", "find", selector ), length = 0;
+
+		for ( var i = 0, l = this.length; i < l; i++ ) {
 			length = ret.length;
 			jQuery.find( selector, this[i], ret );
@@ -5374,6 +3732,6 @@
 			if ( i > 0 ) {
 				// Make sure that the results are unique
-				for ( n = length; n < ret.length; n++ ) {
-					for ( r = 0; r < length; r++ ) {
+				for ( var n = length; n < ret.length; n++ ) {
+					for ( var r = 0; r < length; r++ ) {
 						if ( ret[r] === ret[n] ) {
 							ret.splice(n--, 1);
@@ -5389,10 +3747,7 @@
 
 	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
+		var targets = jQuery( target );
 		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
+			for ( var i = 0, l = targets.length; i < l; i++ ) {
 				if ( jQuery.contains( this, targets[i] ) ) {
 					return true;
@@ -5409,56 +3764,63 @@
 		return this.pushStack( winnow(this, selector, true), "filter", selector );
 	},
-
+	
 	is: function( selector ) {
-		return !!selector && (
-			typeof selector === "string" ?
-				// If this is a positional/relative selector, check membership in the returned set
-				// so $("p:first").is("p:last") won't return true for a doc with two "p".
-				rneedsContext.test( selector ) ?
-					jQuery( selector, this.context ).index( this[0] ) >= 0 :
-					jQuery.filter( selector, this ).length > 0 :
-				this.filter( selector ).length > 0 );
+		return !!selector && jQuery.filter( selector, this ).length > 0;
 	},
 
 	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			ret = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			cur = this[i];
-
-			while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
-					ret.push( cur );
-					break;
+		if ( jQuery.isArray( selectors ) ) {
+			var ret = [], cur = this[0], match, matches = {}, selector;
+
+			if ( cur && selectors.length ) {
+				for ( var i = 0, l = selectors.length; i < l; i++ ) {
+					selector = selectors[i];
+
+					if ( !matches[selector] ) {
+						matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
+							jQuery( selector, context || this.context ) :
+							selector;
+					}
+				}
+
+				while ( cur && cur.ownerDocument && cur !== context ) {
+					for ( selector in matches ) {
+						match = matches[selector];
+
+						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
+							ret.push({ selector: selector, elem: cur });
+							delete matches[selector];
+						}
+					}
+					cur = cur.parentNode;
+				}
+			}
+
+			return ret;
+		}
+
+		var pos = jQuery.expr.match.POS.test( selectors ) ? 
+			jQuery( selectors, context || this.context ) : null;
+
+		return this.map(function( i, cur ) {
+			while ( cur && cur.ownerDocument && cur !== context ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
+					return cur;
 				}
 				cur = cur.parentNode;
 			}
-		}
-
-		ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
-
-		return this.pushStack( ret, "closest", selectors );
-	},
-
+			return null;
+		});
+	},
+	
 	// Determine the position of an element within
 	// the matched set of elements
 	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
+		if ( !elem || typeof elem === "string" ) {
+			return jQuery.inArray( this[0],
+				// If it receives a string, the selector is used
+				// If it receives nothing, the siblings are used
+				elem ? jQuery( elem ) : this.parent().children() );
+		}
 		// Locate the position of the desired element
 		return jQuery.inArray(
@@ -5469,6 +3831,6 @@
 	add: function( selector, context ) {
 		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
+				jQuery( selector, context || this.context ) :
+				jQuery.makeArray( selector ),
 			all = jQuery.merge( this.get(), set );
 
@@ -5478,12 +3840,8 @@
 	},
 
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
+	andSelf: function() {
+		return this.add( this.prevObject );
 	}
 });
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
 
 // A painfully simple check to see if an element is disconnected
@@ -5493,12 +3851,4 @@
 }
 
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
 jQuery.each({
 	parent: function( elem ) {
@@ -5513,8 +3863,8 @@
 	},
 	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
+		return jQuery.nth( elem, 2, "nextSibling" );
 	},
 	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
+		return jQuery.nth( elem, 2, "previousSibling" );
 	},
 	nextAll: function( elem ) {
@@ -5531,5 +3881,5 @@
 	},
 	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
+		return jQuery.sibling( elem.parentNode.firstChild, elem );
 	},
 	children: function( elem ) {
@@ -5539,10 +3889,10 @@
 		return jQuery.nodeName( elem, "iframe" ) ?
 			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
+			jQuery.makeArray( elem.childNodes );
 	}
 }, function( name, fn ) {
 	jQuery.fn[ name ] = function( until, selector ) {
 		var ret = jQuery.map( this, fn, until );
-
+		
 		if ( !runtil.test( name ) ) {
 			selector = until;
@@ -5553,11 +3903,11 @@
 		}
 
-		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
-
-		if ( this.length > 1 && rparentsprev.test( name ) ) {
+		ret = this.length > 1 ? jQuery.unique( ret ) : ret;
+
+		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
 			ret = ret.reverse();
 		}
 
-		return this.pushStack( ret, name, core_slice.call( arguments ).join(",") );
+		return this.pushStack( ret, name, slice.call(arguments).join(",") );
 	};
 });
@@ -5569,13 +3919,9 @@
 		}
 
-		return elems.length === 1 ?
-			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
-			jQuery.find.matches(expr, elems);
-	},
-
+		return jQuery.find.matches(expr, elems);
+	},
+	
 	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
+		var matched = [], cur = elem[dir];
 		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
 			if ( cur.nodeType === 1 ) {
@@ -5587,4 +3933,17 @@
 	},
 
+	nth: function( cur, result, dir, elem ) {
+		result = result || 1;
+		var num = 0;
+
+		for ( ; cur; cur = cur[dir] ) {
+			if ( cur.nodeType === 1 && ++num === result ) {
+				break;
+			}
+		}
+
+		return cur;
+	},
+
 	sibling: function( n, elem ) {
 		var r = [];
@@ -5599,69 +3958,18 @@
 	}
 });
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
-
-	// Can't pass null or undefined to indexOf in Firefox 4
-	// Set to 0 to skip string check
-	qualifier = qualifier || 0;
-
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			var retVal = !!qualifier.call( elem, i, elem );
-			return retVal === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return ( elem === qualifier ) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem, i ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
-	});
-}
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-	safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
+var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
+	rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g,
+	rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
 	rtagName = /<([\w:]+)/,
 	rtbody = /<tbody/i,
 	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	rnocache = /<(?:script|object|embed|option|style)/i,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rcheckableType = /^(?:checkbox|radio)$/,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /\/(java|ecma)script/i,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,
+	rnocache = /<script|<object|<embed|<option|<style/i,
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,  // checked="checked" or checked (html5)
+	fcloseTag = function( all, front, tag ) {
+		return rselfClosing.test( tag ) ?
+			all :
+			front + "></" + tag + ">";
+	},
 	wrapMap = {
 		option: [ 1, "<select multiple='multiple'>", "</select>" ],
@@ -5673,7 +3981,5 @@
 		area: [ 1, "<map>", "</map>" ],
 		_default: [ 0, "", "" ]
-	},
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
+	};
 
 wrapMap.optgroup = wrapMap.option;
@@ -5681,17 +3987,23 @@
 wrapMap.th = wrapMap.td;
 
-// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-// unless wrapped in a div with non-breaking characters in front of it.
+// IE can't serialize <link> and <script> tags normally
 if ( !jQuery.support.htmlSerialize ) {
-	wrapMap._default = [ 1, "X<div>", "</div>" ];
+	wrapMap._default = [ 1, "div<div>", "</div>" ];
 }
 
 jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
+	text: function( text ) {
+		if ( jQuery.isFunction(text) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.text( text.call(this, i, self.text()) );
+			});
+		}
+
+		if ( typeof text !== "object" && text !== undefined ) {
+			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+		}
+
+		return jQuery.text( this );
 	},
 
@@ -5719,5 +4031,5 @@
 
 				return elem;
-			}).append( this );
+			}).append(this);
 		}
 
@@ -5733,6 +4045,5 @@
 
 		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
+			var self = jQuery( this ), contents = self.contents();
 
 			if ( contents.length ) {
@@ -5746,8 +4057,6 @@
 
 	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
+		return this.each(function() {
+			jQuery( this ).wrapAll( html );
 		});
 	},
@@ -5763,5 +4072,5 @@
 	append: function() {
 		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 ) {
+			if ( this.nodeType === 1 ) {
 				this.appendChild( elem );
 			}
@@ -5771,5 +4080,5 @@
 	prepend: function() {
 		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 ) {
+			if ( this.nodeType === 1 ) {
 				this.insertBefore( elem, this.firstChild );
 			}
@@ -5778,35 +4087,30 @@
 
 	before: function() {
-		if ( !isDisconnected( this[0] ) ) {
+		if ( this[0] && this[0].parentNode ) {
 			return this.domManip(arguments, false, function( elem ) {
 				this.parentNode.insertBefore( elem, this );
 			});
-		}
-
-		if ( arguments.length ) {
-			var set = jQuery.clean( arguments );
-			return this.pushStack( jQuery.merge( set, this ), "before", this.selector );
+		} else if ( arguments.length ) {
+			var set = jQuery(arguments[0]);
+			set.push.apply( set, this.toArray() );
+			return this.pushStack( set, "before", arguments );
 		}
 	},
 
 	after: function() {
-		if ( !isDisconnected( this[0] ) ) {
+		if ( this[0] && this[0].parentNode ) {
 			return this.domManip(arguments, false, function( elem ) {
 				this.parentNode.insertBefore( elem, this.nextSibling );
 			});
-		}
-
-		if ( arguments.length ) {
-			var set = jQuery.clean( arguments );
-			return this.pushStack( jQuery.merge( this, set ), "after", this.selector );
-		}
-	},
-
+		} else if ( arguments.length ) {
+			var set = this.pushStack( this, "after", arguments );
+			set.push.apply( set, jQuery(arguments[0]).toArray() );
+			return set;
+		}
+	},
+	
 	// keepData is for internal use only--do not document
 	remove: function( selector, keepData ) {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
 			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
 				if ( !keepData && elem.nodeType === 1 ) {
@@ -5816,17 +4120,14 @@
 
 				if ( elem.parentNode ) {
-					elem.parentNode.removeChild( elem );
-				}
-			}
-		}
-
+					 elem.parentNode.removeChild( elem );
+				}
+			}
+		}
+		
 		return this;
 	},
 
 	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
 			// Remove element nodes and prevent memory leaks
 			if ( elem.nodeType === 1 ) {
@@ -5839,61 +4140,90 @@
 			}
 		}
-
+		
 		return this;
 	},
 
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+	clone: function( events ) {
+		// Do the clone
+		var ret = this.map(function() {
+			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
+				// IE copies events bound via attachEvent when
+				// using cloneNode. Calling detachEvent on the
+				// clone will also remove the events from the orignal
+				// In order to get around this, we use innerHTML.
+				// Unfortunately, this means some modifications to
+				// attributes in IE that are actually only stored
+				// as properties will not be copied (such as the
+				// the name attribute on an input).
+				var html = this.outerHTML, ownerDocument = this.ownerDocument;
+				if ( !html ) {
+					var div = ownerDocument.createElement("div");
+					div.appendChild( this.cloneNode(true) );
+					html = div.innerHTML;
+				}
+
+				return jQuery.clean([html.replace(rinlinejQuery, "")
+					// Handle the case in IE 8 where action=/test/> self-closes a tag
+					.replace(/=([^="'>\s]+\/)>/g, '="$1">')
+					.replace(rleadingWhitespace, "")], ownerDocument)[0];
+			} else {
+				return this.cloneNode(true);
+			}
 		});
+
+		// Copy the events from the original to the clone
+		if ( events === true ) {
+			cloneCopyEvent( this, ret );
+			cloneCopyEvent( this.find("*"), ret.find("*") );
+		}
+
+		// Return the cloned set
+		return ret;
 	},
 
 	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( elem.getElementsByTagName( "*" ) );
-							elem.innerHTML = value;
-						}
+		if ( value === undefined ) {
+			return this[0] && this[0].nodeType === 1 ?
+				this[0].innerHTML.replace(rinlinejQuery, "") :
+				null;
+
+		// See if we can take a shortcut and just use innerHTML
+		} else if ( typeof value === "string" && !rnocache.test( value ) &&
+			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
+			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
+
+			value = value.replace(rxhtmlTag, fcloseTag);
+
+			try {
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					// Remove element nodes and prevent memory leaks
+					if ( this[i].nodeType === 1 ) {
+						jQuery.cleanData( this[i].getElementsByTagName("*") );
+						this[i].innerHTML = value;
 					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
+				}
+
+			// If using innerHTML throws an exception, use the fallback method
+			} catch(e) {
 				this.empty().append( value );
 			}
-		}, null, value, arguments.length );
+
+		} else if ( jQuery.isFunction( value ) ) {
+			this.each(function(i){
+				var self = jQuery(this), old = self.html();
+				self.empty().append(function(){
+					return value.call( this, i, old );
+				});
+			});
+
+		} else {
+			this.empty().append( value );
+		}
+
+		return this;
 	},
 
 	replaceWith: function( value ) {
-		if ( !isDisconnected( this[0] ) ) {
+		if ( this[0] && this[0].parentNode ) {
 			// Make sure that the elements are removed from the DOM before they are inserted
 			// this can help fix replacing a parent with child elements
@@ -5906,12 +4236,11 @@
 
 			if ( typeof value !== "string" ) {
-				value = jQuery( value ).detach();
+				value = jQuery(value).detach();
 			}
 
 			return this.each(function() {
-				var next = this.nextSibling,
-					parent = this.parentNode;
-
-				jQuery( this ).remove();
+				var next = this.nextSibling, parent = this.parentNode;
+
+				jQuery(this).remove();
 
 				if ( next ) {
@@ -5921,9 +4250,7 @@
 				}
 			});
-		}
-
-		return this.length ?
-			this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
-			this;
+		} else {
+			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+		}
 	},
 
@@ -5933,18 +4260,10 @@
 
 	domManip: function( args, table, callback ) {
-
-		// Flatten any nested arrays
-		args = [].concat.apply( [], args );
-
-		var results, first, fragment, iNoClone,
-			i = 0,
-			value = args[0],
-			scripts = [],
-			l = this.length;
+		var results, first, value = args[0], scripts = [], fragment, parent;
 
 		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( !jQuery.support.checkClone && l > 1 && typeof value === "string" && rchecked.test( value ) ) {
+		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
 			return this.each(function() {
-				jQuery(this).domManip( args, table, callback );
+				jQuery(this).domManip( args, table, callback, true );
 			});
 		}
@@ -5953,5 +4272,5 @@
 			return this.each(function(i) {
 				var self = jQuery(this);
-				args[0] = value.call( this, i, table ? self.html() : undefined );
+				args[0] = value.call(this, i, table ? self.html() : undefined);
 				self.domManip( args, table, callback );
 			});
@@ -5959,10 +4278,20 @@
 
 		if ( this[0] ) {
-			results = jQuery.buildFragment( args, this, scripts );
+			parent = value && value.parentNode;
+
+			// If we're in a fragment, just use that instead of building a new one
+			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
+				results = { fragment: parent };
+
+			} else {
+				results = buildFragment( args, this, scripts );
+			}
+			
 			fragment = results.fragment;
-			first = fragment.firstChild;
-
+			
 			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
+				first = fragment = fragment.firstChild;
+			} else {
+				first = fragment.firstChild;
 			}
 
@@ -5970,194 +4299,86 @@
 				table = table && jQuery.nodeName( first, "tr" );
 
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				// Fragments from the fragment cache must always be cloned and never used in place.
-				for ( iNoClone = results.cacheable || l - 1; i < l; i++ ) {
+				for ( var i = 0, l = this.length; i < l; i++ ) {
 					callback.call(
-						table && jQuery.nodeName( this[i], "table" ) ?
-							findOrAppend( this[i], "tbody" ) :
+						table ?
+							root(this[i], first) :
 							this[i],
-						i === iNoClone ?
-							fragment :
-							jQuery.clone( fragment, true, true )
+						i > 0 || results.cacheable || this.length > 1  ?
+							fragment.cloneNode(true) :
+							fragment
 					);
 				}
 			}
 
-			// Fix #11809: Avoid leaking memory
-			fragment = first = null;
-
 			if ( scripts.length ) {
-				jQuery.each( scripts, function( i, elem ) {
-					if ( elem.src ) {
-						if ( jQuery.ajax ) {
-							jQuery.ajax({
-								url: elem.src,
-								type: "GET",
-								dataType: "script",
-								async: false,
-								global: false,
-								"throws": true
-							});
-						} else {
-							jQuery.error("no ajax");
-						}
-					} else {
-						jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "" ) );
-					}
-
-					if ( elem.parentNode ) {
-						elem.parentNode.removeChild( elem );
-					}
-				});
+				jQuery.each( scripts, evalScript );
 			}
 		}
 
 		return this;
+
+		function root( elem, cur ) {
+			return jQuery.nodeName(elem, "table") ?
+				(elem.getElementsByTagName("tbody")[0] ||
+				elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+				elem;
+		}
 	}
 });
 
-function findOrAppend( elem, tag ) {
-	return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) );
+function cloneCopyEvent(orig, ret) {
+	var i = 0;
+
+	ret.each(function() {
+		if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
+			return;
+		}
+
+		var oldData = jQuery.data( orig[i++] ), curData = jQuery.data( this, oldData ), events = oldData && oldData.events;
+
+		if ( events ) {
+			delete curData.handle;
+			curData.events = {};
+
+			for ( var type in events ) {
+				for ( var handler in events[ type ] ) {
+					jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
+				}
+			}
+		}
+	});
 }
 
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function cloneFixAttributes( src, dest ) {
-	var nodeName;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// clearAttributes removes the attributes, which we don't want,
-	// but also removes the attachEvent events, which we *do* want
-	if ( dest.clearAttributes ) {
-		dest.clearAttributes();
-	}
-
-	// mergeAttributes, in contrast, only merges back on the
-	// original attributes, not the events
-	if ( dest.mergeAttributes ) {
-		dest.mergeAttributes( src );
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	if ( nodeName === "object" ) {
-		// IE6-10 improperly clones children of object elements using classid.
-		// IE10 throws NoModificationAllowedError if parent is null, #12132.
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( jQuery.support.html5Clone && (src.innerHTML && !jQuery.trim(dest.innerHTML)) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-
-	// IE blanks contents when cloning scripts
-	} else if ( nodeName === "script" && dest.text !== src.text ) {
-		dest.text = src.text;
-	}
-
-	// Event data gets referenced instead of copied if the expando
-	// gets copied too
-	dest.removeAttribute( jQuery.expando );
-}
-
-jQuery.buildFragment = function( args, context, scripts ) {
-	var fragment, cacheable, cachehit,
-		first = args[ 0 ];
-
-	// Set context from what may come in as undefined or a jQuery collection or a node
-	// Updated to fix #12266 where accessing context[0] could throw an exception in IE9/10 &
-	// also doubles as fix for #8950 where plain objects caused createDocumentFragment exception
-	context = context || document;
-	context = !context.nodeType && context[0] || context;
-	context = context.ownerDocument || context;
-
-	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
+function buildFragment( args, nodes, scripts ) {
+	var fragment, cacheable, cacheresults,
+		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
+
+	// Only cache "small" (1/2 KB) strings that are associated with the main document
 	// Cloning options loses the selected state, so don't cache them
 	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
 	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
-	// Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501
-	if ( args.length === 1 && typeof first === "string" && first.length < 512 && context === document &&
-		first.charAt(0) === "<" && !rnocache.test( first ) &&
-		(jQuery.support.checkClone || !rchecked.test( first )) &&
-		(jQuery.support.html5Clone || !rnoshimcache.test( first )) ) {
-
-		// Mark cacheable and look for a hit
+	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
+		!rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
+
 		cacheable = true;
-		fragment = jQuery.fragments[ first ];
-		cachehit = fragment !== undefined;
+		cacheresults = jQuery.fragments[ args[0] ];
+		if ( cacheresults ) {
+			if ( cacheresults !== 1 ) {
+				fragment = cacheresults;
+			}
+		}
 	}
 
 	if ( !fragment ) {
-		fragment = context.createDocumentFragment();
-		jQuery.clean( args, context, fragment, scripts );
-
-		// Update the cache, but only store false
-		// unless this is a second parsing of the same content
-		if ( cacheable ) {
-			jQuery.fragments[ first ] = cachehit && fragment;
-		}
+		fragment = doc.createDocumentFragment();
+		jQuery.clean( args, doc, fragment, scripts );
+	}
+
+	if ( cacheable ) {
+		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
 	}
 
 	return { fragment: fragment, cacheable: cacheable };
-};
+}
 
 jQuery.fragments = {};
@@ -6171,21 +4392,18 @@
 }, function( name, original ) {
 	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			l = insert.length,
+		var ret = [], insert = jQuery( selector ),
 			parent = this.length === 1 && this[0].parentNode;
-
-		if ( (parent == null || parent && parent.nodeType === 11 && parent.childNodes.length === 1) && l === 1 ) {
+		
+		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
 			insert[ original ]( this[0] );
 			return this;
+			
 		} else {
-			for ( ; i < l; i++ ) {
-				elems = ( i > 0 ? this.clone(true) : this ).get();
-				jQuery( insert[i] )[ original ]( elems );
+			for ( var i = 0, l = insert.length; i < l; i++ ) {
+				var elems = (i > 0 ? this.clone(true) : this).get();
+				jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
 				ret = ret.concat( elems );
 			}
-
+		
 			return this.pushStack( ret, name, insert.selector );
 		}
@@ -6193,96 +4411,16 @@
 });
 
-function getAll( elem ) {
-	if ( typeof elem.getElementsByTagName !== "undefined" ) {
-		return elem.getElementsByTagName( "*" );
-
-	} else if ( typeof elem.querySelectorAll !== "undefined" ) {
-		return elem.querySelectorAll( "*" );
-
-	} else {
-		return [];
-	}
-}
-
-// Used in clean, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-
 jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var srcElements,
-			destElements,
-			i,
-			clone;
-
-		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-			// IE copies events bound via attachEvent when using cloneNode.
-			// Calling detachEvent on the clone will also remove the events
-			// from the original. In order to get around this, we use some
-			// proprietary methods to clear the events. Thanks to MooTools
-			// guys for this hotness.
-
-			cloneFixAttributes( elem, clone );
-
-			// Using Sizzle here is crazy slow, so we use getElementsByTagName instead
-			srcElements = getAll( elem );
-			destElements = getAll( clone );
-
-			// Weird iteration because IE will replace the length property
-			// with an element if you are cloning the body and one of the
-			// elements on the page has a name or id of "length"
-			for ( i = 0; srcElements[i]; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					cloneFixAttributes( srcElements[i], destElements[i] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			cloneCopyEvent( elem, clone );
-
-			if ( deepDataAndEvents ) {
-				srcElements = getAll( elem );
-				destElements = getAll( clone );
-
-				for ( i = 0; srcElements[i]; ++i ) {
-					cloneCopyEvent( srcElements[i], destElements[i] );
-				}
-			}
-		}
-
-		srcElements = destElements = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
 	clean: function( elems, context, fragment, scripts ) {
-		var i, j, elem, tag, wrap, depth, div, hasBody, tbody, len, handleScript, jsTags,
-			safe = context === document && safeFragment,
-			ret = [];
-
-		// Ensure that context is a document
-		if ( !context || typeof context.createDocumentFragment === "undefined" ) {
-			context = document;
-		}
-
-		// Use the already-created safe fragment if context permits
-		for ( i = 0; (elem = elems[i]) != null; i++ ) {
+		context = context || document;
+
+		// !context.createElement fails in IE with an error but returns typeof 'object'
+		if ( typeof context.createElement === "undefined" ) {
+			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+		}
+
+		var ret = [];
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
 			if ( typeof elem === "number" ) {
 				elem += "";
@@ -6294,57 +4432,52 @@
 
 			// Convert html string into DOM nodes
-			if ( typeof elem === "string" ) {
-				if ( !rhtml.test( elem ) ) {
-					elem = context.createTextNode( elem );
-				} else {
-					// Ensure a safe container in which to render the html
-					safe = safe || createSafeFragment( context );
+			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
+				elem = context.createTextNode( elem );
+
+			} else if ( typeof elem === "string" ) {
+				// Fix "XHTML"-style tags in all browsers
+				elem = elem.replace(rxhtmlTag, fcloseTag);
+
+				// Trim whitespace, otherwise indexOf won't work as expected
+				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
+					wrap = wrapMap[ tag ] || wrapMap._default,
+					depth = wrap[0],
 					div = context.createElement("div");
-					safe.appendChild( div );
-
-					// Fix "XHTML"-style tags in all browsers
-					elem = elem.replace(rxhtmlTag, "<$1></$2>");
-
-					// Go to html and back, then peel off extra wrappers
-					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-					depth = wrap[0];
-					div.innerHTML = wrap[1] + elem + wrap[2];
-
-					// Move to the right depth
-					while ( depth-- ) {
-						div = div.lastChild;
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						hasBody = rtbody.test(elem);
-							tbody = tag === "table" && !hasBody ?
-								div.firstChild && div.firstChild.childNodes :
-
-								// String was a bare <thead> or <tfoot>
-								wrap[1] === "<table>" && !hasBody ?
-									div.childNodes :
-									[];
-
-						for ( j = tbody.length - 1; j >= 0 ; --j ) {
-							if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
-								tbody[ j ].parentNode.removeChild( tbody[ j ] );
-							}
+
+				// Go to html and back, then peel off extra wrappers
+				div.innerHTML = wrap[1] + elem + wrap[2];
+
+				// Move to the right depth
+				while ( depth-- ) {
+					div = div.lastChild;
+				}
+
+				// Remove IE's autoinserted <tbody> from table fragments
+				if ( !jQuery.support.tbody ) {
+
+					// String was a <table>, *may* have spurious <tbody>
+					var hasBody = rtbody.test(elem),
+						tbody = tag === "table" && !hasBody ?
+							div.firstChild && div.firstChild.childNodes :
+
+							// String was a bare <thead> or <tfoot>
+							wrap[1] === "<table>" && !hasBody ?
+								div.childNodes :
+								[];
+
+					for ( var j = tbody.length - 1; j >= 0 ; --j ) {
+						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+							tbody[ j ].parentNode.removeChild( tbody[ j ] );
 						}
 					}
 
-					// IE completely kills leading whitespace when innerHTML is used
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
-					}
-
-					elem = div.childNodes;
-
-					// Take out of fragment container (we need a fresh div each time)
-					div.parentNode.removeChild( div );
-				}
+				}
+
+				// IE completely kills leading whitespace when innerHTML is used
+				if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+					div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+				}
+
+				elem = div.childNodes;
 			}
 
@@ -6352,52 +4485,18 @@
 				ret.push( elem );
 			} else {
-				jQuery.merge( ret, elem );
-			}
-		}
-
-		// Fix #11356: Clear elements from safeFragment
-		if ( div ) {
-			elem = div = safe = null;
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !jQuery.support.appendChecked ) {
-			for ( i = 0; (elem = ret[i]) != null; i++ ) {
-				if ( jQuery.nodeName( elem, "input" ) ) {
-					fixDefaultChecked( elem );
-				} else if ( typeof elem.getElementsByTagName !== "undefined" ) {
-					jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
-				}
-			}
-		}
-
-		// Append elements to a provided document fragment
+				ret = jQuery.merge( ret, elem );
+			}
+		}
+
 		if ( fragment ) {
-			// Special handling of each script element
-			handleScript = function( elem ) {
-				// Check if we consider it executable
-				if ( !elem.type || rscriptType.test( elem.type ) ) {
-					// Detach the script and store it in the scripts array (if provided) or the fragment
-					// Return truthy to indicate that it has been handled
-					return scripts ?
-						scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
-						fragment.appendChild( elem );
-				}
-			};
-
-			for ( i = 0; (elem = ret[i]) != null; i++ ) {
-				// Check if we're done after handling an executable script
-				if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
-					// Append to fragment and handle embedded scripts
-					fragment.appendChild( elem );
-					if ( typeof elem.getElementsByTagName !== "undefined" ) {
-						// handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
-						jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
-
-						// Splice the scripts into ret after their former ancestor and advance our index beyond them
-						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
-						i += jsTags.length;
+			for ( var i = 0; ret[i]; i++ ) {
+				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+				
+				} else {
+					if ( ret[i].nodeType === 1 ) {
+						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
 					}
+					fragment.appendChild( ret[i] );
 				}
 			}
@@ -6406,725 +4505,262 @@
 		return ret;
 	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
-		var data, id, elem, type,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			deleteExpando = jQuery.support.deleteExpando,
-			special = jQuery.event.special;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( acceptData || jQuery.acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
+	
+	cleanData: function( elems ) {
+		var data, id, cache = jQuery.cache,
+			special = jQuery.event.special,
+			deleteExpando = jQuery.support.deleteExpando;
+		
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			id = elem[ jQuery.expando ];
+			
+			if ( id ) {
+				data = cache[ id ];
+				
+				if ( data.events ) {
+					for ( var type in data.events ) {
+						if ( special[ type ] ) {
+							jQuery.event.remove( elem, type );
+
+						} else {
+							removeEvent( elem, type, data.handle );
 						}
 					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( elem.removeAttribute ) {
-							elem.removeAttribute( internalKey );
-
-						} else {
-							elem[ internalKey ] = null;
-						}
-
-						jQuery.deletedIds.push( id );
+				}
+				
+				if ( deleteExpando ) {
+					delete elem[ jQuery.expando ];
+
+				} else if ( elem.removeAttribute ) {
+					elem.removeAttribute( jQuery.expando );
+				}
+				
+				delete cache[ id ];
+			}
+		}
+	}
+});
+// exclude the following css properties to add px
+var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+	ralpha = /alpha\([^)]*\)/,
+	ropacity = /opacity=([^)]*)/,
+	rfloat = /float/i,
+	rdashAlpha = /-([a-z])/ig,
+	rupper = /([A-Z])/g,
+	rnumpx = /^-?\d+(?:px)?$/i,
+	rnum = /^-?\d/,
+
+	cssShow = { position: "absolute", visibility: "hidden", display:"block" },
+	cssWidth = [ "Left", "Right" ],
+	cssHeight = [ "Top", "Bottom" ],
+
+	// cache check for defaultView.getComputedStyle
+	getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
+	// normalize float css property
+	styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat",
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	};
+
+jQuery.fn.css = function( name, value ) {
+	return access( this, name, value, true, function( elem, name, value ) {
+		if ( value === undefined ) {
+			return jQuery.curCSS( elem, name );
+		}
+		
+		if ( typeof value === "number" && !rexclude.test(name) ) {
+			value += "px";
+		}
+
+		jQuery.style( elem, name, value );
+	});
+};
+
+jQuery.extend({
+	style: function( elem, name, value ) {
+		// don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return undefined;
+		}
+
+		// ignore negative width and height values #1599
+		if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) {
+			value = undefined;
+		}
+
+		var style = elem.style || elem, set = value !== undefined;
+
+		// IE uses filters for opacity
+		if ( !jQuery.support.opacity && name === "opacity" ) {
+			if ( set ) {
+				// IE has trouble with opacity if it does not have layout
+				// Force it by setting the zoom level
+				style.zoom = 1;
+
+				// Set the alpha filter to set the opacity
+				var opacity = parseInt( value, 10 ) + "" === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
+				var filter = style.filter || jQuery.curCSS( elem, "filter" ) || "";
+				style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity;
+			}
+
+			return style.filter && style.filter.indexOf("opacity=") >= 0 ?
+				(parseFloat( ropacity.exec(style.filter)[1] ) / 100) + "":
+				"";
+		}
+
+		// Make sure we're using the right name for getting the float value
+		if ( rfloat.test( name ) ) {
+			name = styleFloat;
+		}
+
+		name = name.replace(rdashAlpha, fcamelCase);
+
+		if ( set ) {
+			style[ name ] = value;
+		}
+
+		return style[ name ];
+	},
+
+	css: function( elem, name, force, extra ) {
+		if ( name === "width" || name === "height" ) {
+			var val, props = cssShow, which = name === "width" ? cssWidth : cssHeight;
+
+			function getWH() {
+				val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
+
+				if ( extra === "border" ) {
+					return;
+				}
+
+				jQuery.each( which, function() {
+					if ( !extra ) {
+						val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
 					}
-				}
-			}
-		}
-	}
-});
-// Limit scope pollution from any deprecated API
-(function() {
-
-var matched, browser;
-
-// Use of jQuery.browser is frowned upon.
-// More details: http://api.jquery.com/jQuery.browser
-// jQuery.uaMatch maintained for back-compat
-jQuery.uaMatch = function( ua ) {
-	ua = ua.toLowerCase();
-
-	var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
-		/(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-		/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
-		/(msie) ([\w.]+)/.exec( ua ) ||
-		ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
-		[];
-
-	return {
-		browser: match[ 1 ] || "",
-		version: match[ 2 ] || "0"
-	};
-};
-
-matched = jQuery.uaMatch( navigator.userAgent );
-browser = {};
-
-if ( matched.browser ) {
-	browser[ matched.browser ] = true;
-	browser.version = matched.version;
-}
-
-// Chrome is Webkit, but Webkit is also Safari.
-if ( browser.chrome ) {
-	browser.webkit = true;
-} else if ( browser.webkit ) {
-	browser.safari = true;
-}
-
-jQuery.browser = browser;
-
-jQuery.sub = function() {
-	function jQuerySub( selector, context ) {
-		return new jQuerySub.fn.init( selector, context );
-	}
-	jQuery.extend( true, jQuerySub, this );
-	jQuerySub.superclass = this;
-	jQuerySub.fn = jQuerySub.prototype = this();
-	jQuerySub.fn.constructor = jQuerySub;
-	jQuerySub.sub = this.sub;
-	jQuerySub.fn.init = function init( selector, context ) {
-		if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-			context = jQuerySub( context );
-		}
-
-		return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
-	};
-	jQuerySub.fn.init.prototype = jQuerySub.fn;
-	var rootjQuerySub = jQuerySub(document);
-	return jQuerySub;
-};
-
-})();
-var curCSS, iframe, iframeDoc,
-	ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity=([^)]*)/,
-	rposition = /^(top|right|bottom|left)$/,
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rmargin = /^margin/,
-	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-	rrelNum = new RegExp( "^([-+])=(" + core_pnum + ")", "i" ),
-	elemdisplay = {},
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: 0,
-		fontWeight: 400
-	},
-
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ],
-
-	eventsToggle = jQuery.fn.toggle;
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function isHidden( elem, el ) {
-	elem = el || elem;
-	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-}
-
-function showHide( elements, show ) {
-	var elem, display,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && elem.style.display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
-			}
-		} else {
-			display = curCSS( elem, "display" );
-
-			if ( !values[ index ] && display !== "none" ) {
-				jQuery._data( elem, "olddisplay", display );
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return jQuery.access( this, function( elem, name, value ) {
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state, fn2 ) {
-		var bool = typeof state === "boolean";
-
-		if ( jQuery.isFunction( state ) && jQuery.isFunction( fn2 ) ) {
-			return eventsToggle.apply( this, arguments );
-		}
-
-		return this.each(function() {
-			if ( bool ? state : isHidden( this ) ) {
-				jQuery( this ).show();
+
+					if ( extra === "margin" ) {
+						val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
+					} else {
+						val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
+					}
+				});
+			}
+
+			if ( elem.offsetWidth !== 0 ) {
+				getWH();
 			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-
-				}
-			}
-		}
-	},
-
-	// Exclude the following css properties to add px
-	cssNumber: {
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, numeric, extra ) {
-		var val, num, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( numeric || extra !== undefined ) {
-			num = parseFloat( val );
-			return numeric || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
+				jQuery.swap( elem, props, getWH );
+			}
+
+			return Math.max(0, Math.round(val));
+		}
+
+		return jQuery.curCSS( elem, name, force );
+	},
+
+	curCSS: function( elem, name, force ) {
+		var ret, style = elem.style, filter;
+
+		// IE uses filters for opacity
+		if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
+			ret = ropacity.test(elem.currentStyle.filter || "") ?
+				(parseFloat(RegExp.$1) / 100) + "" :
+				"";
+
+			return ret === "" ?
+				"1" :
+				ret;
+		}
+
+		// Make sure we're using the right name for getting the float value
+		if ( rfloat.test( name ) ) {
+			name = styleFloat;
+		}
+
+		if ( !force && style && style[ name ] ) {
+			ret = style[ name ];
+
+		} else if ( getComputedStyle ) {
+
+			// Only "float" is needed here
+			if ( rfloat.test( name ) ) {
+				name = "float";
+			}
+
+			name = name.replace( rupper, "-$1" ).toLowerCase();
+
+			var defaultView = elem.ownerDocument.defaultView;
+
+			if ( !defaultView ) {
+				return null;
+			}
+
+			var computedStyle = defaultView.getComputedStyle( elem, null );
+
+			if ( computedStyle ) {
+				ret = computedStyle.getPropertyValue( name );
+			}
+
+			// We should always get a number back from opacity
+			if ( name === "opacity" && ret === "" ) {
+				ret = "1";
+			}
+
+		} else if ( elem.currentStyle ) {
+			var camelCase = name.replace(rdashAlpha, fcamelCase);
+
+			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
+
+			// From the awesome hack by Dean Edwards
+			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+			// If we're not dealing with a regular pixel number
+			// but a number that has a weird ending, we need to convert it to pixels
+			if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+				// Remember the original values
+				var left = style.left, rsLeft = elem.runtimeStyle.left;
+
+				// Put in the new values to get a computed value out
+				elem.runtimeStyle.left = elem.currentStyle.left;
+				style.left = camelCase === "fontSize" ? "1em" : (ret || 0);
+				ret = style.pixelLeft + "px";
+
+				// Revert the changed values
+				style.left = left;
+				elem.runtimeStyle.left = rsLeft;
+			}
+		}
+
+		return ret;
 	},
 
 	// A method for quickly swapping in/out CSS properties to get correct calculations
 	swap: function( elem, options, callback ) {
-		var ret, name,
-			old = {};
+		var old = {};
 
 		// Remember the old values, and insert the new ones
-		for ( name in options ) {
+		for ( var name in options ) {
 			old[ name ] = elem.style[ name ];
 			elem.style[ name ] = options[ name ];
 		}
 
-		ret = callback.call( elem );
+		callback.call( elem );
 
 		// Revert the old values
-		for ( name in options ) {
+		for ( var name in options ) {
 			elem.style[ name ] = old[ name ];
 		}
-
-		return ret;
-	}
-});
-
-// NOTE: To any future maintainer, we've window.getComputedStyle
-// because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-	curCSS = function( elem, name ) {
-		var ret, width, minWidth, maxWidth,
-			computed = window.getComputedStyle( elem, null ),
-			style = elem.style;
-
-		if ( computed ) {
-
-			ret = computed[ name ];
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		return ret;
-	};
-} else if ( document.documentElement.currentStyle ) {
-	curCSS = function( elem, name ) {
-		var left, rsLeft,
-			ret = elem.currentStyle && elem.currentStyle[ name ],
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				elem.runtimeStyle.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				elem.runtimeStyle.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-			Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-			value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			// we use jQuery.css instead of curCSS here
-			// because of the reliableMarginRight CSS hook!
-			val += jQuery.css( elem, extra + cssExpand[ i ], true );
-		}
-
-		// From this point on we use curCSS for maximum performance (relevant in animations)
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		valueIsBorderBox = true,
-		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox
-		)
-	) + "px";
-}
-
-
-// Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-	if ( elemdisplay[ nodeName ] ) {
-		return elemdisplay[ nodeName ];
-	}
-
-	var elem = jQuery( "<" + nodeName + ">" ).appendTo( document.body ),
-		display = elem.css("display");
-	elem.remove();
-
-	// If the simple way fails,
-	// get element's real default display by attaching it to a temp iframe
-	if ( display === "none" || display === "" ) {
-		// Use the already-created iframe if possible
-		iframe = document.body.appendChild(
-			iframe || jQuery.extend( document.createElement("iframe"), {
-				frameBorder: 0,
-				width: 0,
-				height: 0
-			})
-		);
-
-		// Create a cacheable copy of the iframe document on first call.
-		// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
-		// document to it; WebKit & Firefox won't allow reusing the iframe document.
-		if ( !iframeDoc || !iframe.createElement ) {
-			iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
-			iframeDoc.write("<!doctype html><html><body>");
-			iframeDoc.close();
-		}
-
-		elem = iframeDoc.body.appendChild( iframeDoc.createElement(nodeName) );
-
-		display = curCSS( elem, "display" );
-		document.body.removeChild( iframe );
-	}
-
-	// Store the correct default display
-	elemdisplay[ nodeName ] = display;
-
-	return display;
-}
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-				// certain elements can have dimension info if we invisibly show them
-				// however, it must have a current display style that would benefit from this
-				if ( elem.offsetWidth === 0 && rdisplayswap.test( curCSS( elem, "display" ) ) ) {
-					return jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					});
-				} else {
-					return getWidthOrHeight( elem, name, extra );
-				}
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box"
-				) : 0
-			);
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			if ( value >= 1 && jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-				style.removeAttribute ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there there is no filter style applied in a css rule, we are done
-				if ( currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
-
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-// These hooks cannot be added until DOM ready because the support test
-// for it is not run until after DOM ready
-jQuery(function() {
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-				// Work around by temporarily setting element display to inline-block
-				return jQuery.swap( elem, { "display": "inline-block" }, function() {
-					if ( computed ) {
-						return curCSS( elem, "marginRight" );
-					}
-				});
-			}
-		};
-	}
-
-	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-	// getComputedStyle returns percent when specified for top/left/bottom/right
-	// rather than make the css module depend on the offset module, we just check for it here
-	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
-		jQuery.each( [ "top", "left" ], function( i, prop ) {
-			jQuery.cssHooks[ prop ] = {
-				get: function( elem, computed ) {
-					if ( computed ) {
-						var ret = curCSS( elem, prop );
-						// if curCSS returns percentage, fallback to offset
-						return rnumnonpx.test( ret ) ? jQuery( elem ).position()[ prop ] + "px" : ret;
-					}
-				}
-			};
-		});
-	}
-
+	}
 });
 
 if ( jQuery.expr && jQuery.expr.filters ) {
 	jQuery.expr.filters.hidden = function( elem ) {
-		return ( elem.offsetWidth === 0 && elem.offsetHeight === 0 ) || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || curCSS( elem, "display" )) === "none");
+		var width = elem.offsetWidth, height = elem.offsetHeight,
+			skip = elem.nodeName.toLowerCase() === "tr";
+
+		return width === 0 && height === 0 && !skip ?
+			true :
+			width > 0 && height > 0 && !skip ?
+				false :
+				jQuery.curCSS(elem, "display") === "none";
 	};
 
@@ -7133,366 +4769,131 @@
 	};
 }
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i,
-
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ],
-				expanded = {};
-
-			for ( i = 0; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
-	rselectTextarea = /^(?:select|textarea)/i;
+var jsc = now(),
+	rscript = /<script(.|\s)*?\/script>/gi,
+	rselectTextarea = /select|textarea/i,
+	rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,
+	jsre = /=\?(&|$)/,
+	rquery = /\?/,
+	rts = /(\?|&)_=.*?(&|$)/,
+	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
+	r20 = /%20/g,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load;
 
 jQuery.fn.extend({
+	load: function( url, params, callback ) {
+		if ( typeof url !== "string" ) {
+			return _load.call( this, url );
+
+		// Don't do a request if no elements are being requested
+		} else if ( !this.length ) {
+			return this;
+		}
+
+		var off = url.indexOf(" ");
+		if ( off >= 0 ) {
+			var selector = url.slice(off, url.length);
+			url = url.slice(0, off);
+		}
+
+		// Default to a GET request
+		var type = "GET";
+
+		// If the second parameter was provided
+		if ( params ) {
+			// If it's a function
+			if ( jQuery.isFunction( params ) ) {
+				// We assume that it's the callback
+				callback = params;
+				params = null;
+
+			// Otherwise, build a param string
+			} else if ( typeof params === "object" ) {
+				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
+				type = "POST";
+			}
+		}
+
+		var self = this;
+
+		// Request the remote document
+		jQuery.ajax({
+			url: url,
+			type: type,
+			dataType: "html",
+			data: params,
+			complete: function( res, status ) {
+				// If successful, inject the HTML into all the matched elements
+				if ( status === "success" || status === "notmodified" ) {
+					// See if a selector was specified
+					self.html( selector ?
+						// Create a dummy div to hold the results
+						jQuery("<div />")
+							// inject the contents of the document in, removing the scripts
+							// to avoid any 'Permission Denied' errors in IE
+							.append(res.responseText.replace(rscript, ""))
+
+							// Locate the specified elements
+							.find(selector) :
+
+						// If not, just inject the full result
+						res.responseText );
+				}
+
+				if ( callback ) {
+					self.each( callback, [res.responseText, status, res] );
+				}
+			}
+		});
+
+		return this;
+	},
+
 	serialize: function() {
-		return jQuery.param( this.serializeArray() );
+		return jQuery.param(this.serializeArray());
 	},
 	serializeArray: function() {
-		return this.map(function(){
-			return this.elements ? jQuery.makeArray( this.elements ) : this;
+		return this.map(function() {
+			return this.elements ? jQuery.makeArray(this.elements) : this;
 		})
-		.filter(function(){
+		.filter(function() {
 			return this.name && !this.disabled &&
-				( this.checked || rselectTextarea.test( this.nodeName ) ||
-					rinput.test( this.type ) );
+				(this.checked || rselectTextarea.test(this.nodeName) ||
+					rinput.test(this.type));
 		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
+		.map(function( i, elem ) {
+			var val = jQuery(this).val();
 
 			return val == null ?
 				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val, i ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+				jQuery.isArray(val) ?
+					jQuery.map( val, function( val, i ) {
+						return { name: elem.name, value: val };
 					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					{ name: elem.name, value: val };
 		}).get();
 	}
 });
 
-//Serialize an array of form elements or a set of
-//key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
-
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// If array item is non-scalar (array or object), encode its
-				// numeric index to resolve deserialization ambiguity issues.
-				// Note that rack (as of 1.0.0) can't currently deserialize
-				// nested arrays properly, and attempting to do so may cause
-				// a server error. Possible fixes are to modify rack's
-				// deserialization algorithm or to provide an option or flag
-				// to force array serialization to be shallow.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-var
-	// Document location
-	ajaxLocParts,
-	ajaxLocation,
-
-	rhash = /#.*$/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rquery = /\?/,
-	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-	rts = /([?&])_=[^&]*/,
-	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = ["*/"] + ["*"];
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType, list, placeBefore,
-			dataTypes = dataTypeExpression.toLowerCase().split( core_rspace ),
-			i = 0,
-			length = dataTypes.length;
-
-		if ( jQuery.isFunction( func ) ) {
-			// For each dataType in the dataTypeExpression
-			for ( ; i < length; i++ ) {
-				dataType = dataTypes[ i ];
-				// We control if we're asked to add before
-				// any existing element
-				placeBefore = /^\+/.test( dataType );
-				if ( placeBefore ) {
-					dataType = dataType.substr( 1 ) || "*";
-				}
-				list = structure[ dataType ] = structure[ dataType ] || [];
-				// then we add to the structure accordingly
-				list[ placeBefore ? "unshift" : "push" ]( func );
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
-		dataType /* internal */, inspected /* internal */ ) {
-
-	dataType = dataType || options.dataTypes[ 0 ];
-	inspected = inspected || {};
-
-	inspected[ dataType ] = true;
-
-	var selection,
-		list = structure[ dataType ],
-		i = 0,
-		length = list ? list.length : 0,
-		executeOnly = ( structure === prefilters );
-
-	for ( ; i < length && ( executeOnly || !selection ); i++ ) {
-		selection = list[ i ]( options, originalOptions, jqXHR );
-		// If we got redirected to another dataType
-		// we try there if executing only and not done already
-		if ( typeof selection === "string" ) {
-			if ( !executeOnly || inspected[ selection ] ) {
-				selection = undefined;
-			} else {
-				options.dataTypes.unshift( selection );
-				selection = inspectPrefiltersOrTransports(
-						structure, options, originalOptions, jqXHR, selection, inspected );
-			}
-		}
-	}
-	// If we're only executing or nothing was selected
-	// we try the catchall dataType if not done already
-	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
-		selection = inspectPrefiltersOrTransports(
-				structure, options, originalOptions, jqXHR, "*", inspected );
-	}
-	// unnecessary when only executing (prefilters)
-	// but it'll be ignored by the caller in that case
-	return selection;
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var key, deep,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-}
-
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
-	// Don't do a request if no elements are being requested
-	if ( !this.length ) {
-		return this;
-	}
-
-	var selector, type, response,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = url.slice( off, url.length );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// Request the remote document
-	jQuery.ajax({
-		url: url,
-
-		// if "type" variable is undefined, then "GET" method will be used
-		type: type,
-		dataType: "html",
-		data: params,
-		complete: function( jqXHR, status ) {
-			if ( callback ) {
-				self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-			}
-		}
-	}).done(function( responseText ) {
-
-		// Save response for use in complete callback
-		response = arguments;
-
-		// See if a selector was specified
-		self.html( selector ?
-
-			// Create a dummy div to hold the results
-			jQuery("<div>")
-
-				// inject the contents of the document in, removing the scripts
-				// to avoid any 'Permission Denied' errors in IE
-				.append( responseText.replace( rscript, "" ) )
-
-				// Locate the specified elements
-				.find( selector ) :
-
-			// If not, just inject the full result
-			responseText );
-
-	});
-
-	return this;
-};
-
 // Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
-	jQuery.fn[ o ] = function( f ){
-		return this.on( o, f );
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function( i, o ) {
+	jQuery.fn[o] = function( f ) {
+		return this.bind(o, f);
 	};
 });
 
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
+jQuery.extend({
+
+	get: function( url, data, callback, type ) {
+		// shift arguments if data argument was omited
 		if ( jQuery.isFunction( data ) ) {
 			type = type || callback;
 			callback = data;
-			data = undefined;
+			data = null;
 		}
 
 		return jQuery.ajax({
-			type: method,
+			type: "GET",
 			url: url,
 			data: data,
@@ -7500,39 +4901,40 @@
 			dataType: type
 		});
-	};
-});
-
-jQuery.extend({
+	},
 
 	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
+		return jQuery.get(url, null, callback, "script");
 	},
 
 	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		if ( settings ) {
-			// Building a settings object
-			ajaxExtend( target, jQuery.ajaxSettings );
-		} else {
-			// Extending ajaxSettings
-			settings = target;
-			target = jQuery.ajaxSettings;
-		}
-		ajaxExtend( target, settings );
-		return target;
+		return jQuery.get(url, data, callback, "json");
+	},
+
+	post: function( url, data, callback, type ) {
+		// shift arguments if data argument was omited
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = {};
+		}
+
+		return jQuery.ajax({
+			type: "POST",
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	},
+
+	ajaxSetup: function( settings ) {
+		jQuery.extend( jQuery.ajaxSettings, settings );
 	},
 
 	ajaxSettings: {
-		url: ajaxLocation,
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		url: location.href,
 		global: true,
 		type: "GET",
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+		contentType: "application/x-www-form-urlencoded",
 		processData: true,
 		async: true,
@@ -7540,1649 +4942,966 @@
 		timeout: 0,
 		data: null,
-		dataType: null,
 		username: null,
 		password: null,
-		cache: null,
-		throws: false,
 		traditional: false,
-		headers: {},
 		*/
-
+		// Create the request object; Microsoft failed to properly
+		// implement the XMLHttpRequest in IE7 (can't request local files),
+		// so we use the ActiveXObject when it is available
+		// This function can be overriden by calling jQuery.ajaxSetup
+		xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
+			function() {
+				return new window.XMLHttpRequest();
+			} :
+			function() {
+				try {
+					return new window.ActiveXObject("Microsoft.XMLHTTP");
+				} catch(e) {}
+			},
 		accepts: {
 			xml: "application/xml, text/xml",
 			html: "text/html",
+			script: "text/javascript, application/javascript",
+			json: "application/json, text/javascript",
 			text: "text/plain",
-			json: "application/json, text/javascript",
-			"*": allTypes
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText"
-		},
-
-		// List of data converters
-		// 1) key format is "source_type destination_type" (a single space in-between)
-		// 2) the catchall symbol "*" can be used for source_type
-		converters: {
-
-			// Convert anything to text
-			"* text": window.String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			context: true,
-			url: true
-		}
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var // ifModified key
-			ifModifiedKey,
-			// Response headers
-			responseHeadersString,
-			responseHeaders,
-			// transport
-			transport,
-			// timeout handle
-			timeoutTimer,
-			// Cross-domain detection vars
-			parts,
-			// To know if global events are to be dispatched
-			fireGlobals,
-			// Loop variable
-			i,
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events
-			// It's the callbackContext if one was provided in the options
-			// and if it's a DOM node or a jQuery collection
-			globalEventContext = callbackContext !== s &&
-				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
-						jQuery( callbackContext ) : jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks( "once memory" ),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// The jqXHR state
-			state = 0,
-			// Default abort message
-			strAbort = "canceled",
-			// Fake xhr
-			jqXHR = {
-
-				readyState: 0,
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					if ( !state ) {
-						var lname = name.toLowerCase();
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match === undefined ? null : match;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					statusText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( statusText );
-					}
-					done( 0, statusText );
-					return this;
-				}
-			};
-
-		// Callback for when everything is done
-		// It is defined here because jslint complains if it is declared
-		// at the end of the function (which would be more logical and readable)
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// If successful, handle type chaining
-			if ( status >= 200 && status < 300 || status === 304 ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-
-					modified = jqXHR.getResponseHeader("Last-Modified");
-					if ( modified ) {
-						jQuery.lastModified[ ifModifiedKey ] = modified;
-					}
-					modified = jqXHR.getResponseHeader("Etag");
-					if ( modified ) {
-						jQuery.etag[ ifModifiedKey ] = modified;
-					}
-				}
-
-				// If not modified
-				if ( status === 304 ) {
-
-					statusText = "notmodified";
-					isSuccess = true;
-
-				// If we have data
-				} else {
-
-					isSuccess = ajaxConvert( s, response );
-					statusText = isSuccess.state;
-					success = isSuccess.data;
-					error = isSuccess.error;
-					isSuccess = !error;
-				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if ( !statusText || status ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
-						[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger( "ajaxStop" );
-				}
-			}
-		}
-
-		// Attach deferreds
-		deferred.promise( jqXHR );
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-		jqXHR.complete = completeDeferred.add;
-
-		// Status-dependent callbacks
-		jqXHR.statusCode = function( map ) {
-			if ( map ) {
-				var tmp;
-				if ( state < 2 ) {
-					for ( tmp in map ) {
-						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
-					}
-				} else {
-					tmp = map[ jqXHR.status ];
-					jqXHR.always( tmp );
-				}
-			}
-			return this;
-		};
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( core_rspace );
-
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() ) || false;
-			s.crossDomain = parts && ( parts.join(":") + ( parts[ 3 ] ? "" : parts[ 1 ] === "http:" ? 80 : 443 ) ) !==
-				( ajaxLocParts.join(":") + ( ajaxLocParts[ 3 ] ? "" : ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) );
-		}
-
-		// Convert data if not already a string
+			_default: "*/*"
+		}
+	},
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {},
+
+	ajax: function( origSettings ) {
+		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings);
+		
+		var jsonp, status, data,
+			callbackContext = origSettings && origSettings.context || s,
+			type = s.type.toUpperCase();
+
+		// convert data if not already a string
 		if ( s.data && s.processData && typeof s.data !== "string" ) {
 			s.data = jQuery.param( s.data, s.traditional );
 		}
 
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
+		// Handle JSONP Parameter Callbacks
+		if ( s.dataType === "jsonp" ) {
+			if ( type === "GET" ) {
+				if ( !jsre.test( s.url ) ) {
+					s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+				}
+			} else if ( !s.data || !jsre.test(s.data) ) {
+				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
+			}
+			s.dataType = "json";
+		}
+
+		// Build temporary JSONP function
+		if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
+			jsonp = s.jsonpCallback || ("jsonp" + jsc++);
+
+			// Replace the =? sequence both in the query string and the data
+			if ( s.data ) {
+				s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
+			}
+
+			s.url = s.url.replace(jsre, "=" + jsonp + "$1");
+
+			// We need to make sure
+			// that a JSONP style response is executed properly
+			s.dataType = "script";
+
+			// Handle JSONP-style loading
+			window[ jsonp ] = window[ jsonp ] || function( tmp ) {
+				data = tmp;
+				success();
+				complete();
+				// Garbage collect
+				window[ jsonp ] = undefined;
+
+				try {
+					delete window[ jsonp ];
+				} catch(e) {}
+
+				if ( head ) {
+					head.removeChild( script );
+				}
+			};
+		}
+
+		if ( s.dataType === "script" && s.cache === null ) {
+			s.cache = false;
+		}
+
+		if ( s.cache === false && type === "GET" ) {
+			var ts = now();
+
+			// try replacing _= if it is there
+			var ret = s.url.replace(rts, "$1_=" + ts + "$2");
+
+			// if nothing was replaced, add timestamp to the end
+			s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
+		}
+
+		// If data is available, append data to url for get requests
+		if ( s.data && type === "GET" ) {
+			s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
+		}
 
 		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
+		if ( s.global && ! jQuery.active++ ) {
 			jQuery.event.trigger( "ajaxStart" );
 		}
 
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Get ifModifiedKey before adding the anti-cache parameter
-			ifModifiedKey = s.url;
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-
-				var ts = jQuery.now(),
-					// try replacing _= if it is there
-					ret = s.url.replace( rts, "$1_=" + ts );
-
-				// if nothing was replaced, add timestamp to the end
-				s.url = ret + ( ( ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			ifModifiedKey = ifModifiedKey || s.url;
-			if ( jQuery.lastModified[ ifModifiedKey ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
-			}
-			if ( jQuery.etag[ ifModifiedKey ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
-			}
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-				// Abort if not done already and return
-				return jqXHR.abort();
-
-		}
-
-		// aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout( function(){
-					jqXHR.abort( "timeout" );
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch (e) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {}
-
-});
-
-/* Handles responses to an ajax request:
- * - sets all responseXXX fields accordingly
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-	var ct, type, finalDataType, firstDataType,
-		contents = s.contents,
-		dataTypes = s.dataTypes,
-		responseFields = s.responseFields;
-
-	// Fill responseXXX fields
-	for ( type in responseFields ) {
-		if ( type in responses ) {
-			jqXHR[ responseFields[type] ] = responses[ type ];
-		}
-	}
-
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-// Chain conversions given the request and the original response
-function ajaxConvert( s, response ) {
-
-	var conv, conv2, current, tmp,
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice(),
-		prev = dataTypes[ 0 ],
-		converters = {},
-		i = 0;
-
-	// Apply the dataFilter if provided
-	if ( s.dataFilter ) {
-		response = s.dataFilter( response, s.dataType );
-	}
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	// Convert to each sequential dataType, tolerating list modification
-	for ( ; (current = dataTypes[++i]); ) {
-
-		// There's only work to do if current dataType is non-auto
-		if ( current !== "*" ) {
-
-			// Convert response if prev dataType is non-auto and differs from current
-			if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split(" ");
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.splice( i--, 0, current );
-								}
-
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s["throws"] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-						}
-					}
-				}
-			}
-
-			// Update prev for next iteration
-			prev = current;
-		}
-	}
-
-	return { state: "success", data: response };
-}
-var oldCallbacks = [],
-	rquestion = /\?/,
-	rjsonp = /(=)\?(?=&|$)|\?\?/,
-	nonce = jQuery.now();
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		data = s.data,
-		url = s.url,
-		hasCallback = s.jsonp !== false,
-		replaceInUrl = hasCallback && rjsonp.test( url ),
-		replaceInData = hasCallback && !replaceInUrl && typeof data === "string" &&
-			!( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") &&
-			rjsonp.test( data );
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( s.dataTypes[ 0 ] === "jsonp" || replaceInUrl || replaceInData ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-		overwritten = window[ callbackName ];
-
-		// Insert callback into url or form data
-		if ( replaceInUrl ) {
-			s.url = url.replace( rjsonp, "$1" + callbackName );
-		} else if ( replaceInData ) {
-			s.data = data.replace( rjsonp, "$1" + callbackName );
-		} else if ( hasCallback ) {
-			s.url += ( rquestion.test( url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-				// make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		});
-
-		// Delegate to script
-		return "script";
-	}
-});
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /javascript|ecmascript/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-
-		var script,
-			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
-
-		return {
-
-			send: function( _, callback ) {
-
-				script = document.createElement( "script" );
-
-				script.async = "async";
-
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
-
-				script.src = s.url;
+		// Matches an absolute URL, and saves the domain
+		var parts = rurl.exec( s.url ),
+			remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
+
+		// If we're requesting a remote document
+		// and trying to load JSON or Script with a GET
+		if ( s.dataType === "script" && type === "GET" && remote ) {
+			var head = document.getElementsByTagName("head")[0] || document.documentElement;
+			var script = document.createElement("script");
+			script.src = s.url;
+			if ( s.scriptCharset ) {
+				script.charset = s.scriptCharset;
+			}
+
+			// Handle Script loading
+			if ( !jsonp ) {
+				var done = false;
 
 				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+				script.onload = script.onreadystatechange = function() {
+					if ( !done && (!this.readyState ||
+							this.readyState === "loaded" || this.readyState === "complete") ) {
+						done = true;
+						success();
+						complete();
 
 						// Handle memory leak in IE
 						script.onload = script.onreadystatechange = null;
-
-						// Remove the script
 						if ( head && script.parentNode ) {
 							head.removeChild( script );
 						}
-
-						// Dereference the script
-						script = undefined;
-
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
-						}
 					}
 				};
-				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-				// This arises when a base node is used (#2709 and #4378).
-				head.insertBefore( script, head.firstChild );
-			},
-
-			abort: function() {
-				if ( script ) {
-					script.onload( 0, 1 );
+			}
+
+			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709 and #4378).
+			head.insertBefore( script, head.firstChild );
+
+			// We handle everything using the script element injection
+			return undefined;
+		}
+
+		var requestDone = false;
+
+		// Create the request object
+		var xhr = s.xhr();
+
+		if ( !xhr ) {
+			return;
+		}
+
+		// Open the socket
+		// Passing null username, generates a login popup on Opera (#2865)
+		if ( s.username ) {
+			xhr.open(type, s.url, s.async, s.username, s.password);
+		} else {
+			xhr.open(type, s.url, s.async);
+		}
+
+		// Need an extra try/catch for cross domain requests in Firefox 3
+		try {
+			// Set the correct header, if data is being sent
+			if ( s.data || origSettings && origSettings.contentType ) {
+				xhr.setRequestHeader("Content-Type", s.contentType);
+			}
+
+			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+			if ( s.ifModified ) {
+				if ( jQuery.lastModified[s.url] ) {
+					xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
+				}
+
+				if ( jQuery.etag[s.url] ) {
+					xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
+				}
+			}
+
+			// Set header so the called script knows that it's an XMLHttpRequest
+			// Only send the header if it's not a remote XHR
+			if ( !remote ) {
+				xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+			}
+
+			// Set the Accepts header for the server, depending on the dataType
+			xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
+				s.accepts[ s.dataType ] + ", */*" :
+				s.accepts._default );
+		} catch(e) {}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && s.beforeSend.call(callbackContext, xhr, s) === false ) {
+			// Handle the global AJAX counter
+			if ( s.global && ! --jQuery.active ) {
+				jQuery.event.trigger( "ajaxStop" );
+			}
+
+			// close opended socket
+			xhr.abort();
+			return false;
+		}
+
+		if ( s.global ) {
+			trigger("ajaxSend", [xhr, s]);
+		}
+
+		// Wait for a response to come back
+		var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
+			// The request was aborted
+			if ( !xhr || xhr.readyState === 0 || isTimeout === "abort" ) {
+				// Opera doesn't call onreadystatechange before this point
+				// so we simulate the call
+				if ( !requestDone ) {
+					complete();
+				}
+
+				requestDone = true;
+				if ( xhr ) {
+					xhr.onreadystatechange = jQuery.noop;
+				}
+
+			// The transfer is complete and the data is available, or the request timed out
+			} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
+				requestDone = true;
+				xhr.onreadystatechange = jQuery.noop;
+
+				status = isTimeout === "timeout" ?
+					"timeout" :
+					!jQuery.httpSuccess( xhr ) ?
+						"error" :
+						s.ifModified && jQuery.httpNotModified( xhr, s.url ) ?
+							"notmodified" :
+							"success";
+
+				var errMsg;
+
+				if ( status === "success" ) {
+					// Watch for, and catch, XML document parse errors
+					try {
+						// process the data (runs the xml through httpData regardless of callback)
+						data = jQuery.httpData( xhr, s.dataType, s );
+					} catch(err) {
+						status = "parsererror";
+						errMsg = err;
+					}
+				}
+
+				// Make sure that the request was successful or notmodified
+				if ( status === "success" || status === "notmodified" ) {
+					// JSONP handles its own success callback
+					if ( !jsonp ) {
+						success();
+					}
+				} else {
+					jQuery.handleError(s, xhr, status, errMsg);
+				}
+
+				// Fire the complete handlers
+				complete();
+
+				if ( isTimeout === "timeout" ) {
+					xhr.abort();
+				}
+
+				// Stop memory leaks
+				if ( s.async ) {
+					xhr = null;
 				}
 			}
 		};
+
+		// Override the abort handler, if we can (IE doesn't allow it, but that's OK)
+		// Opera doesn't fire onreadystatechange at all on abort
+		try {
+			var oldAbort = xhr.abort;
+			xhr.abort = function() {
+				if ( xhr ) {
+					oldAbort.call( xhr );
+				}
+
+				onreadystatechange( "abort" );
+			};
+		} catch(e) { }
+
+		// Timeout checker
+		if ( s.async && s.timeout > 0 ) {
+			setTimeout(function() {
+				// Check to see if the request is still happening
+				if ( xhr && !requestDone ) {
+					onreadystatechange( "timeout" );
+				}
+			}, s.timeout);
+		}
+
+		// Send the data
+		try {
+			xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null );
+		} catch(e) {
+			jQuery.handleError(s, xhr, null, e);
+			// Fire the complete handlers
+			complete();
+		}
+
+		// firefox 1.5 doesn't fire statechange for sync requests
+		if ( !s.async ) {
+			onreadystatechange();
+		}
+
+		function success() {
+			// If a local callback was specified, fire it and pass it the data
+			if ( s.success ) {
+				s.success.call( callbackContext, data, status, xhr );
+			}
+
+			// Fire the global callback
+			if ( s.global ) {
+				trigger( "ajaxSuccess", [xhr, s] );
+			}
+		}
+
+		function complete() {
+			// Process result
+			if ( s.complete ) {
+				s.complete.call( callbackContext, xhr, status);
+			}
+
+			// The request was completed
+			if ( s.global ) {
+				trigger( "ajaxComplete", [xhr, s] );
+			}
+
+			// Handle the global AJAX counter
+			if ( s.global && ! --jQuery.active ) {
+				jQuery.event.trigger( "ajaxStop" );
+			}
+		}
+		
+		function trigger(type, args) {
+			(s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
+		}
+
+		// return XMLHttpRequest to allow aborting the request etc.
+		return xhr;
+	},
+
+	handleError: function( s, xhr, status, e ) {
+		// If a local callback was specified, fire it
+		if ( s.error ) {
+			s.error.call( s.context || s, xhr, status, e );
+		}
+
+		// Fire the global callback
+		if ( s.global ) {
+			(s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] );
+		}
+	},
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Determines if an XMLHttpRequest was successful or not
+	httpSuccess: function( xhr ) {
+		try {
+			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
+			return !xhr.status && location.protocol === "file:" ||
+				// Opera returns 0 when status is 304
+				( xhr.status >= 200 && xhr.status < 300 ) ||
+				xhr.status === 304 || xhr.status === 1223 || xhr.status === 0;
+		} catch(e) {}
+
+		return false;
+	},
+
+	// Determines if an XMLHttpRequest returns NotModified
+	httpNotModified: function( xhr, url ) {
+		var lastModified = xhr.getResponseHeader("Last-Modified"),
+			etag = xhr.getResponseHeader("Etag");
+
+		if ( lastModified ) {
+			jQuery.lastModified[url] = lastModified;
+		}
+
+		if ( etag ) {
+			jQuery.etag[url] = etag;
+		}
+
+		// Opera returns 0 when status is 304
+		return xhr.status === 304 || xhr.status === 0;
+	},
+
+	httpData: function( xhr, type, s ) {
+		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" ) {
+			jQuery.error( "parsererror" );
+		}
+
+		// Allow a pre-filtering function to sanitize the response
+		// s is checked to keep backwards compatibility
+		if ( s && s.dataFilter ) {
+			data = s.dataFilter( data, type );
+		}
+
+		// The filter can actually parse the response
+		if ( typeof data === "string" ) {
+			// Get the JavaScript object, if JSON is used.
+			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
+				data = jQuery.parseJSON( data );
+
+			// If the type is "script", eval it in global context
+			} else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
+				jQuery.globalEval( data );
+			}
+		}
+
+		return data;
+	},
+
+	// Serialize an array of form elements or a set of
+	// key/values into a query string
+	param: function( a, traditional ) {
+		var s = [];
+		
+		// Set traditional to true for jQuery <= 1.3.2 behavior.
+		if ( traditional === undefined ) {
+			traditional = jQuery.ajaxSettings.traditional;
+		}
+		
+		// If an array was passed in, assume that it is an array of form elements.
+		if ( jQuery.isArray(a) || a.jquery ) {
+			// Serialize the form elements
+			jQuery.each( a, function() {
+				add( this.name, this.value );
+			});
+			
+		} else {
+			// If traditional, encode the "old" way (the way 1.3.2 or older
+			// did it), otherwise encode params recursively.
+			for ( var prefix in a ) {
+				buildParams( prefix, a[prefix] );
+			}
+		}
+
+		// Return the resulting serialization
+		return s.join("&").replace(r20, "+");
+
+		function buildParams( prefix, obj ) {
+			if ( jQuery.isArray(obj) ) {
+				// Serialize array item.
+				jQuery.each( obj, function( i, v ) {
+					if ( traditional || /\[\]$/.test( prefix ) ) {
+						// Treat each array item as a scalar.
+						add( prefix, v );
+					} else {
+						// If array item is non-scalar (array or object), encode its
+						// numeric index to resolve deserialization ambiguity issues.
+						// Note that rack (as of 1.0.0) can't currently deserialize
+						// nested arrays properly, and attempting to do so may cause
+						// a server error. Possible fixes are to modify rack's
+						// deserialization algorithm or to provide an option or flag
+						// to force array serialization to be shallow.
+						buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v );
+					}
+				});
+					
+			} else if ( !traditional && obj != null && typeof obj === "object" ) {
+				// Serialize object item.
+				jQuery.each( obj, function( k, v ) {
+					buildParams( prefix + "[" + k + "]", v );
+				});
+					
+			} else {
+				// Serialize scalar item.
+				add( prefix, obj );
+			}
+		}
+
+		function add( key, value ) {
+			// If value is a function, invoke it and return its value
+			value = jQuery.isFunction(value) ? value() : value;
+			s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
+		}
 	}
 });
-var xhrCallbacks,
-	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject ? function() {
-		// Abort all pending requests
-		for ( var key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( 0, 1 );
-		}
-	} : false,
-	xhrId = 0;
-
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
-
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
-	} catch( e ) {}
-}
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
-	 * implement the XMLHttpRequest in IE7 (can't request local files),
-	 * so we use the ActiveXObject when it is available
-	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-	 * we need a fallback.
-	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
-
-// Determine support properties
-(function( xhr ) {
-	jQuery.extend( jQuery.support, {
-		ajax: !!xhr,
-		cors: !!xhr && ( "withCredentials" in xhr )
-	});
-})( jQuery.ajaxSettings.xhr() );
-
-// Create transport if the browser can provide an xhr
-if ( jQuery.support.ajax ) {
-
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-
-					// Get a new xhr
-					var handle, i,
-						xhr = s.xhr();
-
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
+var elemdisplay = {},
+	rfxtypes = /toggle|show|hide/,
+	rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/,
+	timerId,
+	fxAttrs = [
+		// height animations
+		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+		// width animations
+		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+		// opacity animations
+		[ "opacity" ]
+	];
+
+jQuery.fn.extend({
+	show: function( speed, callback ) {
+		if ( speed || speed === 0) {
+			return this.animate( genFx("show", 3), speed, callback);
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var old = jQuery.data(this[i], "olddisplay");
+
+				this[i].style.display = old || "";
+
+				if ( jQuery.css(this[i], "display") === "none" ) {
+					var nodeName = this[i].nodeName, display;
+
+					if ( elemdisplay[ nodeName ] ) {
+						display = elemdisplay[ nodeName ];
+
 					} else {
-						xhr.open( s.type, s.url, s.async );
+						var elem = jQuery("<" + nodeName + " />").appendTo("body");
+
+						display = elem.css("display");
+
+						if ( display === "none" ) {
+							display = "block";
+						}
+
+						elem.remove();
+
+						elemdisplay[ nodeName ] = display;
 					}
 
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
+					jQuery.data(this[i], "olddisplay", display);
+				}
+			}
+
+			// Set the display of the elements in a second loop
+			// to avoid the constant reflow
+			for ( var j = 0, k = this.length; j < k; j++ ) {
+				this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
+			}
+
+			return this;
+		}
+	},
+
+	hide: function( speed, callback ) {
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("hide", 3), speed, callback);
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var old = jQuery.data(this[i], "olddisplay");
+				if ( !old && old !== "none" ) {
+					jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
+				}
+			}
+
+			// Set the display of the elements in a second loop
+			// to avoid the constant reflow
+			for ( var j = 0, k = this.length; j < k; j++ ) {
+				this[j].style.display = "none";
+			}
+
+			return this;
+		}
+	},
+
+	// Save the old toggle function
+	_toggle: jQuery.fn.toggle,
+
+	toggle: function( fn, fn2 ) {
+		var bool = typeof fn === "boolean";
+
+		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
+			this._toggle.apply( this, arguments );
+
+		} else if ( fn == null || bool ) {
+			this.each(function() {
+				var state = bool ? fn : jQuery(this).is(":hidden");
+				jQuery(this)[ state ? "show" : "hide" ]();
+			});
+
+		} else {
+			this.animate(genFx("toggle", 3), fn, fn2);
+		}
+
+		return this;
+	},
+
+	fadeTo: function( speed, to, callback ) {
+		return this.filter(":hidden").css("opacity", 0).show().end()
+					.animate({opacity: to}, speed, callback);
+	},
+
+	animate: function( prop, speed, easing, callback ) {
+		var optall = jQuery.speed(speed, easing, callback);
+
+		if ( jQuery.isEmptyObject( prop ) ) {
+			return this.each( optall.complete );
+		}
+
+		return this[ optall.queue === false ? "each" : "queue" ](function() {
+			var opt = jQuery.extend({}, optall), p,
+				hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
+				self = this;
+
+			for ( p in prop ) {
+				var name = p.replace(rdashAlpha, fcamelCase);
+
+				if ( p !== name ) {
+					prop[ name ] = prop[ p ];
+					delete prop[ p ];
+					p = name;
+				}
+
+				if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
+					return opt.complete.call(this);
+				}
+
+				if ( ( p === "height" || p === "width" ) && this.style ) {
+					// Store display property
+					opt.display = jQuery.css(this, "display");
+
+					// Make sure that nothing sneaks out
+					opt.overflow = this.style.overflow;
+				}
+
+				if ( jQuery.isArray( prop[p] ) ) {
+					// Create (if needed) and add to specialEasing
+					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
+					prop[p] = prop[p][0];
+				}
+			}
+
+			if ( opt.overflow != null ) {
+				this.style.overflow = "hidden";
+			}
+
+			opt.curAnim = jQuery.extend({}, prop);
+
+			jQuery.each( prop, function( name, val ) {
+				var e = new jQuery.fx( self, opt, name );
+
+				if ( rfxtypes.test(val) ) {
+					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+
+				} else {
+					var parts = rfxnum.exec(val),
+						start = e.cur(true) || 0;
+
+					if ( parts ) {
+						var end = parseFloat( parts[2] ),
+							unit = parts[3] || "px";
+
+						// We need to compute starting value
+						if ( unit !== "px" ) {
+							self.style[ name ] = (end || 1) + unit;
+							start = ((end || 1) / e.cur(true)) * start;
+							self.style[ name ] = start + unit;
 						}
+
+						// If a +=/-= token was provided, we're doing a relative animation
+						if ( parts[1] ) {
+							end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
+						}
+
+						e.custom( start, end, unit );
+
+					} else {
+						e.custom( start, val, "" );
 					}
-
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
+				}
+			});
+
+			// For JS strict compliance
+			return true;
+		});
+	},
+
+	stop: function( clearQueue, gotoEnd ) {
+		var timers = jQuery.timers;
+
+		if ( clearQueue ) {
+			this.queue([]);
+		}
+
+		this.each(function() {
+			// go in reverse order so anything added to the queue during the loop is ignored
+			for ( var i = timers.length - 1; i >= 0; i-- ) {
+				if ( timers[i].elem === this ) {
+					if (gotoEnd) {
+						// force the next step to be the last
+						timers[i](true);
 					}
 
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers[ "X-Requested-With" ] = "XMLHttpRequest";
-					}
-
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
-						}
-					} catch( _ ) {}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-
-						var status,
-							statusText,
-							responseHeaders,
-							responses,
-							xml;
-
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occurred
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-						try {
-
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-								// Only called once
-								callback = undefined;
-
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
-									}
-								}
-
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-									responses = {};
-									xml = xhr.responseXML;
-
-									// Construct response list
-									if ( xml && xml.documentElement /* #4958 */ ) {
-										responses.xml = xml;
-									}
-
-									// When requesting binary data, IE6-9 will throw an exception
-									// on any attempt to access responseText (#11426)
-									try {
-										responses.text = xhr.responseText;
-									} catch( _ ) {
-									}
-
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
-
-									// Filter status for non standard behaviors
-
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
-									}
-								}
-							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
-
-					if ( !s.async ) {
-						// if we're in sync mode we fire the callback
-						callback();
-					} else if ( xhr.readyState === 4 ) {
-						// (IE6 & IE7) if it's in cache and has been
-						// retrieved directly we need to fire the callback
-						setTimeout( callback, 0 );
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
-							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
-						}
-						xhr.onreadystatechange = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback(0,1);
-					}
-				}
-			};
-		}
-	});
-}
-var fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([-+])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [function( prop, value ) {
-			var end, unit,
-				tween = this.createTween( prop, value ),
-				parts = rfxnum.exec( value ),
-				target = tween.cur(),
-				start = +target || 0,
-				scale = 1,
-				maxIterations = 20;
-
-			if ( parts ) {
-				end = +parts[2];
-				unit = parts[3] || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-
-				// We need to compute starting value
-				if ( unit !== "px" && start ) {
-					// Iteratively approximate from a nonzero starting point
-					// Prefer the current property, because this process will be trivial if it uses the same units
-					// Fallback to end or a simple constant
-					start = jQuery.css( tween.elem, prop, true ) || end || 1;
-
-					do {
-						// If previous iteration zeroed out, double until we get *something*
-						// Use a string for doubling factor so we don't accidentally see scale as unchanged below
-						scale = scale || ".5";
-
-						// Adjust and apply
-						start = start / scale;
-						jQuery.style( tween.elem, prop, start + unit );
-
-					// Update scale, tolerating zero or NaN from tween.cur()
-					// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
-					} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-				}
-
-				tween.unit = unit;
-				tween.start = start;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[1] ? start + ( parts[1] + 1 ) * end : end;
-			}
-			return tween;
-		}]
+					timers.splice(i, 1);
+				}
+			}
+		});
+
+		// start the next in the queue if the last step wasn't forced
+		if ( !gotoEnd ) {
+			this.dequeue();
+		}
+
+		return this;
+	}
+
+});
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show", 1),
+	slideUp: genFx("hide", 1),
+	slideToggle: genFx("toggle", 1),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, callback ) {
+		return this.animate( props, speed, callback );
 	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	}, 0 );
-	return ( fxNow = jQuery.now() );
-}
-
-function createTweens( animation, props ) {
-	jQuery.each( props, function( prop, value ) {
-		var collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-			index = 0,
-			length = collection.length;
-		for ( ; index < length; index++ ) {
-			if ( collection[ index ].call( animation, prop, value ) ) {
-
-				// we're done with this property
-				return;
-			}
-		}
-	});
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		index = 0,
-		tweenerIndex = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				percent = 1 - ( remaining / animation.duration || 0 ),
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
+});
+
+jQuery.extend({
+	speed: function( speed, easing, fn ) {
+		var opt = speed && typeof speed === "object" ? speed : {
+			complete: fn || !fn && easing ||
+				jQuery.isFunction( speed ) && speed,
+			duration: speed,
+			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
+		};
+
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+			jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
+
+		// Queueing
+		opt.old = opt.complete;
+		opt.complete = function() {
+			if ( opt.queue !== false ) {
+				jQuery(this).dequeue();
+			}
+			if ( jQuery.isFunction( opt.old ) ) {
+				opt.old.call( this );
+			}
+		};
+
+		return opt;
+	},
+
+	easing: {
+		linear: function( p, n, firstNum, diff ) {
+			return firstNum + diff * p;
 		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end, easing ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// if we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// resolve when we played the last frame
-				// otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	createTweens( animation, props );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			anim: animation,
-			queue: animation.opts.queue,
-			elem: elem
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// not quite $.extend, this wont overwrite keys already present.
-			// also - reusing 'index' from above because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-function defaultPrefilter( elem, props, opts ) {
-	var index, prop, value, length, dataShow, tween, hooks, oldfire,
-		anim = this,
-		style = elem.style,
-		orig = {},
-		handled = [],
-		hidden = elem.nodeType && isHidden( elem );
-
-	// handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// doing this makes sure that the complete handler will be called
-			// before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE does not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		if ( jQuery.css( elem, "display" ) === "inline" &&
-				jQuery.css( elem, "float" ) === "none" ) {
-
-			// inline-level elements accept inline-block;
-			// block-level elements need to be inline with layout
-			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
-				style.display = "inline-block";
-
-			} else {
-				style.zoom = 1;
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		if ( !jQuery.support.shrinkWrapBlocks ) {
-			anim.done(function() {
-				style.overflow = opts.overflow[ 0 ];
-				style.overflowX = opts.overflow[ 1 ];
-				style.overflowY = opts.overflow[ 2 ];
-			});
-		}
-	}
-
-
-	// show/hide pass
-	for ( index in props ) {
-		value = props[ index ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ index ];
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-				continue;
-			}
-			handled.push( index );
-		}
-	}
-
-	length = handled.length;
-	if ( length ) {
-		dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} );
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-			jQuery.removeData( elem, "fxshow", true );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( index = 0 ; index < length ; index++ ) {
-			prop = handled[ index ];
-			tween = anim.createTween( prop, hidden ? dataShow[ prop ] : 0 );
-			orig[ prop ] = dataShow[ prop ] || jQuery.style( elem, prop );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-	}
-}
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
+		swing: function( p, n, firstNum, diff ) {
+			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+		}
+	},
+
+	timers: [],
+
+	fx: function( elem, options, prop ) {
+		this.options = options;
 		this.elem = elem;
 		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
+
+		if ( !options.orig ) {
+			options.orig = {};
+		}
+	}
+
+});
+
+jQuery.fx.prototype = {
+	// Simple function for setting a style value
+	update: function() {
 		if ( this.options.step ) {
 			this.options.step.call( this.elem, this.now, this );
 		}
 
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
+		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+
+		// Set display property to block for height/width animations
+		if ( ( this.prop === "height" || this.prop === "width" ) && this.elem.style ) {
+			this.elem.style.display = "block";
+		}
+	},
+
+	// Get the current size
+	cur: function( force ) {
+		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
+			return this.elem[ this.prop ];
+		}
+
+		var r = parseFloat(jQuery.css(this.elem, this.prop, force));
+		return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
+	},
+
+	// Start an animation from one number to another
+	custom: function( from, to, unit ) {
+		this.startTime = now();
+		this.start = from;
+		this.end = to;
+		this.unit = unit || this.unit || "px";
+		this.now = this.start;
+		this.pos = this.state = 0;
+
+		var self = this;
+		function t( gotoEnd ) {
+			return self.step(gotoEnd);
+		}
+
+		t.elem = this.elem;
+
+		if ( t() && jQuery.timers.push(t) && !timerId ) {
+			timerId = setInterval(jQuery.fx.tick, 13);
+		}
+	},
+
+	// Simple 'show' function
+	show: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.show = true;
+
+		// Begin the animation
+		// Make sure that we start at a small width/height to avoid any
+		// flash of content
+		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
+
+		// Start by showing the element
+		jQuery( this.elem ).show();
+	},
+
+	// Simple 'hide' function
+	hide: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.hide = true;
+
+		// Begin the animation
+		this.custom(this.cur(), 0);
+	},
+
+	// Each step of an animation
+	step: function( gotoEnd ) {
+		var t = now(), done = true;
+
+		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
+			this.now = this.end;
+			this.pos = this.state = 1;
+			this.update();
+
+			this.options.curAnim[ this.prop ] = true;
+
+			for ( var i in this.options.curAnim ) {
+				if ( this.options.curAnim[i] !== true ) {
+					done = false;
+				}
+			}
+
+			if ( done ) {
+				if ( this.options.display != null ) {
+					// Reset the overflow
+					this.elem.style.overflow = this.options.overflow;
+
+					// Reset the display
+					var old = jQuery.data(this.elem, "olddisplay");
+					this.elem.style.display = old ? old : this.options.display;
+
+					if ( jQuery.css(this.elem, "display") === "none" ) {
+						this.elem.style.display = "block";
+					}
+				}
+
+				// Hide the element if the "hide" operation was done
+				if ( this.options.hide ) {
+					jQuery(this.elem).hide();
+				}
+
+				// Reset the properties, if the item has been hidden or shown
+				if ( this.options.hide || this.options.show ) {
+					for ( var p in this.options.curAnim ) {
+						jQuery.style(this.elem, p, this.options.orig[p]);
+					}
+				}
+
+				// Execute the complete function
+				this.options.complete.call( this.elem );
+			}
+
+			return false;
+
 		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
+			var n = t - this.startTime;
+			this.state = n / this.options.duration;
+
+			// Perform the easing function, defaults to swing
+			var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
+			var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
+			this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
+			this.now = this.start + ((this.end - this.start) * this.pos);
+
+			// Perform the next step of the animation
+			this.update();
+		}
+
+		return true;
 	}
 };
 
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// passing any value as a 4th parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails
-			// so, simple values such as "10px" are parsed to Float.
-			// complex values such as "rotate(1rad)" are returned as is.
-			result = jQuery.css( tween.elem, tween.prop, false, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
+jQuery.extend( jQuery.fx, {
+	tick: function() {
+		var timers = jQuery.timers;
+
+		for ( var i = 0; i < timers.length; i++ ) {
+			if ( !timers[i]() ) {
+				timers.splice(i--, 1);
+			}
+		}
+
+		if ( !timers.length ) {
+			jQuery.fx.stop();
+		}
+	},
+		
+	stop: function() {
+		clearInterval( timerId );
+		timerId = null;
+	},
+	
+	speeds: {
+		slow: 600,
+ 		fast: 200,
+ 		// Default speed
+ 		_default: 400
+	},
+
+	step: {
+		opacity: function( fx ) {
+			jQuery.style(fx.elem, "opacity", fx.now);
 		},
-		set: function( tween ) {
-			// use step hook for back compat - use cssHook if its there - use .style if its
-			// available and use plain properties where available
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+
+		_default: function( fx ) {
+			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
+				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
 			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Remove in 2.0 - this supports IE8's panic based approach
-// to setting things on disconnected nodes
-
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ||
-			// special check for .toggle( handler, handler, ... )
-			( !i && jQuery.isFunction( speed ) && jQuery.isFunction( easing ) ) ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
+				fx.elem[ fx.prop ] = fx.now;
+			}
+		}
+	}
 });
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations resolve immediately
-				if ( empty ) {
-					anim.stop( true );
-				}
-			};
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = jQuery._data( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	}
-});
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		attrs = { height: type },
-		i = 0;
-
-	// if we include width, step value is 1 to do all cssExpand values,
-	// if we don't include width, step value is 2 to skip over Left and Right
-	includeWidth = includeWidth? 1 : 0;
-	for( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p*Math.PI ) / 2;
-	}
-};
-
-jQuery.timers = [];
-jQuery.fx = Tween.prototype.init;
-jQuery.fx.tick = function() {
-	var timer,
-		timers = jQuery.timers,
-		i = 0;
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-};
-
-jQuery.fx.timer = function( timer ) {
-	if ( timer() && jQuery.timers.push( timer ) && !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
 
 if ( jQuery.expr && jQuery.expr.filters ) {
@@ -9193,89 +5912,162 @@
 	};
 }
-var rroot = /^(?:body|html)$/i;
-
-jQuery.fn.offset = function( options ) {
-	if ( arguments.length ) {
-		return options === undefined ?
-			this :
-			this.each(function( i ) {
+
+function genFx( type, num ) {
+	var obj = {};
+
+	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
+		obj[ this ] = type;
+	});
+
+	return obj;
+}
+if ( "getBoundingClientRect" in document.documentElement ) {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0];
+
+		if ( options ) { 
+			return this.each(function( i ) {
 				jQuery.offset.setOffset( this, options, i );
 			});
-	}
-
-	var docElem, body, win, clientTop, clientLeft, scrollTop, scrollLeft,
-		box = { top: 0, left: 0 },
-		elem = this[ 0 ],
-		doc = elem && elem.ownerDocument;
-
-	if ( !doc ) {
-		return;
-	}
-
-	if ( (body = doc.body) === elem ) {
-		return jQuery.offset.bodyOffset( elem );
-	}
-
-	docElem = doc.documentElement;
-
-	// Make sure it's not a disconnected DOM node
-	if ( !jQuery.contains( docElem, elem ) ) {
-		return box;
-	}
-
-	// If we don't have gBCR, just use 0,0 rather than error
-	// BlackBerry 5, iOS 3 (original iPhone)
-	if ( typeof elem.getBoundingClientRect !== "undefined" ) {
-		box = elem.getBoundingClientRect();
-	}
-	win = getWindow( doc );
-	clientTop  = docElem.clientTop  || body.clientTop  || 0;
-	clientLeft = docElem.clientLeft || body.clientLeft || 0;
-	scrollTop  = win.pageYOffset || docElem.scrollTop;
-	scrollLeft = win.pageXOffset || docElem.scrollLeft;
-	return {
-		top: box.top  + scrollTop  - clientTop,
-		left: box.left + scrollLeft - clientLeft
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement,
+			clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
+			top  = box.top  + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ) - clientTop,
+			left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
+
+		return { top: top, left: left };
 	};
-};
+
+} else {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0];
+
+		if ( options ) { 
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		jQuery.offset.initialize();
+
+		var offsetParent = elem.offsetParent, prevOffsetParent = elem,
+			doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
+			body = doc.body, defaultView = doc.defaultView,
+			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
+			top = elem.offsetTop, left = elem.offsetLeft;
+
+		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+				break;
+			}
+
+			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+			top  -= elem.scrollTop;
+			left -= elem.scrollLeft;
+
+			if ( elem === offsetParent ) {
+				top  += elem.offsetTop;
+				left += elem.offsetLeft;
+
+				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) {
+					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+				}
+
+				prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
+			}
+
+			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
+				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+			}
+
+			prevComputedStyle = computedStyle;
+		}
+
+		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
+			top  += body.offsetTop;
+			left += body.offsetLeft;
+		}
+
+		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+			top  += Math.max( docElem.scrollTop, body.scrollTop );
+			left += Math.max( docElem.scrollLeft, body.scrollLeft );
+		}
+
+		return { top: top, left: left };
+	};
+}
 
 jQuery.offset = {
+	initialize: function() {
+		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, "marginTop", true) ) || 0,
+			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
+
+		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
+
+		container.innerHTML = html;
+		body.insertBefore( container, body.firstChild );
+		innerDiv = container.firstChild;
+		checkDiv = innerDiv.firstChild;
+		td = innerDiv.nextSibling.firstChild.firstChild;
+
+		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
+		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
+
+		checkDiv.style.position = "fixed", checkDiv.style.top = "20px";
+		// safari subtracts parent border width here which is 5px
+		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
+		checkDiv.style.position = checkDiv.style.top = "";
+
+		innerDiv.style.overflow = "hidden", innerDiv.style.position = "relative";
+		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
+
+		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
+
+		body.removeChild( container );
+		body = container = innerDiv = checkDiv = table = td = null;
+		jQuery.offset.initialize = jQuery.noop;
+	},
 
 	bodyOffset: function( body ) {
-		var top = body.offsetTop,
-			left = body.offsetLeft;
-
-		if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) {
-			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
-			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
+		var top = body.offsetTop, left = body.offsetLeft;
+
+		jQuery.offset.initialize();
+
+		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
+			top  += parseFloat( jQuery.curCSS(body, "marginTop",  true) ) || 0;
+			left += parseFloat( jQuery.curCSS(body, "marginLeft", true) ) || 0;
 		}
 
 		return { top: top, left: left };
 	},
-
+	
 	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
-
 		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
+		if ( /static/.test( jQuery.curCSS( elem, "position" ) ) ) {
 			elem.style.position = "relative";
 		}
-
-		var curElem = jQuery( elem ),
+		var curElem   = jQuery( elem ),
 			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
-
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
+			curTop    = parseInt( jQuery.curCSS( elem, "top",  true ), 10 ) || 0,
+			curLeft   = parseInt( jQuery.curCSS( elem, "left", true ), 10 ) || 0;
 
 		if ( jQuery.isFunction( options ) ) {
@@ -9283,11 +6075,9 @@
 		}
 
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
+		var props = {
+			top:  (options.top  - curOffset.top)  + curTop,
+			left: (options.left - curOffset.left) + curLeft
+		};
+		
 		if ( "using" in options ) {
 			options.using.call( elem, props );
@@ -9300,8 +6090,7 @@
 
 jQuery.fn.extend({
-
 	position: function() {
 		if ( !this[0] ) {
-			return;
+			return null;
 		}
 
@@ -9313,15 +6102,15 @@
 		// Get correct offsets
 		offset       = this.offset(),
-		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+		parentOffset = /^body|html$/i.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
 
 		// Subtract element margins
 		// note: when an element has margin: auto the offsetLeft and marginLeft
 		// are the same in Safari causing offset.left to incorrectly be 0
-		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
-		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
+		offset.top  -= parseFloat( jQuery.curCSS(elem, "marginTop",  true) ) || 0;
+		offset.left -= parseFloat( jQuery.curCSS(elem, "marginLeft", true) ) || 0;
 
 		// Add offsetParent borders
-		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
-		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
+		parentOffset.top  += parseFloat( jQuery.curCSS(offsetParent[0], "borderTopWidth",  true) ) || 0;
+		parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], "borderLeftWidth", true) ) || 0;
 
 		// Subtract the two offsets
@@ -9335,8 +6124,8 @@
 		return this.map(function() {
 			var offsetParent = this.offsetParent || document.body;
-			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+			while ( offsetParent && (!/^body|html$/i.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
 				offsetParent = offsetParent.offsetParent;
 			}
-			return offsetParent || document.body;
+			return offsetParent;
 		});
 	}
@@ -9345,32 +6134,43 @@
 
 // Create scrollLeft and scrollTop methods
-jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
-	var top = /Y/.test( prop );
-
-	jQuery.fn[ method ] = function( val ) {
-		return jQuery.access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? (prop in win) ? win[ prop ] :
-					win.document.documentElement[ method ] :
-					elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : jQuery( win ).scrollLeft(),
-					 top ? val : jQuery( win ).scrollTop()
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
+jQuery.each( ["Left", "Top"], function( i, name ) {
+	var method = "scroll" + name;
+
+	jQuery.fn[ method ] = function(val) {
+		var elem = this[0], win;
+		
+		if ( !elem ) {
+			return null;
+		}
+
+		if ( val !== undefined ) {
+			// Set the scroll offset
+			return this.each(function() {
+				win = getWindow( this );
+
+				if ( win ) {
+					win.scrollTo(
+						!i ? val : jQuery(win).scrollLeft(),
+						 i ? val : jQuery(win).scrollTop()
+					);
+
+				} else {
+					this[ method ] = val;
+				}
+			});
+		} else {
+			win = getWindow( elem );
+
+			// Return the scroll offset
+			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
+				jQuery.support.boxModel && win.document.documentElement[ method ] ||
+					win.document.body[ method ] :
+				elem[ method ];
+		}
 	};
 });
 
 function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
+	return ("scrollTo" in elem && elem.document) ?
 		elem :
 		elem.nodeType === 9 ?
@@ -9378,63 +6178,63 @@
 			false;
 }
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-		// margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return jQuery.access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, value, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
-	});
+// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function( i, name ) {
+
+	var type = name.toLowerCase();
+
+	// innerHeight and innerWidth
+	jQuery.fn["inner" + name] = function() {
+		return this[0] ?
+			jQuery.css( this[0], type, false, "padding" ) :
+			null;
+	};
+
+	// outerHeight and outerWidth
+	jQuery.fn["outer" + name] = function( margin ) {
+		return this[0] ?
+			jQuery.css( this[0], type, false, margin ? "margin" : "border" ) :
+			null;
+	};
+
+	jQuery.fn[ type ] = function( size ) {
+		// Get window width or height
+		var elem = this[0];
+		if ( !elem ) {
+			return size == null ? null : this;
+		}
+		
+		if ( jQuery.isFunction( size ) ) {
+			return this.each(function( i ) {
+				var self = jQuery( this );
+				self[ type ]( size.call( this, i, self[ type ]() ) );
+			});
+		}
+
+		return ("scrollTo" in elem && elem.document) ? // does it walk and quack like a window?
+			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+			elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
+			elem.document.body[ "client" + name ] :
+
+			// Get document width or height
+			(elem.nodeType === 9) ? // is it a document
+				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+				Math.max(
+					elem.documentElement["client" + name],
+					elem.body["scroll" + name], elem.documentElement["scroll" + name],
+					elem.body["offset" + name], elem.documentElement["offset" + name]
+				) :
+
+				// Get or set width or height on the element
+				size === undefined ?
+					// Get width or height on the element
+					jQuery.css( elem, type ) :
+
+					// Set the width or height on the element (default to pixels if value is unitless)
+					this.css( type, typeof size === "string" ? size : size + "px" );
+	};
+
 });
 // Expose jQuery to the global object
 window.jQuery = window.$ = jQuery;
 
-// Expose jQuery as an AMD module, but only for AMD loaders that
-// understand the issues with loading multiple versions of jQuery
-// in a page that all might call define(). The loader will indicate
-// they have special allowances for multiple jQuery versions by
-// specifying define.amd.jQuery = true. Register as a named module,
-// since jQuery can be concatenated with other files that may use define,
-// but not use a proper concatenation script that understands anonymous
-// AMD modules. A named AMD is safest and most robust way to register.
-// Lowercase jquery is used because AMD module names are derived from
-// file names, and jQuery is normally delivered in a lowercase file name.
-// Do this after creating the global so that if an AMD module wants to call
-// noConflict to hide this version of jQuery, it will work.
-if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
-	define( "jquery", [], function () { return jQuery; } );
-}
-
-})( window );
+})(window);
Index: admin/js/jsToolBar/jsToolBar.wysiwyg.js
===================================================================
--- admin/js/jsToolBar/jsToolBar.wysiwyg.js	(revision 925)
+++ admin/js/jsToolBar/jsToolBar.wysiwyg.js	(revision 0)
@@ -478,5 +478,4 @@
 	[/<\/(strong|em|ins|del|q|code)>(\s*?)<\1>/gim, "$2"],
 	[/<(br|BR)>/g, "<br />"],
-	[/<(hr|HR)>/g, "<hr />"],
 	/* opera est trop strict ;)) */
 	[/([^\s])\/>/g, "$1 />"],
Index: admin/langs.php
===================================================================
--- admin/langs.php	(revision 907)
+++ admin/langs.php	(revision 782)
@@ -136,9 +136,11 @@
 
 if (!empty($_GET['removed'])) {
-	dcPage::message(__('Language has been successfully deleted.'));
+	echo '<p class="message">'.__('Language has been successfully deleted.').'</p>';
 }
 
 if (!empty($_GET['added'])) {
-	dcPage::message(($_GET['added'] == 2 ? __('Language has been successfully upgraded') : __('Language has been successfully installed.')));
+	echo	'<p class="message">'.
+	($_GET['added'] == 2 ? __('Language has been successfully upgraded') : __('Language has been successfully installed.')).
+	'</p>';
 }
 
@@ -171,8 +173,10 @@
 {
 	echo
-	'<table class="clear plugins"><tr>'.
-	'<th>'.__('Language').'</th>'.
-	'<th class="nowrap">'.__('Action').'</th>'.
-	'</tr>';
+	'<table class="clear plugins">'.
+	'<thead><tr>'.
+	'<th scope="col">'.__('Language').'</th>'.
+	'<th scope="col" class="nowrap">'.__('Action').'</th>'.
+	'</tr></thead>'.
+	'<tbody>';
 	
 	foreach ($locales_content as $k => $v)
@@ -182,6 +186,6 @@
 		echo
 		'<tr class="line wide">'.
-		'<td class="maximal nowrap">('.$k.') '.
-		'<strong>'.html::escapeHTML($iso_codes[$k]).'</strong></td>'.
+		'<th scope="row" class="maximal nowrap">('.$k.') '.
+		'<strong>'.html::escapeHTML($iso_codes[$k]).'</strong></th>'.
 		'<td class="nowrap action">';
 		
@@ -200,5 +204,7 @@
 		echo '</td></tr>';
 	}
-	echo '</table>';
+	echo
+	'</tbody>'.
+	'</table>';
 }
 
@@ -226,5 +232,5 @@
 	'Proposed languages are based on your version: %s.'),'<strong>'.DC_VERSION.'</strong>').'</p>'.
 	'<p class="field"><label for="pkg_url" class="classic">'.__('Language:').' '.
-	form::combo(array('pkg_url'),$dc_langs_combo).'</label></p>'.
+	form::combo('pkg_url',$dc_langs_combo).'</label></p>'.
 	'<p class="field"><label for="your_pwd1" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').' '.
 	form::password(array('your_pwd','your_pwd1'),20,255).'</label></p>'.
Index: admin/media.php
===================================================================
--- admin/media.php	(revision 977)
+++ admin/media.php	(revision 747)
@@ -218,5 +218,5 @@
 
 # DISPLAY confirm page for rmdir & rmfile
-if ($dir && !empty($_GET['remove']) && empty($_GET['noconfirm']))
+if ($dir && !empty($_GET['remove']))
 {
 	call_user_func($open_f,__('Media manager'));
@@ -255,25 +255,25 @@
 
 if (!empty($_GET['mkdok'])) {
-	dcPage::message(__('Directory has been successfully created.'));
+	echo '<p class="message">'.__('Directory has been successfully created.').'</p>';
 }
 
 if (!empty($_GET['upok'])) {
-	dcPage::message(__('Files have been successfully uploaded.'));
+	echo '<p class="message">'.__('Files have been successfully uploaded.').'</p>';
 }
 
 if (!empty($_GET['rmfok'])) {
-	dcPage::message(__('File has been successfully removed.'));
+	echo '<p class="message">'.__('File has been successfully removed.').'</p>';
 }
 
 if (!empty($_GET['rmdok'])) {
-	dcPage::message(__('Directory has been successfully removed.'));
+	echo '<p class="message">'.__('Directory has been successfully removed.').'</p>';
 }
 
 if (!empty($_GET['rebuildok'])) {
-	dcPage::message(__('Directory has been successfully rebuilt.'));
+	echo '<p class="message">'.__('Directory has been successfully rebuilt.').'</p>';
 }
 
 if (!empty($_GET['unzipok'])) {
-	dcPage::message(__('Zip file has been successfully extracted.'));
+	echo '<p class="message">'.__('Zip file has been successfully extracted.').'</p>';
 }
 
@@ -358,5 +358,5 @@
 	__('Private').'</label></p>'.
 	'<p class="form-help info">'.__('To send several files at the same time, you can activate the enhanced uploader in').
-	' <a href="preferences.php?tab=user-options">'.__('My preferences').'</a></p>'.
+	'<a href="preferences.php?tab=user-options"> '.__('My preferences').'</a></p>'.
 	'<p><input type="submit" value="'.__('Send').'" />'.
 	form::hidden(array('d'),$d).'</p>'.
Index: admin/media_item.php
===================================================================
--- admin/media_item.php	(revision 950)
+++ admin/media_item.php	(revision 663)
@@ -15,6 +15,4 @@
 dcPage::check('media,media_admin');
 
-$tab = empty($_REQUEST['tab']) ? '' : $_REQUEST['tab'];
-
 $post_id = !empty($_GET['post_id']) ? (integer) $_GET['post_id'] : null;
 if ($post_id) {
@@ -105,5 +103,5 @@
 	try {
 		$core->media->updateFile($file,$newFile);
-		http::redirect($page_url.'&id='.$id.'&fupd=1&tab=media-details-tab');
+		http::redirect($page_url.'&id='.$id.'&fupd=1');
 	} catch (Exception $e) {
 		$core->error->add($e->getMessage());
@@ -117,5 +115,5 @@
 		$foo = null;
 		$core->media->mediaFireRecreateEvent($file);
-		http::redirect($page_url.'&id='.$id.'&thumbupd=1&tab=media-details-tab');
+		http::redirect($page_url.'&id='.$id.'&thumbupd=1');
 	} catch (Exception $e) {
 		$core->error->add($e->getMessage());
@@ -159,11 +157,5 @@
 /* DISPLAY Main page
 -------------------------------------------------------- */
-$starting_scripts = 
-	'<script type="text/javascript">'."\n".
-	"//<![CDATA["."\n".
-	dcPage::jsVar('dotclear.msg.confirm_delete_media',__('Are you sure to delete this media?'))."\n".
-	"//]]>".
-	"</script>".
-	dcPage::jsLoad('js/_media_item.js');
+$starting_scripts = dcPage::jsLoad('js/_media_item.js');
 if ($popup) {
 	$starting_scripts .=
@@ -173,5 +165,5 @@
 	$starting_scripts.
 	dcPage::jsDatePicker().
-	dcPage::jsPageTabs($tab)
+	dcPage::jsPageTabs()
 );
 
@@ -182,8 +174,8 @@
 
 if (!empty($_GET['fupd']) || !empty($_GET['fupl'])) {
-	dcPage::message(__('File has been successfully updated.'));
+	echo '<p class="message">'.__('File has been successfully updated.').'</p>';
 }
 if (!empty($_GET['thumbupd'])) {
-	dcPage::message(__('Thumbnails have been successfully updated.'));
+	echo '<p class="message">'.__('Thumbnails have been successfully updated.').'</p>';
 }
 
@@ -201,14 +193,4 @@
 	'<form id="media-insert-form" action="" method="get">';
 	
-	$media_img_default_size = $core->blog->settings->system->media_img_default_size;
-	if ($media_img_default_size == '') {
-		$media_img_default_size = 'm';
-	}
-	$media_img_default_alignment = $core->blog->settings->system->media_img_default_alignment;
-	if ($media_img_default_alignment == '') {
-		$media_img_default_alignment = 'none';
-	}
-	$media_img_default_link = (boolean)$core->blog->settings->system->media_img_default_link;
-
 	if ($file->media_type == 'image')
 	{
@@ -218,5 +200,5 @@
 			$media_desc = '';
 		}
-
+		
 		echo
 		'<h3>'.__('Image size:').'</h3> ';
@@ -225,10 +207,10 @@
 		echo '<p>';
 		foreach (array_reverse($file->media_thumb) as $s => $v) {
-			$s_checked = ($s == $media_img_default_size);
+			$s_checked = ($s == 'm');
 			echo '<label class="classic">'.
 			form::radio(array('src'),html::escapeHTML($v),$s_checked).' '.
 			$core->media->thumb_sizes[$s][2].'</label><br /> ';
 		}
-		$s_checked = (!isset($file->media_thumb[$media_img_default_size]));
+		$s_checked = (!isset($file->media_thumb['m']));
 		echo '<label class="classic">'.
 		form::radio(array('src'),$file->file_url,$s_checked).' '.__('original').'</label><br /> ';
@@ -238,8 +220,8 @@
 		echo '<h3>'.__('Image alignment').'</h3>';
 		$i_align = array(
-			'none' => array(__('None'),($media_img_default_alignment == 'none' ? 1 : 0)),
-			'left' => array(__('Left'),($media_img_default_alignment == 'left' ? 1 : 0)),
-			'right' => array(__('Right'),($media_img_default_alignment == 'right' ? 1 : 0)),
-			'center' => array(__('Center'),($media_img_default_alignment == 'center' ? 1 : 0))
+			'none' => array(__('None'),1),
+			'left' => array(__('Left'),0),
+			'right' => array(__('Right'),0),
+			'center' => array(__('Center'),0)
 		);
 		
@@ -254,7 +236,7 @@
 		'<h3>'.__('Image insertion').'</h3>'.
 		'<p>'.
-		'<label for="insert1" class="classic">'.form::radio(array('insertion','insert1'),'simple',!$media_img_default_link).
+		'<label for="insert1" class="classic">'.form::radio(array('insertion','insert1'),'simple',true).
 		__('As a single image').'</label><br />'.
-		'<label for="insert2" class="classic">'.form::radio(array('insertion','insert2'),'link',$media_img_default_link).
+		'<label for="insert2" class="classic">'.form::radio(array('insertion','insert2'),'link',false).
 		__('As a link to original image').'</label>'.
 		'</p>';
@@ -264,12 +246,12 @@
 		$media_type = 'mp3';
 		
-		echo '<h3>'.__('MP3 disposition').'</h3>';
-		dcPage::message(__("Please note that you cannot insert mp3 files with visual editor."),false);
+		echo '<h3>'.__('MP3 disposition').'</h3>'.
+		'<p class="message">'.__("Please note that you cannot insert mp3 files with visual editor.").'</p>';
 		
 		$i_align = array(
-			'none' => array(__('None'),($media_img_default_alignment == 'none' ? 1 : 0)),
-			'left' => array(__('Left'),($media_img_default_alignment == 'left' ? 1 : 0)),
-			'right' => array(__('Right'),($media_img_default_alignment == 'right' ? 1 : 0)),
-			'center' => array(__('Center'),($media_img_default_alignment == 'center' ? 1 : 0))
+			'none' => array(__('None'),0),
+			'left' => array(__('Left'),0),
+			'right' => array(__('Right'),0),
+			'center' => array(__('Center'),1)
 		);
 		
@@ -289,5 +271,6 @@
 		$media_type = 'flv';
 		
-		dcPage::message(__("Please note that you cannot insert video files with visual editor."),false);
+		echo
+		'<p class="message">'.__("Please note that you cannot insert video files with visual editor.").'</p>';
 		
 		echo
@@ -302,8 +285,8 @@
 		
 		$i_align = array(
-			'none' => array(__('None'),($media_img_default_alignment == 'none' ? 1 : 0)),
-			'left' => array(__('Left'),($media_img_default_alignment == 'left' ? 1 : 0)),
-			'right' => array(__('Right'),($media_img_default_alignment == 'right' ? 1 : 0)),
-			'center' => array(__('Center'),($media_img_default_alignment == 'center' ? 1 : 0))
+			'none' => array(__('None'),0),
+			'left' => array(__('Left'),0),
+			'right' => array(__('Right'),0),
+			'center' => array(__('Center'),1)
 		);
 		
@@ -357,7 +340,7 @@
 		$strong_link = ($s == $thumb_size) ? '<strong>%s</strong>' : '%s';
 		printf($strong_link,'<a href="'.html::escapeURL($page_url).
-		'&amp;id='.$id.'&amp;size='.$s.'&amp;tab=media-details-tab">'.$core->media->thumb_sizes[$s][2].'</a> | ');
-	}
-	echo '<a href="'.html::escapeURL($page_url).'&amp;id='.$id.'&amp;size=o&amp;tab=media-details-tab">'.__('original').'</a>';
+		'&amp;id='.$id.'&amp;size='.$s.'">'.$core->media->thumb_sizes[$s][2].'</a> | ');
+	}
+	echo '<a href="'.html::escapeURL($page_url).'&amp;id='.$id.'&amp;size=o">'.__('original').'</a>';
 	echo '</p>';
 	
@@ -394,5 +377,5 @@
 {
 	echo
-	'<p><strong><a href="'.html::escapeHTML($page_url).'&amp;id='.$id.'&amp;find_posts=1&amp;tab=media-details-tab">'.
+	'<p><strong><a href="'.html::escapeHTML($page_url).'&amp;id='.$id.'&amp;find_posts=1">'.
 	__('Show entries containing this media').'</a></strong></p>';
 }
@@ -435,23 +418,8 @@
 		echo '<ul>';
 		while ($rs->fetch()) {
-			$img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
-			switch ($rs->post_status) {
-				case 1:
-					$img_status = sprintf($img,__('published'),'check-on.png');
-					break;
-				case 0:
-					$img_status = sprintf($img,__('unpublished'),'check-off.png');
-					break;
-				case -1:
-					$img_status = sprintf($img,__('scheduled'),'scheduled.png');
-					break;
-				case -2:
-					$img_status = sprintf($img,__('pending'),'check-wrn.png');
-					break;
-			}
-			echo '<li>'.$img_status.' '.'<a href="'.$core->getPostAdminURL($rs->post_type,$rs->post_id).'">'.
-				$rs->post_title.'</a>'.
-				($rs->post_type != 'post' ? ' ('.html::escapeHTML($rs->post_type).')' : '').
-				' - '.dt::dt2str(__('%Y-%m-%d %H:%M'),$rs->post_dt).'</li>';
+			echo '<li><a href="'.$core->getPostAdminURL($rs->post_type,$rs->post_id).'">'.
+			$rs->post_title.'</a>'.
+			($rs->post_type != 'post' ? ' ('.html::escapeHTML($rs->post_type).')' : '').
+			' - '.dt::dt2str(__('%Y-%m-%d %H:%M'),$rs->post_dt).'</li>';
 		}
 		echo '</ul>';
@@ -549,17 +517,4 @@
 	'</fieldset></form>';
 
-	if ($file->del) {
-		echo
-		'<form id="delete-form" method="post" action="'.html::escapeURL($media_page_url).
-		'&amp;d='.rawurlencode(dirname($file->relname)).
-		'&amp;remove='.rawurlencode($file->basename).'">'.
-		'<p><input name="delete" type="submit" class="delete" value="'.__('Delete this media').'" />'.
-		form::hidden('remove',rawurlencode($file->basename)).
-		form::hidden('rmyes',1).
-		$core->formNonce().'</p>'.
-		'</form>';
-	}
-
-
 	# --BEHAVIOR-- adminMediaItemForm
 	$core->callBehavior('adminMediaItemForm',$file);
Index: admin/permissions.php
===================================================================
--- admin/permissions.php	(revision 536)
+++ admin/permissions.php	(revision 536)
@@ -0,0 +1,160 @@
+<?php
+# -- BEGIN LICENSE BLOCK ---------------------------------------
+#
+# This file is part of Dotclear 2.
+#
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
+# Licensed under the GPL version 2.0 license.
+# See LICENSE file or
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
+# -- END LICENSE BLOCK -----------------------------------------
+
+require dirname(__FILE__).'/../inc/admin/prepend.php';
+
+dcPage::checkSuper();
+
+$changes = false;
+$blogs = array();
+$users = array();
+
+# Check users
+if (!empty($_REQUEST['user_id']) && is_array($_REQUEST['user_id']))
+{
+	foreach ($_REQUEST['user_id'] as $u)
+	{
+		if ($core->userExists($u)) {
+			$users[] = $u;
+		}
+	}
+}
+
+# Check blogs
+if (!empty($_REQUEST['blog_id']) && is_array($_REQUEST['blog_id']))
+{
+	foreach ($_REQUEST['blog_id'] as $b)
+	{
+		if ($core->blogExists($b)) {
+			$blogs[] = $b;
+		}
+	}
+}
+
+# Update permissions
+if (!empty($_POST['upd_perm']) && !empty($users) && !empty($blogs))
+{
+	$redir = 'permissions.php?upd=1';
+	
+	try
+	{
+		if (empty($_POST['your_pwd']) || !$core->auth->checkPassword(crypt::hmac(DC_MASTER_KEY,$_POST['your_pwd']))) {
+			throw new Exception(__('Password verification failed'));
+		}
+		
+		foreach ($users as $u)
+		{
+			foreach ($blogs as $b)
+			{
+				$set_perms = array();
+				
+				if (!empty($_POST['perm'][$b]))
+				{
+					foreach ($_POST['perm'][$b] as $perm_id => $v)
+					{
+						if ($v) {
+							$set_perms[$perm_id] = true;
+						}
+					}
+				}
+				
+				$core->setUserBlogPermissions($u, $b, $set_perms, true);
+			}
+			
+			$redir .= '&user_id[]='.$u;
+		}
+		
+		foreach ($blogs as $b) {
+			$redir .= '&blog_id[]='.$b;
+		}
+		http::redirect($redir);
+	}
+	catch (Exception $e)
+	{
+		$core->error->add($e->getMessage());
+	}
+}
+
+
+
+if (empty($blogs) || empty($users)) {
+	$core->error->add(__('No blog or user given.'));
+}
+
+
+/* DISPLAY
+-------------------------------------------------------- */
+dcPage::open(__('permissions'),
+	dcPage::jsLoad('js/_permissions.js')
+);
+
+echo '<h2><a href="users.php">'.__('Users').'</a> &rsaquo; <span class="page-title">'.__('Permissions').'</span></h2>';
+
+if (!empty($_GET['upd'])) {
+		echo '<p class="message">'.__('The permissions have been successfully updated.').'</p>';
+}
+
+if (!empty($blogs) && !empty($users))
+{
+	$perm_form = '';
+	
+	if (count($users) == 1) {
+			$user_perm = $core->getUserPermissions($users[0]);	
+	}
+	
+	foreach ($users as $u) {
+		$user_list[] = '<a href="user.php?id='.$u.'">'.$u.'</a>';
+	}
+	
+	echo '<p>'.sprintf(__('You are about to change permissions on the following blogs for users %s.'),
+	implode(', ',$user_list));
+	
+	echo '<form id="permissions-form" action="permissions.php" method="post">';
+	
+	foreach ($blogs as $b)
+	{
+		echo '<h3><a href="blog.php?id='.html::escapeHTML($b).'">'.html::escapeHTML($b).'</a>'.
+		form::hidden(array('blog_id[]'),$b).'</h3>';
+		
+		foreach ($core->auth->getPermissionsTypes() as $perm_id => $perm)
+		{
+			$checked = false;
+			
+			if (count($users) == 1) {
+				$checked = isset($user_perm[$b]['p'][$perm_id]) && $user_perm[$b]['p'][$perm_id];
+			}
+			
+			echo
+			'<p><label for="perm'.html::escapeHTML($b).html::escapeHTML($perm_id).'" class="classic">'.
+			form::checkbox(array('perm['.html::escapeHTML($b).']['.html::escapeHTML($perm_id).']','perm'.html::escapeHTML($b).html::escapeHTML($perm_id)),
+			1,$checked).' '.
+			__($perm).'</label></p>';
+		}
+	}
+	
+	echo
+	'<fieldset><legend>'.__('Validate permissions').'</legend>'.
+	'<p><label for="your_pwd">'.__('Your password:').
+	form::password('your_pwd',20,255).'</label></p>'.
+	'</fieldset>'.
+	'<p><input type="submit" accesskey="s" value="'.__('Save').'" />'.
+	$core->formNonce();
+	
+	foreach ($users as $u) {
+		echo form::hidden(array('user_id[]'),$u);
+	}
+	
+	echo	form::hidden('upd_perm',1).'</p></form>';
+}
+
+dcPage::close();
+?>
Index: admin/permissions_blog.php
===================================================================
--- admin/permissions_blog.php	(revision 782)
+++ admin/permissions_blog.php	(revision 782)
@@ -0,0 +1,116 @@
+<?php
+# -- BEGIN LICENSE BLOCK ---------------------------------------
+#
+# This file is part of Dotclear 2.
+#
+# Copyright (c) 2003-2010 Olivier Meunier & Association Dotclear
+# Licensed under the GPL version 2.0 license.
+# See LICENSE file or
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
+# -- END LICENSE BLOCK -----------------------------------------
+
+require dirname(__FILE__).'/../inc/admin/prepend.php';
+
+dcPage::checkSuper();
+
+$q = !empty($_GET['q']) ? $_GET['q'] : '';
+
+# Check users
+if (!empty($_REQUEST['user_id']) && is_array($_REQUEST['user_id']))
+{
+	foreach ($_REQUEST['user_id'] as $u)
+	{
+		if ($core->userExists($u)) {
+			$users[] = $u;
+		}
+	}
+}
+
+if (empty($users))
+{
+	$core->error->add(__('No blog or user given.'));
+}
+else
+{
+	$blogs_list = new adminBlogPermissionsList($core);
+	
+	$params = new ArrayObject();
+	
+	# - Limit, sortby and order filter
+	$params = $blogs_list->applyFilters($params);
+	
+	$show_filters = false;
+	
+	# - Search filter
+	if ($q) {
+		$params['q'] = $q;
+		$show_filters = true;
+	}
+	
+	try {
+		$rs = $core->getBlogs($params);
+		$counter = $core->getBlogs($params,1);
+		$blogs_list->setItems($rs,$counter->f(0));
+	} catch (Exception $e) {
+		$core->error->add($e->getMessage());
+	}
+}
+
+/* DISPLAY
+-------------------------------------------------------- */
+$starting_script = dcPage::jsLoad('js/_permissions_blog.js');
+if (!$show_filters) {
+	$starting_script .= dcPage::jsLoad('js/filter-controls.js');
+}
+dcPage::open(__('choose a blog'),$starting_script);
+
+echo '<h2><a href="users.php">'.__('Users').'</a> &rsaquo; '.__('Choose a blog').'</h2>';
+
+if (!$core->error->flag())
+{
+	$hidden_fields = '';
+	foreach ($users as $u) {
+		$hidden_fields .= form::hidden(array('user_id[]'),$u);
+	}
+	
+	if (!$show_filters) {
+		echo '<p><a id="filter-control" class="form-control" href="#">'.__('Filters').'</a></p>';
+	}
+	
+	echo
+	'<form action="permissions_blog.php" method="get" id="filters-form">'.
+	'<fieldset class="two-cols"><legend>'.__('Filters').'</legend>'.
+	
+	'<p><label for="q">'.__('Search:').' '.
+	form::field('q',20,255,html::escapeHTML($q)).
+	'</label></p>'.
+	'<p><label for="nb" class="classic">'.	form::field('nb',3,3,$nb_per_page).' '.
+	__('Entries per page').'</label> '.
+	'<input type="submit" value="'.__('Apply filters').'" />'.
+	$hidden_fields.'</p>'.
+	
+	'<br class="clear" />'. //Opera sucks
+	'</fieldset>'.
+	'</form>';
+	
+	echo
+	'<p>'.
+	sprintf(__('Choose one or more blogs to which you want to give permissions to users %s.'),
+	'<strong>'.implode(', ',$users).'</strong>').'</p>';
+	
+	# Show blogs
+	$blogs_list->display('<form action="permissions.php" method="post" id="form-blogs">'.
+		'%s'.
+		'<p class="checkboxes-helpers"></p>'.
+		
+		'<p><input type="submit" value="'.__('set permissions').'" />'.
+		$hidden_fields.
+		$core->formNonce().'</p>'.
+		'</form>'
+	);
+}
+
+dcPage::close();
+
+?>
Index: admin/plugins.php
===================================================================
--- admin/plugins.php	(revision 961)
+++ admin/plugins.php	(revision 782)
@@ -85,12 +85,5 @@
 			}
 			
-			# --BEHAVIOR-- pluginBeforeDeactivate
-			$core->callBehavior('pluginsBeforeDeactivate', $plugin);
-				
 			$core->plugins->deactivateModule($plugin_id);
-
-			# --BEHAVIOR-- pluginAfterDeactivate
-			$core->callBehavior('pluginsAfterDeactivate', $plugin);
-				
 			http::redirect('plugins.php');
 		}
@@ -109,13 +102,5 @@
 				throw new Exception(__('No such plugin.'));
 			}
-
-			# --BEHAVIOR-- pluginBeforeActivate
-			$core->callBehavior('pluginsBeforeActivate', $plugin_id);
-			
 			$core->plugins->activateModule($plugin_id);
-
-			# --BEHAVIOR-- pluginAfterActivate
-			$core->callBehavior('pluginsAfterActivate', $plugin_id);
-			
 			http::redirect('plugins.php');
 		}
@@ -165,13 +150,6 @@
 				unset($client);
 			}
-
-			# --BEHAVIOR-- pluginBeforeAdd
-			$core->callBehavior('pluginsBeforeAdd', $plugin);
-						
+			
 			$ret_code = $core->plugins->installPackage($dest,$core->plugins);
-
-			# --BEHAVIOR-- pluginAfterAdd
-			$core->callBehavior('pluginsAfterAdd', $plugin);
-			
 			http::redirect('plugins.php?added='.$ret_code);
 		}
@@ -198,8 +176,11 @@
 
 if (!empty($_GET['removed'])) {
-	dcPage::message(__('Plugin has been successfully deleted.'));
+	echo
+	'<p class="message">'.__('Plugin has been successfully deleted.').'</p>';
 }
 if (!empty($_GET['added'])) {
-	dcPage::message(($_GET['added'] == 2 ? __('Plugin has been successfully upgraded') : __('Plugin has been successfully installed.')));
+	echo	'<p class="message">'.
+	($_GET['added'] == 2 ? __('Plugin has been successfully upgraded') : __('Plugin has been successfully installed.')).
+	'</p>';
 }
 
@@ -246,28 +227,25 @@
 	echo
 	'<h3>'.__('Activated plugins').'</h3>'.
-	'<table class="clear plugins"><tr>'.
-	'<th>'.__('Plugin').'</th>'.
-	'<th class="nowrap">'.__('Version').'</th>'.
-	'<th class="nowrap">'.__('Details').'</th>'.
-	'<th class="nowrap">'.__('Action').'</th>'.
-	'</tr>';
+	'<table class="clear plugins">'.
+	'<caption>'.__('Activated plugin list').'</caption>'.
+	'<thead><tr>'.
+	'<th scope="col">'.__('Plugin').'</th>'.
+	'<th scope="col" class="nowrap">'.__('Version').'</th>'.
+	'<th scope="col" class="nowrap">'.__('Details').'</th>'.
+	'<th scope="col" class="nowrap">'.__('Action').'</th>'.
+	'</tr></thead>'.
+	'<tbody>';
 	
-	$distrib_plugins = array('aboutConfig','akismet','antispam','attachments','blogroll','blowupConfig','fairTrackbacks',
-		'importExport','maintenance','pages','pings','simpleMenu','tags','themeEditor','userPref','widgets');
-	$distrib_img = '<img src="images/dotclear_pw.png"'.
-		' alt="'.__('Plugin from official distribution').'" title="'.__('Plugin from official distribution').'" />';
-
 	foreach ($p_available as $k => $v)
 	{
 		$is_deletable = $is_writable && preg_match('!^'.$p_path_pat.'!',$v['root']);
 		$is_deactivable = $v['root_writable'];
-		$is_distrib = in_array($k, $distrib_plugins);
 		
 		echo
 		'<tr class="line wide">'.
-		'<td class="minimal nowrap"><strong>'.html::escapeHTML($k).'</strong></td>'.
+		'<th scope="row" class="minimal nowrap"><strong>'.html::escapeHTML($k).'</strong></th>'.
 		'<td class="minimal">'.html::escapeHTML($v['version']).'</td>'.
-		'<td class="maximal'.($is_distrib ? ' distrib' : '').'"><strong>'.html::escapeHTML(__($v['name'])).'</strong> '.
-		'<br />'.html::escapeHTML(__($v['desc'])).($is_distrib ? ' '.$distrib_img : '').'</td>'.
+		'<td class="maximal"><strong>'.html::escapeHTML($v['name']).'</strong> '.
+		'<br />'.html::escapeHTML($v['desc']).'</td>'.
 		'<td class="nowrap action">';
 		
@@ -290,4 +268,5 @@
 	}
 	echo
+	'</tbody>'.
 	'</table>';
 }
@@ -299,8 +278,11 @@
 	echo
 	'<h3>'.__('Deactivated plugins').'</h3>'.
-	'<table class="clear plugins"><tr>'.
-	'<th>'.__('Plugin').'</th>'.
-	'<th class="nowrap">'.__('Action').'</th>'.
-	'</tr>';
+	'<table class="clear plugins">'.
+	'<caption>'.__('Deactivated plugin list').'</caption>'.
+	'<thead><tr>'.
+	'<th scope="col">'.__('Plugin').'</th>'.
+	'<th scope="col" class="nowrap">'.__('Action').'</th>'.
+	'</tr></thead>'.
+	'<tbody>';
 	
 	foreach ($p_disabled as $k => $v)
@@ -311,5 +293,5 @@
 		echo
 		'<tr class="line wide">'.
-		'<td class="maximal nowrap"><strong>'.html::escapeHTML($k).'</strong></td>'.
+		'<th scope="row" class="maximal nowrap"><strong>'.html::escapeHTML($k).'</strong></th>'.
 		'<td class="nowrap action">';
 		
@@ -333,4 +315,5 @@
 	}
 	echo
+	'</tbody>'.
 	'</table>';
 }
Index: admin/popup_posts.php
===================================================================
--- admin/popup_posts.php	(revision 557)
+++ admin/popup_posts.php	(revision 782)
@@ -17,11 +17,11 @@
 $q = !empty($_GET['q']) ? $_GET['q'] : null;
 
-$page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
-$nb_per_page =  10;
+$post_list = new adminPostMiniList($core);
 
 $params = array();
-$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
 $params['no_content'] = true;
-$params['order'] = 'post_dt DESC';
+
+# - Limit, sortby and order filter
+$params = $post_list->applyFilters($params);
 
 if ($q) {
@@ -43,5 +43,5 @@
 	$posts = $core->blog->getPosts($params);
 	$counter = $core->blog->getPosts($params,true);
-	$post_list = new adminPostMiniList($core,$posts,$counter->f(0));
+	$post_list->setItems($posts,$counter->f(0));
 } catch (Exception $e) {
 	$core->error->add($e->getMessage());
@@ -49,5 +49,5 @@
 
 echo '<div id="form-entries">'; # I know it's not a form but we just need the ID
-$post_list->display($page,$nb_per_page);
+$post_list->display();
 echo '</div>';
 
Index: admin/post.php
===================================================================
--- admin/post.php	(revision 957)
+++ admin/post.php	(revision 782)
@@ -66,5 +66,4 @@
 	$status_combo[$v] = (string) $k;
 }
-$img_status_pattern = '<img class="img_select_option" alt="%1$s" title="%1$s" src="images/%2$s" />';
 
 # Formaters combo
@@ -88,6 +87,4 @@
 unset($rs);
 
-# Validation flag
-$bad_dt = false;
 
 # Get entry informations
@@ -169,17 +166,6 @@
 		$post_dt = '';
 	} else {
-		try
-		{
-			$post_dt = strtotime($_POST['post_dt']);
-			if ($post_dt == false || $post_dt == -1) {
-				$bad_dt = true;
-				throw new Exception(__('Invalid publication date'));
-			}
-			$post_dt = date('Y-m-d H:i',$post_dt);
-		}
-		catch (Exception $e)
-		{
-			$core->error->add($e->getMessage());
-		}
+		$post_dt = strtotime($_POST['post_dt']);
+		$post_dt = date('Y-m-d H:i',$post_dt);
 	}
 	
@@ -203,5 +189,5 @@
 
 # Create or update post
-if (!empty($_POST) && !empty($_POST['save']) && $can_edit_post && !$bad_dt)
+if (!empty($_POST) && !empty($_POST['save']) && $can_edit_post)
 {
 	$cur = $core->con->openCursor($core->prefix.'post');
@@ -307,19 +293,19 @@
 
 if (!empty($_GET['upd'])) {
-	dcPage::message(__('Entry has been successfully updated.'));
+		echo '<p class="message">'.__('Entry has been successfully updated.').'</p>';
 }
 elseif (!empty($_GET['crea'])) {
-	dcPage::message(__('Entry has been successfully created.'));
+		echo '<p class="message">'.__('Entry has been successfully created.').'</p>';
 }
 elseif (!empty($_GET['attached'])) {
-	dcPage::message(__('File has been successfully attached.'));
+	echo '<p class="message">'.__('File has been successfully attached.').'</p>';
 }
 elseif (!empty($_GET['rmattach'])) {
-	dcPage::message(__('Attachment has been successfully removed.'));
+	echo '<p class="message">'.__('Attachment has been successfully removed.').'</p>';
 }
 
 if (!empty($_GET['creaco'])) {
-	dcPage::message(__('Comment has been successfully created.'));
-}
+		echo '<p class="message">'.__('Comment has been successfully created.').'</p>';
+	}
 
 # XHTML conversion
@@ -328,29 +314,15 @@
 	$post_excerpt = $post_excerpt_xhtml;
 	$post_content = $post_content_xhtml;
+	$post_title = $post_title_xhtml;
 	$post_format = 'xhtml';
 	
-	dcPage::message(__('Don\'t forget to validate your XHTML conversion by saving your post.'));
+	echo '<p class="message">'.__('Don\'t forget to validate your XHTML conversion by saving your post.').'</p>';
 }
 
 echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.'<a href="posts.php">'.__('Entries').'</a> &rsaquo; <span class="page-title">'.$page_title;
-if ($post_id) {
-	switch ($post_status) {
-		case 1:
-			$img_status = sprintf($img_status_pattern,__('published'),'check-on.png');
-			break;
-		case 0:
-			$img_status = sprintf($img_status_pattern,__('unpublished'),'check-off.png');
-			break;
-		case -1:
-			$img_status = sprintf($img_status_pattern,__('scheduled'),'scheduled.png');
-			break;
-		case -2:
-			$img_status = sprintf($img_status_pattern,__('pending'),'check-wrn.png');
-			break;
-		default:
-			$img_status = '';
-	}
-	echo ' &ldquo;'.$post_title.'&rdquo;'.' '.$img_status;
-}
+
+	if ($post_id) {
+		echo ' &ldquo;'.$post_title.'&rdquo;';
+	}
 echo	'</span></h2>';
 
@@ -440,5 +412,5 @@
 	
 	'<p><label for="post_dt">'.__('Published on:').
-	form::field('post_dt',16,16,$post_dt,($bad_dt ? 'invalid' : '')).
+	form::field('post_dt',16,16,$post_dt).
 	'</label></p>'.
 	
@@ -451,18 +423,6 @@
 	'<p><label for="post_open_comment" class="classic">'.form::checkbox('post_open_comment',1,$post_open_comment).' '.
 	__('Accept comments').'</label></p>'.
-	($core->blog->settings->system->allow_comments ? 
-		(isContributionAllowed($post_id,strtotime($post_dt),true) ? 
-			'' :
-			'<p class="form-note warn">'.__('Warning: Comments are not more accepted for this entry.').'</p>') : 
-		'<p class="form-note warn">'.__('Warning: Comments are not accepted on this blog.').'</p>').
-
 	'<p><label for="post_open_tb" class="classic">'.form::checkbox('post_open_tb',1,$post_open_tb).' '.
 	__('Accept trackbacks').'</label></p>'.
-	($core->blog->settings->system->allow_trackbacks ? 
-		(isContributionAllowed($post_id,strtotime($post_dt),false) ? 
-			'' :
-			'<p class="form-note warn">'.__('Warning: Trackbacks are not more accepted for this entry.').'</p>') : 
-		'<p class="form-note warn">'.__('Warning: Trackbacks are not accepted on this blog.').'</p>').
-
 	'<p><label for="post_selected" class="classic">'.form::checkbox('post_selected',1,$post_selected).' '.
 	__('Selected entry').'</label></p>'.
@@ -608,25 +568,4 @@
 }
 
-# Controls comments or trakbacks capabilities
-function isContributionAllowed($id,$dt,$com=true)
-{
-	global $core;
-
-	if (!$id) {
-		return true;
-	}
-	if ($com) {
-		if (($core->blog->settings->system->comments_ttl == 0) || 
-			(time() - $core->blog->settings->system->comments_ttl*86400 < $dt)) {
-			return true;
-		}
-	} else {
-		if (($core->blog->settings->system->trackbacks_ttl == 0) || 
-			(time() - $core->blog->settings->system->trackbacks_ttl*86400 < $dt)) {
-			return true;
-		}
-	}
-	return false;
-}
 
 # Show comments or trackbacks
@@ -634,11 +573,14 @@
 {
 	echo
-	'<table class="comments-list"><tr>'.
-	'<th colspan="2">'.__('Author').'</th>'.
-	'<th>'.__('Date').'</th>'.
-	'<th class="nowrap">'.__('IP address').'</th>'.
-	'<th>'.__('Status').'</th>'.
-	'<th>&nbsp;</th>'.
-	'</tr>';
+	'<table class="comments-list">'.
+	'<caption>'.__('Post comments and trackbacks').'</caption>'.
+	'<thead><tr>'.
+	'<th scope="col" colspan="2">'.__('Author').'</th>'.
+	'<th scope="col">'.__('Date').'</th>'.
+	'<th scope="col" class="nowrap">'.__('IP address').'</th>'.
+	'<th scope="col">'.__('Status').'</th>'.
+	'<th scope="col">&nbsp;</th>'.
+	'</tr></thead>'.
+	'<tbody>';
 	
 	while($rs->fetch())
@@ -668,5 +610,5 @@
 		'<td class="nowrap">'.
 		($has_action ? form::checkbox(array('comments[]'),$rs->comment_id,'','','',0,'title="'.($tb ? __('select this trackback') : __('select this comment')).'"') : '').'</td>'.
-		'<td class="maximal">'.html::escapeHTML($rs->comment_author).'</td>'.
+		'<th scope="row" class="maximal">'.html::escapeHTML($rs->comment_author).'</th>'.
 		'<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$rs->comment_dt).'</td>'.
 		'<td class="nowrap"><a href="comments.php?ip='.$rs->comment_ip.'">'.$rs->comment_ip.'</a></td>'.
@@ -678,5 +620,7 @@
 	}
 	
-	echo '</table>';
+	echo
+	'</tbody>'.
+	'</table>';
 }
 
Index: admin/posts.php
===================================================================
--- admin/posts.php	(revision 796)
+++ admin/posts.php	(revision 782)
@@ -48,5 +48,4 @@
 	# Filter form we'll put in html_block
 	$users_combo = $categories_combo = array();
-	$users_combo['-'] = $categories_combo['-'] = '';
 	while ($users->fetch())
 	{
@@ -63,5 +62,5 @@
 	$categories_combo[__('None')] = 'NULL';
 	while ($categories->fetch()) {
-		$categories_combo[str_repeat('&nbsp;&nbsp;',$categories->level-1).($categories->level-1 == 0 ? '' : '&bull; ').
+		$categories_combo[str_repeat('&nbsp;&nbsp;',$categories->level-1).'&bull; '.
 			html::escapeHTML($categories->cat_title).
 			' ('.$categories->nb_post.')'] = $categories->cat_id;
@@ -69,5 +68,4 @@
 	
 	$status_combo = array(
-	'-' => ''
 	);
 	foreach ($core->blog->getAllPostStatus() as $k => $v) {
@@ -76,33 +74,16 @@
 	
 	$selected_combo = array(
-	'-' => '',
-	__('selected') => '1',
-	__('not selected') => '0'
+	__('is selected') => '1',
+	__('is not selected') => '0'
 	);
 	
 	# Months array
-	$dt_m_combo['-'] = '';
 	while ($dates->fetch()) {
 		$dt_m_combo[dt::str('%B %Y',$dates->ts())] = $dates->year().$dates->month();
 	}
 	
-	$lang_combo['-'] = '';
 	while ($langs->fetch()) {
 		$lang_combo[$langs->post_lang] = $langs->post_lang;
 	}
-	
-	$sortby_combo = array(
-	__('Date') => 'post_dt',
-	__('Title') => 'post_title',
-	__('Category') => 'cat_title',
-	__('Author') => 'user_id',
-	__('Status') => 'post_status',
-	__('Selected') => 'post_selected'
-	);
-	
-	$order_combo = array(
-	__('Descending') => 'desc',
-	__('Ascending') => 'asc'
-	);
 }
 
@@ -138,108 +119,63 @@
 /* Get posts
 -------------------------------------------------------- */
-$user_id = !empty($_GET['user_id']) ?	$_GET['user_id'] : '';
-$cat_id = !empty($_GET['cat_id']) ?	$_GET['cat_id'] : '';
-$status = isset($_GET['status']) ?	$_GET['status'] : '';
-$selected = isset($_GET['selected']) ?	$_GET['selected'] : '';
-$month = !empty($_GET['month']) ?		$_GET['month'] : '';
-$lang = !empty($_GET['lang']) ?		$_GET['lang'] : '';
-$sortby = !empty($_GET['sortby']) ?	$_GET['sortby'] : 'post_dt';
-$order = !empty($_GET['order']) ?		$_GET['order'] : 'desc';
-
-$show_filters = false;
-
-$page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
-$nb_per_page =  30;
-
-if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
-	if ($nb_per_page != $_GET['nb']) {
-		$show_filters = true;
-	}
-	$nb_per_page = (integer) $_GET['nb'];
-}
-
-$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
+$post_list = new adminPostList($core);
+
+$params = new ArrayObject();
 $params['no_content'] = true;
 
-# - User filter
-if ($user_id !== '' && in_array($user_id,$users_combo)) {
-	$params['user_id'] = $user_id;
-	$show_filters = true;
-} else {
-	$user_id='';
-}
-
-# - Categories filter
-if ($cat_id !== '' && in_array($cat_id,$categories_combo)) {
-	$params['cat_id'] = $cat_id;
-	$show_filters = true;
-} else {
-	$cat_id='';
-}
-
-# - Status filter
-if ($status !== '' && in_array($status,$status_combo)) {
-	$params['post_status'] = $status;
-	$show_filters = true;
-} else {
-	$status='';
-}
-
-# - Selected filter
-if ($selected !== '' && in_array($selected,$selected_combo)) {
-	$params['post_selected'] = $selected;
-	$show_filters = true;
-} else {
-	$selected='';
-}
-
-# - Month filter
-if ($month !== '' && in_array($month,$dt_m_combo)) {
-	$params['post_month'] = substr($month,4,2);
-	$params['post_year'] = substr($month,0,4);
-	$show_filters = true;
-} else {
-	$month='';
-}
-
-# - Lang filter
-if ($lang !== '' && in_array($lang,$lang_combo)) {
-	$params['post_lang'] = $lang;
-	$show_filters = true;
-} else {
-	$lang='';
-}
-
-# - Sortby and order filter
-if ($sortby !== '' && in_array($sortby,$sortby_combo)) {
-	if ($order !== '' && in_array($order,$order_combo)) {
-		$params['order'] = $sortby.' '.$order;
-	} else {
-		$order='desc';
-	}
-	
-	if ($sortby != 'post_dt' || $order != 'desc') {
-		$show_filters = true;
-	}
-} else {
-	$sortby='post_dt';
-	$order='desc';
-}
+$filterSet = new dcFilterSet('posts','posts.php');
+class monthComboFilter extends comboFilter {
+	public function applyFilter($params) {
+		$month=$this->values[0];
+		$params['post_month'] = substr($month,4,2);
+		$params['post_year'] = substr($month,0,4);
+	}
+}
+$filterSet
+	->addFilter(new comboFilter(
+		'users',__('Author'), __('Author'), 'user_id', $users_combo))
+	->addFilter(new categoryFilter(
+		'category',__('Category'), __('Category'), 'cat_id', $categories_combo))
+	->addFilter(new comboFilter(
+		'post_status',__('Status'), __('Status'), 'post_status', $status_combo))
+	->addFilter(new booleanFilter(
+		'post_selected',__('Selected'), __('The post : '),'post_selected', $selected_combo))
+	->addFilter(new comboFilter(
+		'lang',__('Lang'), __('Lang'), 'post_lang', $lang_combo))
+	->addFilter(new monthComboFilter(
+		'month',__('Month'),__('Month'), 'post_month', $dt_m_combo,array('singleval' => 1)))
+	->addFilter(new textFilter(
+		'search',__('Contains'),__('The entry contains'), 'search',20,255));
+
+$core->callBehavior('adminPostsFilters',$filterSet);
+$filterSet->setExtra($post_list);
+
+$filterSet->setup($_GET,$_POST);
 
 # Get posts
 try {
+	$nfparams = $params->getArrayCopy();
+	$filtered = $filterSet->applyFilters($params);
+	$core->callBehavior('adminPostsParams',$params);
 	$posts = $core->blog->getPosts($params);
 	$counter = $core->blog->getPosts($params,true);
-	$post_list = new adminPostList($core,$posts,$counter->f(0));
-} catch (Exception $e) {
-	$core->error->add($e->getMessage());
-}
+	if ($filtered) {
+		$totalcounter = $core->blog->getPosts($nfparams,true);
+		$page_title = sprintf(__('Entries / %s filtered out of %s'),$counter->f(0),$totalcounter->f(0));
+	} else {
+		$page_title = __('Entries');
+		$filters_info = '';
+	}
+	$post_list->setItems($posts,$counter->f(0));
+} catch (Exception $e) {
+	$core->error->add($e->getMessage());
+}
+
 
 /* DISPLAY
 -------------------------------------------------------- */
 $starting_script = dcPage::jsLoad('js/_posts_list.js');
-if (!$show_filters) {
-	$starting_script .= dcPage::jsLoad('js/filter-controls.js');
-}
+
+$starting_script .= $filterSet->header();
 
 dcPage::open(__('Entries'),$starting_script);
@@ -250,49 +186,8 @@
 	'<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Entries').'</span></h2>'.
 	'<p class="top-add"><a class="button add" href="post.php">'.__('New entry').'</a></p>';
-	
-	if (!$show_filters) {
-		echo '<p><a id="filter-control" class="form-control" href="#">'.
-		__('Filters').'</a></p>';
-	}
-	
-	echo
-	'<form action="posts.php" method="get" id="filters-form">'.
-	'<fieldset><legend>'.__('Filters').'</legend>'.
-	'<div class="three-cols">'.
-	'<div class="col">'.
-	'<label for="user_id">'.__('Author:').
-	form::combo('user_id',$users_combo,$user_id).'</label> '.
-	'<label for="cat_id">'.__('Category:').
-	form::combo('cat_id',$categories_combo,$cat_id).'</label> '.
-	'<label for="status">'.__('Status:').
-	form::combo('status',$status_combo,$status).'</label> '.
-	'</div>'.
-	
-	'<div class="col">'.
-	'<label for="selected">'.__('Selected:').
-	form::combo('selected',$selected_combo,$selected).'</label> '.
-	'<label for="month">'.__('Month:').
-	form::combo('month',$dt_m_combo,$month).'</label> '.
-	'<label for="lang">'.__('Lang:').
-	form::combo('lang',$lang_combo,$lang).'</label> '.
-	'</div>'.
-	
-	'<div class="col">'.
-	'<p><label for="sortby">'.__('Order by:').
-	form::combo('sortby',$sortby_combo,$sortby).'</label> '.
-	'<label for="order">'.__('Sort:').
-	form::combo('order',$order_combo,$order).'</label></p>'.
-	'<p><label for="nb" class="classic">'.	form::field('nb',3,3,$nb_per_page).' '.
-	__('Entries per page').'</label></p> '.
-	'<p><input type="submit" value="'.__('Apply filters').'" /></p>'.
-	'</div>'.
-	'</div>'.
-	'<br class="clear" />'. //Opera sucks
-	'</fieldset>'.
-	'</form>';
-	
+
+	$filterSet->display();
 	# Show posts
-	$post_list->display($page,$nb_per_page,
-	'<form action="posts_actions.php" method="post" id="form-entries">'.
+	$post_list->display('<form action="posts_actions.php" method="post" id="form-entries">'.
 	
 	'%s'.
@@ -304,19 +199,11 @@
 	form::combo('action',$combo_action).
 	'<input type="submit" value="'.__('ok').'" /></p>'.
-	form::hidden(array('user_id'),$user_id).
-	form::hidden(array('cat_id'),$cat_id).
-	form::hidden(array('status'),$status).
-	form::hidden(array('selected'),$selected).
-	form::hidden(array('month'),$month).
-	form::hidden(array('lang'),$lang).
-	form::hidden(array('sortby'),$sortby).
-	form::hidden(array('order'),$order).
-	form::hidden(array('page'),$page).
-	form::hidden(array('nb'),$nb_per_page).
+	str_replace('%','%%',$filterSet->getFormFieldsAsHidden()).
 	$core->formNonce().
 	'</div>'.
 	'</form>'
 	);
-}
+	}
+
 
 dcPage::helpBlock('core_posts');
Index: admin/posts_actions.php
===================================================================
--- admin/posts_actions.php	(revision 500)
+++ admin/posts_actions.php	(revision 782)
@@ -31,14 +31,5 @@
 	{
 		$redir =
-		'posts.php?user_id='.$_POST['user_id'].
-		'&cat_id='.$_POST['cat_id'].
-		'&status='.$_POST['status'].
-		'&selected='.$_POST['selected'].
-		'&month='.$_POST['month'].
-		'&lang='.$_POST['lang'].
-		'&sortby='.$_POST['sortby'].
-		'&order='.$_POST['order'].
-		'&page='.$_POST['page'].
-		'&nb='.$_POST['nb'];
+		'posts.php?'.urldecode($_POST['f_query']);
 	}
 	
Index: admin/preferences.php
===================================================================
--- admin/preferences.php	(revision 907)
+++ admin/preferences.php	(revision 745)
@@ -42,5 +42,4 @@
 }
 $user_ui_iconset = @$core->auth->user_prefs->interface->iconset;
-$user_ui_nofavmenu = $core->auth->user_prefs->interface->nofavmenu;
 
 $default_tab = !empty($_GET['tab']) ? html::escapeHTML($_GET['tab']) : 'user-profile';
@@ -162,6 +161,6 @@
 		$cur->user_options = new ArrayObject($user_options);
 		
-		# --BEHAVIOR-- adminBeforeUserOptionsUpdate
-		$core->callBehavior('adminBeforeUserOptionsUpdate',$cur,$core->auth->userID());
+		# --BEHAVIOR-- adminBeforeUserUpdate
+		$core->callBehavior('adminBeforeUserUpdate',$cur,$core->auth->userID());
 		
 		# Update user prefs
@@ -176,11 +175,10 @@
 		}
 		$core->auth->user_prefs->interface->put('iconset',(!empty($_POST['user_ui_iconset']) ? $_POST['user_ui_iconset'] : ''));
-		$core->auth->user_prefs->interface->put('nofavmenu',!empty($_POST['user_ui_nofavmenu']),'boolean');
 		
 		# Udate user
 		$core->updUser($core->auth->userID(),$cur);
 		
-		# --BEHAVIOR-- adminAfterUserOptionsUpdate
-		$core->callBehavior('adminAfterUserOptionsUpdate',$cur,$core->auth->userID());
+		# --BEHAVIOR-- adminAfterUserUpdate
+		$core->callBehavior('adminAfterUserUpdate',$cur,$core->auth->userID());
 		
 		http::redirect('preferences.php?updated=1');
@@ -343,5 +341,5 @@
 	dcPage::jsLoad('js/_preferences.js').
 	($user_acc_nodragdrop ? '' : dcPage::jsLoad('js/_preferences-dragdrop.js')).
-	dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+	dcPage::jsLoad('js/jquery/jquery-ui-1.8.12.custom.min.js').
 	dcPage::jsPageTabs($default_tab).
 	dcPage::jsConfirmClose('user-form').
@@ -352,20 +350,20 @@
 
 if (!empty($_GET['upd'])) {
-	dcPage::message(__('Personal information has been successfully updated.'));
+		echo '<p class="message">'.__('Personal information has been successfully updated.').'</p>';
 }
 if (!empty($_GET['updated'])) {
-	dcPage::message(__('Personal options has been successfully updated.'));
+		echo '<p class="message">'.__('Personal options has been successfully updated.').'</p>';
 }
 if (!empty($_GET['append'])) {
-	dcPage::message(__('Favorites have been successfully added.'));
+		echo '<p class="message">'.__('Favorites have been successfully added.').'</p>';
 }
 if (!empty($_GET['neworder'])) {
-	dcPage::message(__('Favorites have been successfully updated.'));
+	echo '<p class="message">'.__('Favorites have been successfully updated.').'</p>';
 }
 if (!empty($_GET['removed'])) {
-	dcPage::message(__('Favorites have been successfully removed.'));
+		echo '<p class="message">'.__('Favorites have been successfully removed.').'</p>';
 }
 if (!empty($_GET['replaced'])) {
-	dcPage::message(__('Default favorites have been successfully updated.'));
+		echo '<p class="message">'.__('Default favorites have been successfully updated.').'</p>';
 }
 
@@ -458,9 +456,5 @@
 '<p><label for="user_ui_enhanceduploader" class="classic">'.
 form::checkbox('user_ui_enhanceduploader',1,$user_ui_enhanceduploader).' '.
-__('Activate enhanced uploader in media manager').'</label></p>'.
-
-'<p><label for="user_ui_nofavmenu" class="classic">'.
-form::checkbox('user_ui_nofavmenu',1,$user_ui_nofavmenu).' '.
-__('Hide My favorites menu').'</label></p>';
+__('Activate enhanced uploader in media manager').'</label></p>';
 
 if (count($iconsets_combo) > 1) {
Index: admin/services.php
===================================================================
--- admin/services.php	(revision 323)
+++ admin/services.php	(revision 782)
@@ -25,4 +25,5 @@
 $core->rest->addFunction('delMeta',array('dcRestMethods','delMeta'));
 $core->rest->addFunction('setPostMeta',array('dcRestMethods','setPostMeta'));
+$core->rest->addFunction('searchCommentAuthor',array('dcRestMethods','searchCommentAuthor'));
 $core->rest->addFunction('searchMeta',array('dcRestMethods','searchMeta'));
 
@@ -392,4 +393,29 @@
 		return $rsp;
 	}
+
+	public static function searchCommentAuthor($core,$get)
+	{
+		$q = !empty($get['q']) ? strtoupper($get['q']) : null;
+		
+		$strReq = 'SELECT DISTINCT C.comment_author '.
+			'FROM '.$core->prefix.'comment C '.
+			'INNER JOIN '.$core->prefix.'post P on C.post_id = P.post_id '.
+			'WHERE P.blog_id = \''.$core->blog->id.'\' '.
+			'AND UPPER(comment_author) like \'%'.$core->con->escape($q).'%\''
+			;
+		//echo $strReq;
+		$rs = $core->con->select($strReq);
+		$rsp = new xmlTag();
+		
+		while ($rs->fetch())
+		{
+			$author = new xmlTag('author');
+			$author->name=$rs->comment_author;
+			$rsp->insertNode($author);
+		}
+		
+		return $rsp;
+	}
+
 }
 ?>
Index: admin/style/candyUpload/style.css
===================================================================
--- admin/style/candyUpload/style.css	(revision 951)
+++ admin/style/candyUpload/style.css	(revision 536)
@@ -60,8 +60,5 @@
 	color: white;
 	font-weight: bold;
-	border-radius: 2px;
-	-o-border-radius: 2px;
 	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
 }
 .cu-btn {
Index: admin/style/default.css
===================================================================
--- admin/style/default.css	(revision 972)
+++ admin/style/default.css	(revision 883)
@@ -11,6 +11,4 @@
 # -- END LICENSE BLOCK -----------------------------------------
 */
-
-/* ------------------------------------------------------------------ html */
 body {
 	font: 75%/1.5em Helvetica,Arial,sans-serif;
@@ -40,4 +38,5 @@
 	margin-bottom: 0.6em;
 }
+
 h2 {
 	color: #666;
@@ -52,7 +51,9 @@
 	font-size: 1.2em;
 }
+
 p, div.p {
 	margin: 0 0 1em 0;
 }
+
 hr {
 	height: 1px;
@@ -61,4 +62,5 @@
 	border-style: solid;
 }
+
 pre, code {
 	font: 100% "Andale Mono","Courier New",monospace;
@@ -77,4 +79,5 @@
 	cursor: help;
 }
+
 
 /* LAYOUT
@@ -195,5 +198,4 @@
 	-webkit-border-radius: .5em;
 	-moz-border-radius: .5em;
-	-o-border-radius: .5em;
 	border-radius: .5em;
 	border: 1px solid #ddd;
@@ -280,5 +282,5 @@
 	float: left;
 	margin-top: 1.2em;
-	margin-bottom: 3em;
+	margin-bottom: 1em;
 }
 #main-menu h3 {
@@ -338,6 +340,10 @@
 #footer {
 	clear: both;
-	padding: .75em 0;
-	background: #575859 url(dc_logo_small.png) no-repeat 8px bottom;
+	padding: .75em 2em;
+	margin: 6em 15px .5em 15px;
+	-webkit-border-radius: .3em;
+	-moz-border-radius: .3em;
+	border-radius: .3em;
+	background: #575859 url(dc_logo_small.png) no-repeat right bottom;
 	color: #fff;
 }
@@ -372,5 +378,4 @@
 	border: 1px solid #999;
 	padding: 1em 1em 0 1em;
-	-o-border-radius: 4px;
 	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
@@ -439,4 +444,5 @@
 	color: #666;
 }
+
 #dashboard-items {
 	float: left;
@@ -507,5 +513,4 @@
 	border: 1px solid #ccc;
 	border-left: 1em solid #E5E3DA;
-	-o-border-radius: .3em;
 	-moz-border-radius: .3em;
 	-webkit-border-radius: .3em;
@@ -547,4 +552,5 @@
 	height: 500px;
 }
+
 #add-file-f {
 	position: relative;
@@ -630,8 +636,10 @@
 	display: inline;
 }
+
 #default-favs h3 {
 	margin-top: 2em;
 	margin-bottom: 1em;
 }
+
 .fav-list {
 	list-style-type: none;
@@ -660,5 +668,4 @@
 	border: 1px solid #ddd;
 	padding: .2em;
-	-o-border-radius: .5em;
 	-moz-border-radius: .5em;
 	-webkit-border-radius: .5em;
@@ -757,5 +764,4 @@
 	border: 1px solid #f3f3f3;
 	cursor: pointer;
-	-o-border-radius: 4px;
 	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
@@ -798,6 +804,6 @@
 }
 #help-button {
-	position: fixed;
-	top: 3.2em;
+	position: absolute;
+	top: 6.2em;
 	right: 0px;
 	cursor: pointer;
@@ -809,5 +815,4 @@
 	text-transform: capitalize;
 	padding: .33em .75em .33em 1em;
-	border-radius: 1em 0 0 1em;
 	-moz-border-radius: 1em 0 0 1em;
 	-webkit-border-top-left-radius: 1em;
@@ -874,7 +879,6 @@
 div.message, p.message, 
 div.static-msg, p.static-msg {
-	padding: 0.5em 0.5em 0.5em 48px;
+	padding: 0.5em 0.5em 0.5em 40px;
 	margin-bottom: 1em;
-	-o-border-radius: 8px;
 	-moz-border-radius: 8px;
 	-webkit-border-radius: 8px;
@@ -886,10 +890,10 @@
 }
 div.error, p.error {
-	background: #ffdec8 url(msg-error.png) no-repeat .7em .7em;
-	color: #000;
+	background: #e5bfbf url(msg-error.png) no-repeat 5px 5px;
+	color: #600;
 }
 div.message, p.message, 
 div.static-msg, p.static-msg {
-	background: #666 url(msg-std.png) no-repeat .7em .7em;
+	background: #666 url(msg-std.png) no-repeat 5px 5px;
 	color: #fff;
 }
@@ -938,4 +942,5 @@
 	vertical-align: middle;
 }
+
 /* Si quelque chose a besoin d'être caché sauf pour les revues d'écran */
 .hidden {
@@ -972,7 +977,9 @@
 	overflow: auto;
 }
+
 .grid {
 	background: transparent repeat url('grid.png') 0 0;
 }
+
 .line p {
 	margin: 0;
@@ -981,4 +988,5 @@
 	color: #666;
 }
+
 ul.nice {
 	margin: 1em 0;
@@ -1007,9 +1015,4 @@
 	right: 0;
 }
-.distrib img {
-	display: block;
-	float: right;
-	margin-top: -1em;
-}
 /* TABLES
 -------------------------------------------------------- */
@@ -1029,5 +1032,4 @@
 	margin-bottom: .5em;
 }
-
 th, td {
 	border-width: 0 0 1px 0;
@@ -1039,9 +1041,9 @@
 th {
 	text-align: left;
-	border-bottom-color: #666;
 }
 .noborder td, td.noborder, .noborder th, th.noborder {
 	border-width: 0;
 }
+
 table .maximal, table.maximal {
 	width: 100%;
@@ -1050,22 +1052,8 @@
 	width: 1px;
 }
+
 table .nowrap {
 	white-space: nowrap;
 	vertical-align: top;
-}
-table.settings, table.prefs {
-	width: 80%;
-}
-table.settings th:first-child, table.prefs th:first-child {
-	width: 20%;
-}
-table.settings th + th, table.prefs th + th {
-	width: 30%;
-}
-table.settings th + th + th, table.prefs th + th + th {
-	width: 10%;
-}
-table.settings th:last-child, table.prefs th:last-child {
-	width: 40%;
 }
 
@@ -1140,4 +1128,5 @@
 	font-weight: normal;
 }
+
 input, textarea, select {
 	background: #f9f9f9;
@@ -1147,10 +1136,4 @@
 	border-color: #000 #ccc #ccc #000;
 }
-input.invalid, textarea.invalid, select.invalid {
-	border: 1px solid red;
-	background: #fff; 
-	color: red;
-	box-shadow: 0 0 0 1px rgba(218, 62, 90, 0.3)
-}
 input, textarea, select, option {
 	font: 1em "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;
@@ -1172,4 +1155,5 @@
 	background: transparent;
 }
+
 label {
 	display: block;
@@ -1183,9 +1167,4 @@
 	color: #666;
 }
-span.form-note {
-	font-style:italic;
-	font-weight: normal;
-	color: #666;
-}
 p.form-note.warn, p.form-note.info, p.warning {
 	font-style: normal;
@@ -1193,9 +1172,9 @@
 }
 p.form-note.warn, p.warning {
-	background: #ffd url(warning.png) no-repeat .3em .3em;
+	background: #ffd url(warning.png) no-repeat .2em .2em;
 	border: 1px solid #f0c020;
 }
 p.form-note.info {
-	background: #eef url(info.png) no-repeat .3em .2em;
+	background: #eef url(info.png) no-repeat .2em .2em;
 	border: 1px solid #99f;
 }
@@ -1217,4 +1196,5 @@
 	resize: vertical;
 }
+
 label.required {
 	font-weight: bold;
@@ -1229,5 +1209,5 @@
 p.field {
 	position: relative;
-	
+
 }
 p.field label {
@@ -1241,4 +1221,5 @@
 	top: 0;
 }
+
 label .maximal, textarea.maximal, input.maximal {
 	width: 100%;
@@ -1255,4 +1236,15 @@
 	padding-left: 20px;
 }
+
+a#toggle-filters {
+	font-weight: bold;
+	background: url(../images/plus.png) no-repeat 0 0;
+	padding-left: 20px;
+}
+
+a#toggle-filters.opened {
+	background: url(../images/minus.png) no-repeat 0 0;
+}
+
 .constrained {
 	margin: 0;
@@ -1285,5 +1277,4 @@
 	-webkit-border-radius: .2em;
 	-moz-border-radius: .2em;
-	-o-border-radius: .2em;
 	border-radius: .2em;
 	margin-bottom: .1em;
@@ -1369,8 +1360,7 @@
 	-webkit-border-radius: .5em;
 	-moz-border-radius: .5em;
-	-o-border-radius: .5em;
 	border-radius: .5em;
 	margin-bottom: .1em;	
-	background: #2C8FD1 url(../images/add.png) no-repeat 6px center;
+	background: #2C8FD1 url(add.png) no-repeat 6px center;
 	color: #fff;
 	padding: .2em 16px .2em 30px;
@@ -1380,2 +1370,29 @@
 	background-color: #2373A8;
 }
+
+form#filters {font-size: 100%; background: #f0f0f0; padding: 1em; border-radius: .5em; border: 1px solid #ddd;}
+form#filters .margintop {padding-top: 1.33em;}
+form#filters ul, form#filters p {list-style-type:none;margin: 0; padding: 0 0 .5em 0; margin-left: 1em;}
+form#filters .col30 {border-left: 1px solid #999;}
+form#filters .col30 h3 {margin-left: 1em;}
+
+p.line, li.line { position: relative; padding: 3px 0 0 28px; margin: 0 0 1em 0;}
+li.line input[type=submit] {position: absolute; left:0;top:0; padding: 0 .1em; margin: 0;}
+li.line input[type=checkbox], li.line input[type=checkbox] {position: absolute; left: 0; top: .2em; padding: 0 .1em; margin: 0;}
+li.line select { margin-right: 2em;}
+li.line label { display: block; width: 8em; float: left;}
+li.line label img {margin-right: 8px;}
+li.line span.or {
+	text-align: right;
+	margin-left: 5em;
+	font-weight: bold;
+}
+p.line label.or + select {margin-left: 2em;}
+li.line { padding: 0 0 0 20px; height: 1em;}
+li.line label {width: auto;}
+
+#available_filters input[type=submit] {padding: 0 .1em; margin-left: .5em;}
+
+div.pagination span, div.pagination a {
+	margin-right: 1em;
+}
Index: admin/style/install.css
===================================================================
--- admin/style/install.css	(revision 951)
+++ admin/style/install.css	(revision 269)
@@ -19,5 +19,4 @@
 	padding:1em 2em;
 	border:1px #ccc solid;
-	-o-border-radius:8px;
 	-moz-border-radius:8px;
 	-webkit-border-radius:8px;
@@ -48,6 +47,4 @@
 body.install .msg {
 	padding:10px 10px 10px 60px;
-	border-radius:8px;
-	-o-border-radius:8px;
 	-moz-border-radius:8px;
 	-webkit-border-radius:8px;
@@ -71,6 +68,4 @@
 	padding: 0.5em 0.5em 0.5em 60px;
 	margin-bottom: 1em;
-	border-radius: 8px;
-	-o-border-radius: 8px;
 	-moz-border-radius: 8px;
 	-webkit-border-radius: 8px;
@@ -134,6 +129,4 @@
 	background-color: #666;
 	padding: 0 10px;
-	border-radius: 2px;
-	-o-border-radius: 2px;
 	-moz-border-radius: 2px;
 	-webkit-border-radius: 2px;
@@ -151,5 +144,4 @@
 	-webkit-border-radius: .2em;
 	-moz-border-radius: .2em;
-	-o-border-radius: .2em;
 	border-radius: .2em;
 	margin-bottom: .1em;
Index: admin/style/jquery-ui-1.8.16.custom.css
===================================================================
--- admin/style/jquery-ui-1.8.16.custom.css	(revision 758)
+++ admin/style/jquery-ui-1.8.16.custom.css	(revision 758)
@@ -0,0 +1,568 @@
+/*
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS,%20Tahoma,%20Verdana,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
+.ui-widget-content a { color: #333333; }
+.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header a { color: #ffffff; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fed22f; background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_ef8c08_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_228ef1_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffd27a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
+.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
+ * jQuery UI Resizable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }	
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.16
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*
+ * jQuery UI Slider 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
Index: admin/style/jsToolBar/jsToolBar.css
===================================================================
--- admin/style/jsToolBar/jsToolBar.css	(revision 951)
+++ admin/style/jsToolBar/jsToolBar.css	(revision 3)
@@ -82,8 +82,5 @@
 	color: #fff;
 	background: #999;
-	-o-border-radius: 0 0 2px 2px;
 	-moz-border-radius: 0 0 2px 2px;
-	-webkit-border-radius: 0 0 2px 2px;
-	border-radius: 0 0 2px 2px;
 }
 .jstSwitcher a {
Index: admin/trackbacks.php
===================================================================
--- admin/trackbacks.php	(revision 907)
+++ admin/trackbacks.php	(revision 510)
@@ -92,5 +92,5 @@
 
 if (!empty($_GET['sent'])) {
-	dcPage::message(__('All pings sent.'));
+		echo '<p class="message">'.__('All pings sent.').'</p>';
 }
 
Index: admin/update.php
===================================================================
--- admin/update.php	(revision 941)
+++ admin/update.php	(revision 769)
@@ -42,9 +42,4 @@
 $step = in_array($step,array('check','download','backup','unzip')) ? $step : '';
 
-$default_tab = !empty($_GET['tab']) ? html::escapeHTML($_GET['tab']) : 'update';
-if (!empty($_POST['backup_file'])) {
-	$default_tab = 'files';
-}
-
 $archives = array();
 foreach (files::scanDir(DC_BACKUP_PATH) as $v) {
@@ -53,9 +48,4 @@
 	}
 }
-if (!empty($archives)) {
-	$archives = array_reverse($archives);
-} else {
-	$default_tab = 'update';
-}
 
 # Revert or delete backup file
@@ -71,5 +61,5 @@
 				throw new Exception(sprintf(__('Unable to delete file %s'),html::escapeHTML($b_file)));
 			}
-			http::redirect($p_url.'?tab=files');
+			http::redirect($p_url);
 		}
 		
@@ -79,5 +69,5 @@
 			$zip->unzipAll(DC_BACKUP_PATH.'/');
 			@unlink(DC_BACKUP_PATH.'/'.$b_file);
-			http::redirect($p_url.'?tab=files');
+			http::redirect($p_url);
 		}
 	}
@@ -167,7 +157,5 @@
 /* DISPLAY Main page
 -------------------------------------------------------- */
-dcPage::open(__('Dotclear update'),
-	(!$step ? dcPage::jsPageTabs($default_tab) : '')
-);
+dcPage::open(__('Dotclear update'));
 
 if (!$core->error->flag()) {
@@ -177,5 +165,4 @@
 if (!$step)
 {
-	echo '<div class="multi-part" id="update" title="'.__('Dotclear update').'">';
 	if (empty($new_v))
 	{
@@ -196,10 +183,7 @@
 		'</form>';
 	}
-	echo '</div>';
 	
 	if (!empty($archives))
 	{
-		echo '<div class="multi-part" id="files" title="'.__('Manage backup files').'">';
-
 		echo
 		'<h3>'.__('Update backup files').'</h3>'.
@@ -224,6 +208,4 @@
 		$core->formNonce().'</p>'.
 		'</form>';
-
-		echo '</div>';
 	}
 }
Index: admin/user.php
===================================================================
--- admin/user.php	(revision 907)
+++ admin/user.php	(revision 557)
@@ -178,9 +178,9 @@
 
 if (!empty($_GET['upd'])) {
-	dcPage::message(__('User has been successfully updated.'));
+		echo '<p class="message">'.__('User has been successfully updated.').'</p>';
 }
 
 if (!empty($_GET['add'])) {
-	dcPage::message(__('User has been successfully created.'));
+		echo '<p class="message">'.__('User has been successfully created.').'</p>';
 }
 
@@ -290,13 +290,5 @@
 if ($user_id)
 {
-	echo '<div class="clear fieldset"><h3>'.__('Permissions').'</h3>'.
-	'<form action="users_actions.php" method="post">'.
-	'<p><input type="submit" value="'.__('Add new permissions').'" />'.
-	form::hidden(array('redir'),'user.php?id='.$user_id).
-	form::hidden(array('action'),'blogs').
-	form::hidden(array('users[]'),$user_id).
-	$core->formNonce().
-	'</p>'.
-	'</form>';
+	echo '<div class="clear fieldset"><h3>'.__('Permissions').'</h3>';
 	
 	$permissions = $core->getUserPermissions($user_id);
@@ -313,8 +305,8 @@
 			if (count($v['p']) > 0)
 			{
-				echo 
-				'<form action="users_actions.php" method="post">'.
-				'<h4><a href="blog.php?id='.html::escapeHTML($k).'">'.
-				html::escapeHTML($v['name']).'</a> ('.html::escapeHTML($k).')</h4>';
+				echo '<h4><a href="blog.php?id='.html::escapeHTML($k).'">'.
+				html::escapeHTML($v['name']).'</a> ('.html::escapeHTML($k).') - '.
+				'<a href="permissions.php?blog_id[]='.$k.'&amp;user_id[]='.$user_id.'">'
+				.__('Change permissions').'</a></h4>';
 				
 				echo '<ul>';
@@ -324,18 +316,13 @@
 					}
 				}
-				echo '</ul>'.
-				'<p><input type="submit" value="'.__('Change permissions').'" />'.
-				form::hidden(array('redir'),'user.php?id='.$user_id).
-				form::hidden(array('action'),'perms').
-				form::hidden(array('users[]'),$user_id).
-				form::hidden(array('blogs[]'),$k).
-				$core->formNonce().
-				'</p>'.
-				'</form>';
+				echo '</ul>';
 			}
 		}
 	}
 	
-	echo '</div>';
+	echo
+	'<p><a href="permissions_blog.php?user_id[]='.$user_id.'">'.
+	__('Add new permissions').'</a></p>'.
+	'</div>';
 }
 
Index: admin/users.php
===================================================================
--- admin/users.php	(revision 907)
+++ admin/users.php	(revision 782)
@@ -15,7 +15,31 @@
 dcPage::checkSuper();
 
+# Delete users
+if (!empty($delete_users))
+{
+	foreach ($delete_users as $u)
+	{
+		try
+		{
+			# --BEHAVIOR-- adminBeforeUserDelete
+			$core->callBehavior('adminBeforeUserDelete',$u);
+			if ($u != $core->auth->userID()) {
+				$core->delUser($u);
+			}
+		}
+		catch (Exception $e)
+		{
+			$core->error->add($e->getMessage());
+		}
+	}
+	if (!$core->error->flag()) {
+		http::redirect('users.php?del=1');
+	}
+}
+
+
 # Creating filter combo boxes
 $sortby_combo = array(
-__('Username') => 'user_id',
+__('Username') => 'U.user_id',
 __('Last Name') => 'user_name',
 __('First Name') => 'user_firstname',
@@ -31,5 +55,5 @@
 # Actions combo box
 $combo_action = array(
-	__('Set permissions') => 'blogs',
+	__('Set permissions') => 'setpermissions',
 	__('Delete') => 'deleteuser'
 );
@@ -40,18 +64,14 @@
 
 # Get users
-$page = !empty($_GET['page']) ? $_GET['page'] : 1;
-$nb_per_page =  30;
-
-if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
-	$nb_per_page = $_GET['nb'];
-}
+$user_list = new adminUserList($core);
 
 $q = !empty($_GET['q']) ? $_GET['q'] : '';
-$sortby = !empty($_GET['sortby']) ?	$_GET['sortby'] : 'user_id';
-$order = !empty($_GET['order']) ?		$_GET['order'] : 'asc';
-
-$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
 
 $show_filters = false;
+
+$params = new ArrayObject();
+
+# - Limit, sortby and order filter
+$params = $user_list->applyFilters($params);
 
 # - Search filter
@@ -61,29 +81,11 @@
 }
 
-# - Sortby and order filter
-if ($sortby !== '' && in_array($sortby,$sortby_combo)) {
-	if ($order !== '' && in_array($order,$order_combo)) {
-		$params['order'] = $sortby.' '.$order;
-	} else {
-		$order='asc';
-	}
-	
-	if ($sortby != 'user_id' || $order != 'asc') {
-		$show_filters = true;
-	}
-} else {
-	$sortby = 'user_id';
-	$order = 'asc';
-}
-
-# Get users
 try {
 	$rs = $core->getUsers($params);
 	$counter = $core->getUsers($params,1);
-	$user_list = new adminUserList($core,$rs,$counter->f(0));
+	$user_list->setItems($rs,$counter->f(0));
 } catch (Exception $e) {
 	$core->error->add($e->getMessage());
 }
-
 
 /* DISPLAY
@@ -94,13 +96,10 @@
 }
 
-dcPage::open(__('Users'),$starting_script);
+dcPage::open(__('users'),$starting_script);
 
 if (!$core->error->flag())
 {
 	if (!empty($_GET['del'])) {
-		dcPage::message(__('User has been successfully removed.'));
-	}
-	if (!empty($_GET['upd'])) {
-		dcPage::message(__('The permissions have been successfully updated.'));
+		echo '<p class="message">'.__('User has been successfully removed.').'</p>';
 	}
 	
@@ -115,23 +114,10 @@
 	echo
 	'<form action="users.php" method="get" id="filters-form">'.
-	'<fieldset class="two-cols"><legend>'.__('Filters').'</legend>'.
+	'<fieldset><legend>'.__('Filters').'</legend>'.
 	
-	'<div class="col">'.
-	'<p><label for="sortby">'.__('Order by:').' '.
-	form::combo('sortby',$sortby_combo,$sortby).
-	'</label> '.
-	'<label for="order">'.__('Sort:').' '.
-	form::combo('order',$order_combo,$order).
-	'</label></p>'.
-	'</div>'.
-	
-	'<div class="col">'.
 	'<p><label for="q">'.__('Search:').' '.
 	form::field('q',20,255,html::escapeHTML($q)).
 	'</label></p>'.
-	'<p><label for="nb" class="classic">'.	form::field('nb',3,3,$nb_per_page).' '.
-	__('Users per page').'</label> '.
-	'<input type="submit" value="'.__('Apply filters').'" /></p>'.
-	'</div>'.
+	'<p><input type="submit" value="'.__('Apply filters').'" /></p>'.
 	
 	'<br class="clear" />'. //Opera sucks
@@ -140,6 +126,5 @@
 	
 	# Show users
-	$user_list->display($page,$nb_per_page,
-	'<form action="users_actions.php" method="post" id="form-users">'.
+	$user_list->display('<form action="dispatcher.php" method="get" id="form-users">'.
 	
 	'%s'.
@@ -148,16 +133,11 @@
 	'<p class="col checkboxes-helpers"></p>'.
 	
-	'<p class="col right"><label for="action" class="classic">'.
+	'<p class="col right"><label for="dispatch_action" class="classic">'.
 	__('Selected users action:').' '.
-	form::combo('action',$combo_action).
+	form::combo('dispatch_action',$combo_action).
 	'</label> '.
 	'<input type="submit" value="'.__('ok').'" />'.
-	form::hidden(array('q'),html::escapeHTML($q)).
-	form::hidden(array('sortby'),$sortby).
-	form::hidden(array('order'),$order).
-	form::hidden(array('page'),$page).
-	form::hidden(array('nb'),$nb_per_page).
-	$core->formNonce().
 	'</p>'.
+	$user_list->getFormFieldsAsHidden().
 	'</div>'.
 	'</form>'
Index: dmin/users_actions.php
===================================================================
--- admin/users_actions.php	(revision 860)
+++ 	(revision )
@@ -1,284 +1,0 @@
-<?php
-# -- BEGIN LICENSE BLOCK ---------------------------------------
-#
-# This file is part of Dotclear 2.
-#
-# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
-# Licensed under the GPL version 2.0 license.
-# See LICENSE file or
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-#
-# -- END LICENSE BLOCK -----------------------------------------
-
-require dirname(__FILE__).'/../inc/admin/prepend.php';
-
-dcPage::checkSuper();
-
-$users = array();
-if (!empty($_POST['users']) && is_array($_POST['users']))
-{
-	foreach ($_POST['users'] as $u)
-	{
-		if ($core->userExists($u)) {
-			$users[] = $u;
-		}
-	}
-}
-
-$blogs = array();
-if (!empty($_POST['blogs']) && is_array($_POST['blogs']))
-{
-	foreach ($_POST['blogs'] as $b)
-	{
-		if ($core->blogExists($b)) {
-			$blogs[] = $b;
-		}
-	}
-}
-
-/* Actions
--------------------------------------------------------- */
-if (!empty($_POST['action']) && !empty($_POST['users']))
-{
-	$action = $_POST['action'];
-	
-	if (isset($_POST['redir']) && strpos($_POST['redir'],'://') === false)
-	{
-		$redir = $_POST['redir'];
-	}
-	else
-	{
-		$redir =
-		'users.php?q='.$_POST['q'].
-		'&sortby='.$_POST['sortby'].
-		'&order='.$_POST['order'].
-		'&page='.$_POST['page'].
-		'&nb='.$_POST['nb'];
-	}
-	
-	if (empty($users)) {
-		$core->error->add(__('No blog or user given.'));
-	}
-	
-	# --BEHAVIOR-- adminUsersActions
-	$core->callBehavior('adminUsersActions',$core,$users,$blogs,$action,$redir);
-	
-	# Delete users
-	if ($action == 'deleteuser' && !empty($users))
-	{
-		foreach ($users as $u)
-		{
-			try
-			{
-				if ($u == $core->auth->userID()) {
-					throw new Exception(__('Not delete yourself.'));
-				}
-				
-				# --BEHAVIOR-- adminBeforeUserDelete
-				$core->callBehavior('adminBeforeUserDelete',$u);
-				
-				$core->delUser($u);
-			}
-			catch (Exception $e)
-			{
-				$core->error->add($e->getMessage());
-			}
-		}
-		if (!$core->error->flag()) {
-			http::redirect($redir.'&del=1');
-		}
-	}
-	
-	# Update users perms
-	if ($action == 'updateperm' && !empty($users) && !empty($blogs))
-	{
-		try
-		{
-			if (empty($_POST['your_pwd']) || !$core->auth->checkPassword(crypt::hmac(DC_MASTER_KEY,$_POST['your_pwd']))) {
-				throw new Exception(__('Password verification failed'));
-			}
-			
-			foreach ($users as $u)
-			{
-				foreach ($blogs as $b)
-				{
-					$set_perms = array();
-					
-					if (!empty($_POST['perm'][$b]))
-					{
-						foreach ($_POST['perm'][$b] as $perm_id => $v)
-						{
-							if ($v) {
-								$set_perms[$perm_id] = true;
-							}
-						}
-					}
-					
-					$core->setUserBlogPermissions($u,$b,$set_perms,true);
-				}
-			}
-		}
-		catch (Exception $e)
-		{
-			$core->error->add($e->getMessage());
-		}
-		if (!$core->error->flag()) {
-			http::redirect($redir.'&upd=1');
-		}
-	}
-}
-
-/* DISPLAY
--------------------------------------------------------- */
-dcPage::open(
-	__('Users'),
-	dcPage::jsLoad('js/_users_actions.js').
-	# --BEHAVIOR-- adminUsersActionsHeaders
-	$core->callBehavior('adminUsersActionsHeaders')
-);
-
-if (!isset($action)) {
-	dcPage::close();
-	exit;
-}
-
-$hidden_fields = '';
-foreach($users as $u) {
-	$hidden_fields .= form::hidden(array('users[]'),$u);
-}
-
-if (isset($_POST['redir']) && strpos($_POST['redir'],'://') === false)
-{
-	$hidden_fields .= form::hidden(array('redir'),html::escapeURL($_POST['redir']));
-}
-else
-{
-	$hidden_fields .=
-	form::hidden(array('q'),html::escapeHTML($_POST['q'])).
-	form::hidden(array('sortby'),$_POST['sortby']).
-	form::hidden(array('order'),$_POST['order']).
-	form::hidden(array('page'),$_POST['page']).
-	form::hidden(array('nb'),$_POST['nb']);
-}
-
-# --BEHAVIOR-- adminUsersActionsContent
-$core->callBehavior('adminUsersActionsContent',$core,$action,$hidden_fields);
-
-# Blog list where to set permissions
-if (!empty($users) && empty($blogs) && $action == 'blogs')
-{
-	try {
-		$rs = $core->getBlogs();
-		$nb_blog = $rs->count();
-	} catch (Exception $e) { }
-	
-	foreach ($users as $u) {
-		$user_list[] = '<a href="user.php?id='.$u.'">'.$u.'</a>';
-	}
-	
-	echo 
-	'<h2><a href="users.php">'.__('Users').'</a> &rsaquo; <span class="page-title">'.__('Permissions').'</span></h2>'.
-	'<p>'.sprintf(
-		__('Choose one or more blogs to which you want to give permissions to users %s.'),
-		implode(', ',$user_list)
-	).'</p>';
-	
-	if ($nb_blog == 0)
-	{
-		echo '<p><strong>'.__('No blog').'</strong></p>';
-	}
-	else
-	{
-		echo
-		'<form action="users_actions.php" method="post" id="form-blogs">'.
-		'<table class="clear"><tr>'.
-		'<th class="nowrap" colspan="2">'.__('Blog ID').'</th>'.
-		'<th class="nowrap">'.__('Blog name').'</th>'.
-		'<th class="nowrap">'.__('Entries').'</th>'.
-		'<th class="nowrap">'.__('Status').'</th>'.
-		'</tr>';
-		
-		while ($rs->fetch())
-		{
-			$img_status = $rs->blog_status == 1 ? 'check-on' : 'check-off';
-			$txt_status = $core->getBlogStatus($rs->blog_status);
-			$img_status = sprintf('<img src="images/%1$s.png" alt="%2$s" title="%2$s" />',$img_status,$txt_status);
-			
-			echo
-			'<tr class="line">'.
-			'<td class="nowrap">'.
-			form::checkbox(array('blogs[]'),$rs->blog_id,'','','',false,'title="'.__('select').' '.$rs->blog_id.'"').'</td>'.
-			'<td class="nowrap">'.$rs->blog_id.'</td>'.
-			'<td class="maximal">'.html::escapeHTML($rs->blog_name).'</td>'.
-			'<td class="nowrap">'.$core->countBlogPosts($rs->blog_id).'</td>'.
-			'<td class="status">'.$img_status.'</td>'.
-			'</tr>';
-		}
-		
-		echo
-		'</table>'.
-		'<p class="checkboxes-helpers"></p>'.
-		'<p><input type="submit" value="'.__('Set permissions').'" />'.
-		$hidden_fields.
-		form::hidden(array('action'),'perms').
-		$core->formNonce().'</p>'.
-		'</form>';
-	}
-}
-# Permissions list for each selected blogs
-elseif (!empty($blogs) && !empty($users) && $action == 'perms')
-{
-	$user_perm = array();
-	if (count($users) == 1) {
-			$user_perm = $core->getUserPermissions($users[0]);	
-	}
-	
-	foreach ($users as $u) {
-		$user_list[] = '<a href="user.php?id='.$u.'">'.$u.'</a>';
-	}
-	
-	echo 
-	'<h2><a href="users.php">'.__('Users').'</a> &rsaquo; <span class="page-title">'.__('Permissions').'</span></h2>'.
-	'<p>'.sprintf(
-		__('You are about to change permissions on the following blogs for users %s.'),
-		implode(', ',$user_list)
-	).'</p>'.
-	'<form id="permissions-form" action="users_actions.php" method="post">';
-	
-	foreach ($blogs as $b)
-	{
-		echo '<h3><a href="blog.php?id='.html::escapeHTML($b).'">'.html::escapeHTML($b).'</a>'.
-		form::hidden(array('blogs[]'),$b).'</h3>';
-		
-		foreach ($core->auth->getPermissionsTypes() as $perm_id => $perm)
-		{
-			$checked = false;
-			
-			if (count($users) == 1) {
-				$checked = isset($user_perm[$b]['p'][$perm_id]) && $user_perm[$b]['p'][$perm_id];
-			}
-			
-			echo
-			'<p><label for="perm'.html::escapeHTML($b).html::escapeHTML($perm_id).'" class="classic">'.
-			form::checkbox(array('perm['.html::escapeHTML($b).']['.html::escapeHTML($perm_id).']','perm'.html::escapeHTML($b).html::escapeHTML($perm_id)),
-			1,$checked).' '.
-			__($perm).'</label></p>';
-		}
-	}
-	
-	echo
-	'<fieldset><legend>'.__('Validate permissions').'</legend>'.
-	'<p><label for="your_pwd">'.__('Your password:').
-	form::password('your_pwd',20,255).'</label></p>'.
-	'</fieldset>'.
-	'<p><input type="submit" accesskey="s" value="'.__('Save').'" />'.
-	$hidden_fields.
-	form::hidden(array('action'),'updateperm').
-	$core->formNonce().'</p>'.
-	'</form>';
-}
-
-echo '<p><a class="back" href="'.html::escapeURL($redir).'">'.__('back').'</a></p>';
-
-dcPage::close();
-?>
Index: inc/admin/class.dc.filter.php
===================================================================
--- inc/admin/class.dc.filter.php	(revision 886)
+++ inc/admin/class.dc.filter.php	(revision 886)
@@ -0,0 +1,796 @@
+<?php
+# -- BEGIN LICENSE BLOCK ---------------------------------------
+#
+# This file is part of Dotclear 2.
+#
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
+# Licensed under the GPL version 2.0 license.
+# See LICENSE file or
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
+# -- END LICENSE BLOCK -----------------------------------------
+
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief Interface to add extra data to filterset.
+
+Note : the instance will be cloned to ensure dual filter edit fields / displayed fields
+Be sure to enable correct object cloning then, using the __clone method
+*/
+interface dcFilterExtraInterface {
+	/**
+	Return extra data to display in right column
+	
+	@param	core		<b>dcCore</b>		Dotclear core reference
+	@param	form_prefix	<b>string</b>		form prefix to use for parameters
+	*/
+	public function getFormContent();
+
+	/**
+	Set dedicated data from form submission 
+	(either $_GET or $_POST depending on the context
+	
+	@param	data		<b>array</b>		Data to retrieve information from
+	*/
+	public function initializeFromData($data);
+	
+	/**
+	Save data to configuration
+	*/
+	public function save();
+	
+	/**
+	Load data from configuration
+	*/
+	public function load();
+		
+	/**
+	Update query parameters with given settings
+	@param	params		<b>ArrayObject</b>		Params being sent to query
+	*/
+	public function applyFilters($params);
+	
+	
+	/**
+	Update parameters that will be used for inter-forms communications
+	(either query string or hidden fields).
+	The associative has to be updated with $param['key']='value'
+	@param	params		<b>ArrayObject</b>		Params to update
+	*/
+	public function updateRequestParams($params);
+}
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief Dotclear FilterSet class.
+
+Dotclear FilterSet handles filters and columns when displaying items lists.
+*/
+class dcFilterSet {
+
+	protected $lfilters;		/// <b>array</b> lists of defined filters
+	protected $efilters;		/// <b>array</b> lists of defined filters
+	protected $form_prefix;		/// <b>string</b> displayed form prefix
+	protected $action; 			/// <b>string</b> form action page
+	protected $hideform;		/// <b>boolean</b> start form display hidden by default or not
+	protected $lextra;			/// <b>string</b> columns form
+	protected $eextra;			/// <b>string</b> columns form
+	protected $name;			/// <b>string</b> fieldset name
+	
+	/**
+	Inits dcFilterSet object
+	
+	@param	core		<b>dcCore</b>		Dotclear core reference
+	@param	form_prefix	<b>string</b>		form prefix to use for parameters
+	*/
+	public function __construct($name,$action,$form_prefix="f_") {
+		$this->name = $name;
+		$this->form_prefix=$form_prefix;
+		$this->lfilters = new ArrayObject();
+		$this->efilters = new ArrayObject();
+		$this->action = $action;
+		$this->lextra = null;
+		$this->eextra = null;
+		$this->filtered = false;
+	}
+	
+	/**
+	Adds a new filter to list
+	
+	@param	filter		<b>dcFilter</b>		the filter to add
+	*/
+	public function addFilter (Filter $filter) {
+		$filter->setFormPrefix($this->form_prefix);
+		$filter->setFilterSet($this);
+		$this->efilters[$filter->id] = $filter;
+		$this->lfilters[$filter->id] = clone $filter;
+		return $this;
+	}
+	
+	/**
+	Saves user filters to preferences
+	*/
+	protected function saveFilters() {
+		$ser = array();
+		$ws = $GLOBALS['core']->auth->user_prefs->addWorkspace('filters');
+		$data = new ArrayObject();
+		$data= $this->getFiltersAsParams($this->efilters);
+		$ws->put($this->name,serialize($data->getArrayCopy()),'string');
+		return $data;
+	}
+	
+	/**
+	Loads user filters from preferences
+	*/
+	protected function loadFilters() {
+		$ws = $GLOBALS['core']->auth->user_prefs->addWorkspace('filters');
+		$data = (!is_null($ws->{$this->name})) ? unserialize($ws->{$this->name}) : array();
+		if (is_array($data))
+			return $data;
+		else
+			return array();
+	}
+	
+	/**
+	Updates filters values according to form_data
+	To be called before any call to display() or getForm()
+	
+	@param	form_data	<b>array</b>	form values (usually $_GET or $_POST)
+	*/
+	protected function initializeFromData ($filters, $extra, $form_data) {
+		$this->hideform = true;
+		foreach ($filters as $filter) {
+			$filter->initializeFromData ($form_data);
+		}
+		if ($extra != null) {
+			$extra-> initializeFromData ($form_data);
+		}
+	}
+	
+	/**
+	Defines additional form in layout (right column)
+	
+	@param	html	<b>string</b>		the code to add
+	*/
+	public function setExtra($extra)
+	{
+		$this->lextra = $extra;
+		$this->eextra = clone $extra;
+		
+	}
+	
+	/**
+	Returns form fields as hidden fields
+	
+	@return	<b>string</b>	the corresponding html code
+	*/
+	public function getFormFieldsAsHidden() {
+		$ret='';
+		$arr = new ArrayObject();
+		foreach ($this->lfilters as $f) {
+			if ($f->isEnabled())
+				$f->updateRequestParams($arr);
+		}
+		if ($this->lextra != null) {
+			$this->lextra->updateRequestParams($arr);
+		}
+		foreach ($arr as $k=>$v) {
+			$ret.= form::hidden(array($k),$v);
+		}
+		$queryParams = $this->getFiltersAsParams($this->lfilters);
+		if ($this->lextra != null) {
+			$this->lextra->updateRequestParams($queryParams);
+		}
+		$ret .= form::hidden(array($this->form_prefix."query"), http_build_query($queryParams));
+		return $ret;
+	}
+
+	/**
+	Sets up filterset from $get and $post parameters
+	
+	*/
+	public function setup($get,$post) {
+		/* Use cases :
+			(1) $post not empty for formfilter fields :
+				* efilters are set from $post
+				* lfilters are set from $get
+				* keep filters div shown
+			(2) $post empty : 
+				* both efilters and lfilters are set from $get
+				* hide filter div
+		*/
+		$action = false;
+		$allowed_actions = array('clear_filters','add','del_','apply','reset');
+		// Fetch each $post parameter to see whether filters are concerned.
+		// Only 1 action at a time is allowed.
+		foreach ($post as $k => $v) {
+			if (strpos($k,$this->form_prefix)===0) {
+				$tmp = substr($k,strlen($this->form_prefix));
+				foreach ($allowed_actions as $a) {
+					if (strpos($tmp,$a)===0) {
+						$action = $tmp;
+						break;
+					}
+				}
+			}
+		}
+		if ($action !== false) {
+			// Use case (1)
+			if ($action != 'clear_filters' && $action != 'reset')  {
+				$this->initializeFromData($this->efilters,$this->eextra, $post);
+				if ($action == 'add'){
+					if (isset($post['add_filter']) 
+						&& isset($this->efilters[$post['add_filter']])) {
+					$this->efilters[$post['add_filter']]->add();
+					}
+				} elseif (strpos($action,'del_') === 0) {
+					$count = preg_match('#del_(.+)_([0-9]+)#',$action,$match);
+					if (($count == 1) && isset($this->efilters[$match[1]])) {
+						$this->efilters[$match[1]]->remove($match[2]);
+					}
+				} elseif ($action=="apply") {
+					$data = $this->saveFilters();
+					if ($this->eextra != null) {
+						$this->eextra->save();
+					}
+					$query = http_build_query($data,'','&');
+					if ($query != '') {
+						$query = (strpos($this->action,'?') === false ? '?' : '&').$query;
+					}
+					http::redirect($this->action.$query);
+					exit;
+				}
+			}
+			if (isset($post[$this->form_prefix."query"])) {
+				parse_str($post[$this->form_prefix."query"],$out);
+				$this->initializeFromData($this->lfilters,$this->lextra, $out);
+				if ($action == 'reset') {
+					$this->initializeFromData($this->efilters,$this->eextra, $out);
+				}
+			}
+			$this->hideform=false;
+		} else {
+			// Use case (2)
+			$load_from_settings = true;
+			foreach($get as $k=>$v) {
+				if (strpos($k,$this->form_prefix)===0) {
+					$load_from_settings=false;
+					break;
+				}
+			}
+			if ($load_from_settings) {
+				$get = new ArrayObject(array_merge($this->loadFilters(),$get));
+			}
+			$this->initializeFromData($this->efilters, $this->eextra, $get);
+			$this->initializeFromData($this->lfilters, $this->lextra, $get);
+
+		}
+	}
+	/**
+	Retrieves filterset generated form
+	
+	@param	method	<b>string</b>		form method to use (default: "get")
+	*/
+	public function getForm() {
+		$ret = '';
+		
+		if ($this->hideform) {
+			$formclass = ' class="hidden"';
+			$toggleclass = '';
+		} else {
+			$formclass='';
+			$toggleclass = ' class="opened"';
+		}
+		
+		$ret .= '<p>'.
+			'<a href="#" id="toggle-filters"'.$toggleclass.'>'.
+			__('Toggle filters and display options').
+			'</a></p>'.
+			'<div class="two-cols">'.
+			'<form id="filters" action="'.$this->action.'" method="post"'.$formclass.'>'.
+			'<div class="col70">'.
+			'<h3>'.__('Entries filters').'</h3>'.
+			'<table summary="'.__('Query filters').'" id="tfilters">'.
+			'<tbody>';
+		$count=0;
+		$form_combo=array();
+		$form_combo['-']='';
+		if (count($this->efilters)) {
+			foreach ($this->efilters as $filter) {
+				if ($filter->isEnabled()) {
+					$ret .= $filter->getFormLine();
+				}
+				$form_combo[$filter->name]=$filter->id;
+				$count++;
+			}
+		}
+		$ret .= '</tbody></table>'.
+			'<h3 class="margintop">'.__('Add a filter').'</h3>'.
+			'<p id="available_filters">'.
+			form::combo("add_filter",$form_combo).
+			'<input type="submit" value=" + " title="'.__('Add this filter').'" name="'.$this->form_prefix.'add" />'.
+			'</p>'.
+			'<p class="clear"><input class="delete" type="submit" value="'.__('Delete all filters').'" name="'.
+			$this->form_prefix.'clear_filters" />'.
+			'&nbsp;<input  type="submit" value="'.__('Reset').'" name="'.
+			$this->form_prefix.'reset" /></p>'.
+			'</div>';
+		if ($this->eextra != '') {
+			$ret .=
+				'<div class="col30">'.
+				$this->eextra->getFormContent().
+				'</div>';
+		}
+		$queryParams = $this->getFiltersAsParams($this->lfilters);
+		if ($this->lextra != null) {
+			$this->lextra->updateRequestParams($queryParams);
+		}
+		
+		$ret .=
+			'<p class="clear margintop">'.
+			'<input type="submit" value="'.__('Apply filters and display options').
+			'" name="'.$this->form_prefix.'apply" /></p>'.
+			form::hidden(array($this->form_prefix."query"),http_build_query($queryParams)).
+			$GLOBALS['core']->formNonce().
+			'</form>'.
+			'</div>';
+		return $ret;
+	}
+	/**
+	Retrieves the filters values as parameters
+	
+	@param	filters	<b>array</b>	list of concerned filters
+	
+	@return	<b>array</b>	the array of parameters
+
+	*/
+
+	protected function getFiltersAsParams($filters) {
+		$arr = new ArrayObject();
+		foreach ($filters as $f) {
+			if ($f->isEnabled())
+				$f->updateRequestParams($arr);
+		}
+		return $arr;
+	}
+	
+	public function getFiltersText() {
+		$ret = '<p>'.__('Currently applied filters :').'</p><ul>';
+		foreach ($this->lfilters as $f) {
+			if ($f->isEnabled())
+				$ret .= '<li>'.$f->getAsText().'</li>'."\n";
+		}
+		$ret .= '</ul>';
+		return $ret;
+	}
+	
+	/**
+	Displays required fieldset http header
+	To be called in page header, of course.
+	*/
+	public function header() {
+		$ret = dcPage::jsLoad('js/filters.js');
+		foreach($this->efilters as $f) {
+			$ret .= $f->header();
+		}
+		return $ret;
+	}
+	
+	
+	/**
+	Displays the fieldset
+	*/
+	public function display() {
+		echo $this->getForm();
+	}
+
+	/**
+	Applies fieldset and return resulting parameters for request
+	
+	@param	method	<b>string</b>		form method to use (default: "get")
+	@param	method	<b>string</b>		form method to use (default: "get")
+	
+	*/
+	public function applyFilters($params) {
+		foreach ($this->lfilters as $filter) {
+			if ($filter->isEnabled()) {
+				$filter->applyFilter($params);
+				$this->filtered = true;
+			}
+		}
+		if ($this->lextra != null) {
+			$this->lextra->applyFilters($params);
+		}
+		return $this->filtered;
+	}
+	
+	public function getDelName($field_id,$pos) {
+		return $this->form_prefix.'del_'.$field_id.'_'.$pos;
+	}
+}
+
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief abstract filter class.
+
+Dotclear Filter handles administration filters for each list
+A filter fills in a parameter array, as defined in dcBlog class
+*/
+abstract class Filter {
+	public $filterset;			///<b>string</b> filterset parent
+	public $id;					///<b>string</b> field id (local to fieldset)
+	public $name;				///<b>string</b> filter name
+	public $desc;				///<b>string</b> field description
+	protected $request_param;	///<b>string</b> resulting parameter array key
+	protected $enabled;			///<b>string</b> true if filter is enabled
+	protected $values;			///<b>array</b> possible filter values
+	public $field_id;			///<b>string</b> field id (global to the page)
+	
+	/**
+	Inits Filter object
+	
+	@param	id		<b>string</b>	field id
+	@param	form_prefix	<b>string</b>		form prefix to use for parameters
+	*/
+	public function __construct ($id,$name,$desc,$request_param) {
+		$this->id = $id;
+		$this->name=$name;
+		$this->desc = $desc;
+		$this->request_param = $request_param;
+		$this->enabled=false;
+		$this->values = array();
+		$this->field_id = $this->id;
+	}
+	
+	/**
+	Defines the filterset containing this filter
+	
+	@param	prefix		<b>dcFilterset</b>	the filterset
+	*/
+	public function setFilterSet($fs) {
+		$this->filterset = $fs;
+	}
+	
+	/**
+	Defines form prefix for filter
+	
+	@param	prefix		<b>string</b>	the form prefix
+	*/
+	public function setFormPrefix($prefix) {
+		$this->field_id = $prefix.$this->id;
+	}
+	
+	/**
+	Get a field id
+	
+	@param	pos		<b>integer</b>	position of field, in case of multiple field (0 if only 1 field set, default value)
+	@return	<b>string</b> The field ID
+	*/
+	protected function getFieldId($pos=0) {
+		if ($pos == 0) {
+			return $this->field_id;
+		} else {
+			return $this->field_id.'_'.$pos;
+		}
+	}
+	
+	/**
+	Tells whether the filter is enabled or not
+	
+	@return	<b>boolean</b> true if enabled, false otherwise
+	*/
+	public function isEnabled() {
+		return $this->enabled;
+	}
+	
+	/**
+	Adds the current filter to the list
+	*/
+	public function add() {
+		// By default here, only 1 value allowed. Simply enable the filter
+		$this->enabled = true;
+	}
+	
+	/**
+	Removes a value from filter
+	*/
+	public function remove($pos) {
+		if (isset($this->values[$pos])) {
+			array_splice($this->values,$pos,1);
+			$this->enabled = (count($this->values)!=0);
+		}
+	}
+	
+	/**
+	Returns HTML code for form field
+	
+	@param	pos		<b>integer</b>	position of the field to display 
+									(in case of multiple values)
+	@return <b>string</b> the html code
+	*/
+	abstract protected function getFormFields($pos=0);
+	
+	/**
+	Extract values from data (data being an array, such as $_GET or $_POST)
+	
+	@param	$data	<b>array</b>	data to parse
+	@return	<b>array</b>	field values
+	
+	*/
+	protected function getValuesFromData($data) {
+		$count=0;
+		$arr = array();
+		while (isset($data[$this->getFieldId($count)])) {
+			$arr[$count] = $data[$this->getFieldId($count)];
+			$count++;
+		}
+		return $arr;
+	}
+	
+	public function initializeFromData($form_data) {
+		$this->values = $this->getValuesFromData($form_data);
+		$this->enabled = (count($this->values)!=0);
+	}
+	
+	/**
+	Returns HTML code for the hole filter lines
+	
+	@return <b>string</b> the html code
+	*/
+	
+	public function getFormLine() {
+		$ret='';
+		for ($cur=0; $cur < count($this->values); $cur++) {
+			$ret .= '<tr class="'.$this->id.'">';
+			$del_id = $this->filterset->getDelName($this->id,$cur);
+			$ret .= '<td><input id="'.$del_id.'" class="delete" '.
+					'type="submit" title="Delete the following filter : " value=" - " name="'.$del_id.'"/></td>'.
+					$this->getFormFields($cur);
+			$ret .= '</tr>';
+		}
+		return $ret;
+	}
+	
+	public function updateRequestParams($arr) {
+		for ($cur=0; $cur < count($this->values); $cur++) {
+			$arr[$this->getFieldId($cur)]=$this->values[$cur];
+		}
+	}
+	
+	/**
+	Convert filter values into a $param filter, used for the upcoming SQL request
+	
+	@param <b>ArrayObject</b> the parameters array to enrich
+	*/
+	public function applyFilter($params) {
+	}
+	
+	public function setValues($value) {
+		$this->values = $value;
+	}
+	
+	public function getValue() {
+		return $this->values;
+	}
+
+	public function header() {
+		return '';
+	}
+	
+	public abstract function getAsText();
+
+	
+}
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief abstract filter class.
+
+Handle combo filter on admin side. Can be single or multi-valued
+*/
+class comboFilter extends Filter {
+	protected $options;
+	protected $default;
+	protected $no_value;
+	protected $verb;
+	protected $extra;
+	
+	public function __construct($id,$name,$desc,$request_param,$options,$extra=array()) {
+		parent::__construct($id,$name,$desc,$request_param);
+		$this->options = $options;
+		$this->extra = $extra;
+		$this->verb = "is";
+		$this->values=array();
+	}
+	
+	protected function getValuesFromData($data) {
+		$val = parent::getValuesFromData($data);
+		if (isset($data[$this->field_id.'_v'])) {
+			$verb = $data[$this->field_id.'_v'];
+		} else {
+			$verb = "is";
+		}
+		$arr = array(
+			'values' => $val,
+			'verb' => $verb
+		);
+		return $arr;
+	}
+	
+	public function add() {
+		parent::add();
+		if (isset($this->extra['singleval']) && (count($this->values) > 0))
+			return;
+		$this->values[]=current($this->options);
+	}
+	
+	public function getType() {
+		return "combo";
+	}
+
+	public function serialize() {
+		$data = parent::serialize();
+		$data['verb'] = $this->verb;
+		return $data;
+	}
+	
+	public function unserialize ($data) {
+		parent::unserialize($data);
+		$this->verb = $data['verb'];
+	}
+	
+	public function initializeFromData($form_data) {
+		$arr = $this->getValuesFromData($form_data);
+		$this->values = $arr['values'];
+		$this->verb = $arr['verb'];
+		$this->enabled = (count($this->values) != 0);
+	}
+
+	public function getFormFields($pos=0) {
+		if ($pos == 0) {
+			$ret = '<td id="'.$this->getFieldId($pos).'" title="'.$this->desc.'" class="filter-title">'.
+				''.$this->desc.' : </td>'.
+				'<td>'.
+				form::combo($this->field_id.'_v',
+					array(__('is')=>'is',__('is not')=>'isnot'),$this->verb,'','',
+					false,'title="'.sprintf(__('%s is or is not'),$this->desc).'"').
+				'</td>';
+		} else {
+			$ret = '<td id="'.$this->getFieldId($pos).'" title="or" colspan="2" class="or">'.
+				__('or').' : </td>';
+		};
+		$ret .= '<td>'.form::combo($this->getFieldId($pos),$this->options,$this->values[$pos],
+			'','',false,'title="'.__('Choose an option').'"').'</td>';
+		return $ret;
+	}
+	
+	public function updateRequestParams($arr) {
+		parent::updateRequestParams($arr);
+		
+		$arr[$this->field_id.'_v']=$this->verb;
+	}
+	
+	public function applyFilter($params) {
+		$attr = $this->request_param;
+		if ($this->verb != "is") {
+			$params[$attr."_not"] = true;
+		}
+		if (isset($this->extra['singleval']))
+			$params[$attr]=$this->values[0];
+		else
+			$params[$attr]=$this->values;
+}
+	
+	public function getValues() {
+		return array_merge($this->values,array($this->field_id.'_v',$this->verb));
+	}
+	
+	public function getAsText() {
+		$arr=array();
+		foreach ($this->values as $value) {
+			$arr[]=array_search($value,$this->options);
+		}
+		return sprintf("%s %s %s",$this->desc,$this->verb,join(',',$arr));
+	}
+}
+
+
+class categoryFilter extends comboFilter {
+	public function getAsText() {
+		$arr=array();
+		foreach ($this->values as $value) {
+			$cat=array_search($value,$this->options);
+			$arr[]=preg_replace("#^.* ([^ ]+) .*$#",'$1',$cat);
+		}
+		return sprintf("%s %s %s",$this->desc,$this->verb,join(',',$arr));
+	}
+}
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief abstract filter class.
+
+Handle boolean filter on admin side.
+*/
+class booleanFilter extends Filter {
+	protected $options;
+	
+	public function __construct($id,$name,$desc,$request_param,$options) {
+		parent::__construct($id,$name,$desc,$request_param);
+		$this->options = $options;
+		$this->values=array();
+	}
+	
+	
+	public function getType() {
+		return "boolean";
+	}
+	public function add() {
+		parent::add();
+		$this->values=current($this->options);
+	}
+
+	public function getFormFields($pos=0) {
+		return '<td colspan="2">'.$this->desc.'</td><td>'.
+			form::combo($this->getFieldId($pos),$this->options,$this->values[$pos],
+				'','',false,'title="'.__('Choose an option').'"').'</td>';
+	}
+	
+	public function applyFilter($params) {
+		$params[$this->request_param]=$this->values[0];
+	}
+	
+	public function getAsText() {
+		return sprintf("%s %s",$this->desc,$this->values[0]);
+	}
+}
+
+
+class textFilter extends Filter {
+	protected $size;
+	protected $max;
+	
+	public function __construct($id,$name,$desc,$request_param,$size,$max) {
+		parent::__construct($id,$name,$desc,$request_param);
+		$this->size = $size;
+		$this->max = $max;
+		$this->values=array();
+	}
+	
+	
+	public function getType() {
+		return "text";
+	}
+	public function add() {
+		parent::add();
+		$this->values[]='';
+	}
+
+	public function getFormFields($pos=0) {
+		return '<td colspan="2">'.$this->desc.'</td><td>'.
+			form::field($this->getFieldId($pos),$this->size,$this->max,html::escapeHTML($this->values[0])).
+			'</td>';
+	}
+	
+	public function applyFilter($params) {
+		$params[$this->request_param]=$this->values[0];
+	}
+	
+	public function setValues($value) {
+		parent::setValues(array($value));
+	}
+
+	public function getAsText() {
+		return sprintf("%s %s",$this->desc,$this->values[0]);
+	}
+	
+}
+
+
+?>
Index: inc/admin/class.dc.list.php
===================================================================
--- inc/admin/class.dc.list.php	(revision 979)
+++ inc/admin/class.dc.list.php	(revision 979)
@@ -0,0 +1,1141 @@
+<?php
+# -- BEGIN LICENSE BLOCK ---------------------------------------
+#
+# This file is part of Dotclear 2.
+#
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
+# Licensed under the GPL version 2.0 license.
+# See LICENSE file or
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
+# -- END LICENSE BLOCK -----------------------------------------
+if (!defined('DC_RC_PATH')) { return; }
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief Dotclear items pager class.
+
+Dotclear items pager handles pagination for every admin list.
+*/
+class adminItemsPager extends pager
+{
+	public function getLinks()
+	{
+		$htmlText = '';
+		$htmlStart = '';
+		$htmlEnd = '';
+		$htmlPrev = '';
+		$htmlNext = '';
+		$htmlDirectAccess = '';
+		$htmlHidden = '';
+		
+		$this->setURL();
+		
+		# Page text
+		$htmlText = '<span>'.sprintf(__('Page %s over %s'),$this->env,$this->nb_pages).'</span>';
+		
+		# Previous page
+		if($this->env != 1) {
+			$htmlPrev = '<a href="'.sprintf($this->page_url,$this->env-1).'" class="prev">'.
+			$htmlPrev .= $this->html_prev.'</a>';
+		}
+		
+		# Next page
+		if($this->env != $this->nb_pages) {
+			$htmlNext = '<a href="'.sprintf($this->page_url,$this->env+1).'" class="next">';
+			$htmlNext .= $this->html_next.'</a>';
+		}
+		
+		# Start
+		if($this->env != 1) {
+			$htmlStart = '<a href="'.sprintf($this->page_url,1).'" class="start">'.
+			$htmlStart .= $this->html_start.'</a>';
+		}
+		
+		# End
+		if($this->env != $this->nb_pages) {
+			$htmlEnd = '<a href="'.sprintf($this->page_url,$this->nb_pages).'" class="end">'.
+			$htmlEnd .= $this->html_end.'</a>';
+		}
+		
+		# Direct acces
+		$htmlDirectAccess = 
+			'<span>'.__('Direct access to page').'&nbsp;'.
+			form::field(array('page'),3,3,$this->env).'&nbsp;'.
+			'<input type="submit" value="'.__('ok').'" />'.
+			'</span>';
+			
+		# Hidden fields
+		foreach ($_GET as $k => $v) {
+			if ($k != $this->var_page) {
+				$htmlHidden .= form::hidden(array($k),$v);
+			}
+		}
+		
+		$res =
+			'<form method="get" action="'.$this->base_url.'"><p>'.
+			$htmlStart.
+			$htmlPrev.
+			$htmlText.
+			$htmlNext.
+			$htmlEnd.
+			$htmlDirectAccess.
+			$htmlHidden.
+			'</p></form>';
+		
+		return $this->nb_elements > 0 ? $res : '';
+	}
+}
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief Dotclear items column class.
+
+Dotclear items column handles each column object use in adminItemsList class.
+*/
+class adminItemsColumn
+{
+	protected $core;		/// <b>object</b> dcCore object
+	protected $id;			/// <b>string</b> ID of defined column
+	protected $alias;		/// <b>string</b> ID of defined column
+	protected $title;		/// <b>string</b> Title of defined column
+	protected $callback;	/// <b>array</b> Callback calls to display defined column
+	protected $html;		/// <b>array</b> Extra HTML for defined column
+	
+	/**
+	Inits Generic column object
+	
+	@param	id		<b>string</b>		Column id
+	@param	alias	<b>string</b>		Column alias for SQL
+	@param	title	<b>string</b>		Column title (for table headers)
+	@param	callback	<b>array</b>		Column callback (used for display)
+	@param	html		<b>array</b>		Extra html (used for table headers)
+	@param	sortable	<b>boolean</b>		Defines if the column can be sorted or not
+	@param	listable	<b>boolean</b>		Defines if the column can be listed or not
+	@param	can_hide	<b>boolean</b>		Defines if the column can be hidden or not
+	*/
+	public function __construct($id,$alias,$title,$callback,$html = null,$sortable = true,$listable = true,$can_hide = true)
+	{
+		if (!is_string($id) || $id === '') {
+			throw new Exception(__('Invalid column ID'));
+		}
+		
+		if (!is_string($title)) {
+			throw new Exception(__('Invalid column title'));
+		}
+		
+		if (is_null($html) || !is_array($html)) {
+			$html = array();
+		}
+		
+		if (!is_bool($sortable)) {
+			$sortable = true;
+		}
+		
+		if (!is_bool($listable)) {
+			$listable = true;
+		}
+		
+		if (!is_bool($can_hide)) {
+			$can_hide = true;
+		}
+		
+		if (!is_string($alias) && $sortable) {
+			throw new Exception(__('Invalid column alias'));
+		}
+		
+		try {
+			if (!is_array($callback) || count($callback) < 2) {
+				throw new Exception(__('Callback parameter should be an array'));
+			}
+			$r = new ReflectionClass($callback[0]);
+			$f = $r->getMethod($callback[1]);
+			$p = $r->getParentClass();
+			$find_parent = false;
+			
+			while (!$p) {
+				if ($p->name == 'adminItemsList') {
+					$find_parent = true;
+				}
+				else {
+					$p->getParentClass();
+				}
+			}
+			
+			if (!$p || !$f) {
+				throw new Exception(__('Callback class should be inherited of adminItemsList class'));
+			}
+		}
+		catch (Exception $e) {
+			throw new Exception(sprintf(__('Invalid column callback: %s'),$e->getMessage()));
+		}
+		
+		$this->id = $id;
+		$this->alias = $alias;
+		$this->title = $title;
+		$this->callback = $callback;
+		$this->html = $html;
+		$this->sortable = $sortable;
+		$this->listable = $listable;
+		$this->can_hide = $can_hide;
+		$this->visibility = true;
+	}
+	
+	/**
+	Gets information of defined column
+	
+	@param	info		<b>string</b>		Column info to retrive
+	
+	@return	<b>mixed</b>	The information requested, null otherwise
+	*/
+	public function getInfo($info)
+	{
+		return property_exists(get_class($this),$info) ? $this->{$info} : null;
+	}
+	
+	/**
+	Sets visibility of defined column
+	
+	@param	visibility	<b>boolean</b>		Column visibility
+	*/
+	public function setVisibility($visibility)
+	{
+		if (is_bool($visibility) && $this->can_hide) {
+			$this->visibility = $visibility;
+		}
+		else {
+			$this->visibility = true;
+		}
+	}
+	
+	/**
+	Returns visibility status of defined column
+	
+	@return	<b>boolean</b>		true if column is visible, false otherwise
+	*/
+	public function isVisible()
+	{
+		return $this->visibility;
+	}
+	
+	/**
+	Returns if the defined column can be sorted
+	
+	@return	<b>boolean</b>		true if column is sortable, false otherwise
+	*/
+	public function isSortable()
+	{
+		return $this->sortable;
+	}
+	
+	/**
+	Returns if the defined column can be listed
+	
+	@return	<b>boolean</b>		true if column is listable, false otherwise
+	*/
+	public function isListable()
+	{
+		return $this->listable;
+	}
+	
+	/**
+	Returns if the defined column can be hidden
+	
+	@return	<b>boolean</b>	true if column can be hidden, false otherwise
+	*/
+	public function canHide()
+	{
+		return $this->can_hide;
+	}
+}
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief abstract items list class.
+
+Dotclear items list handles administration lists
+*/
+abstract class adminItemsList implements dcFilterExtraInterface
+{
+	protected $core;
+	protected $rs;
+	protected $rs_count;
+	protected $columns;
+	protected $sortby;
+	protected $order;
+	protected $nb_per_page;
+	protected $page;
+	protected $default_sortby;
+	protected $default_order;
+	
+	/*
+	Sets columns of defined list
+	*/
+	abstract function setColumns();
+	
+	/**
+	Inits List object
+	
+	@param	core		<b>dcCore</b>		dcCore object
+	*/
+	public function __construct($core)
+	{
+		
+		$this->core = $core;
+		$this->context = get_class($this);
+		$this->columns = new ArrayObject();
+		$this->form_prefix = 'col_';
+		
+		$this->html_prev = __('prev');
+		$this->html_next = __('next');
+		$this->html_start = __('start');
+		$this->html_end = __('end');
+		
+		$this->nb_per_page = 10;
+		$this->page = 1;
+		
+		$this->setColumns();
+		
+		# --BEHAVIOR-- adminItemsListConstruct
+		$core->callBehavior('adminItemsListConstruct',$this);
+		
+	}
+	
+	public function __clone() {
+		$arr = new ArrayObject();
+		foreach ($this->columns as $k=>$v) {
+			$arr[$k]= clone $v;
+		}
+		$this->columns = $arr;
+	}
+	/**
+	Apply limit, sortby and order filters to items parameters
+	
+	@param	params	<b>array</b>	Items parameters
+	
+	@return	<b>array</b>		Items parameters
+	*/
+	public function applyFilters($params)
+	{
+		if (!is_null($this->sortby) && !is_null($this->order)) {
+			if (
+				isset($this->columns[$this->sortby]) &&
+				in_array($this->order,array('asc','desc'))
+			) {
+				$params['order'] = $this->columns[$this->sortby]->getInfo('alias').' '.$this->order;
+			}
+		}
+		
+		$params['limit'] = array((($this->page-1)*$this->nb_per_page),$this->nb_per_page);
+		
+		return $params;
+	}
+	
+	/**
+	Sets items and items counter
+	
+	@param	rs		<b>recordSet</b>	Items recordSet to display
+	@param	rs_count	<b>int</b>		Total items number
+	*/
+	public function setItems($rs,$rs_count)
+	{
+		$this->rs = $rs;
+		$this->rs_count = $rs_count;
+	}
+	
+	/**
+	Returns HTML code form used to choose which column to display
+	
+	@return	<b>string</b>		HTML code form
+	*/
+	public function getFormContent()
+	{
+		$block = 
+		'<h3>'.__('Displayed information').'</h3>'.
+		'<ul>%s</ul>';
+		
+		$list = array();
+		$sortby_combo = array();
+		foreach ($this->columns as $k => $v) {
+			$col_id = $this->form_prefix.$k;
+			$col_label = sprintf('<label for="%s">%s</label>',$col_id,$v->getInfo('title'));
+			$col_html = sprintf('<li class="line">%s</li>',$col_label.form::checkbox($col_id,1,$v->isVisible(),null,null,!$v->canHide()));
+			
+			if ($v->isListable()) {
+				array_push($list,$col_html);
+			}
+			$sortby_combo[$v->getInfo('title')] = $k;
+		}
+		$order_combo = array(
+				__('Descending') => 'desc',
+				__('Ascending') => 'asc'
+		);
+		
+		$nb_per_page = !is_null($this->nb_per_page) ? $this->nb_per_page : 10;
+		
+		return
+		sprintf($block,implode('',$list)).
+		'<p><label for="nb_per_page">'.__('Items per page:').
+		'</label>&nbsp;'.form::field('nb_per_page',3,3,$nb_per_page).
+		'</p>'.
+		'<p><label for="sortby">'.__('Sort by:').
+		'</label>&nbsp;'.form::combo('sortby',$sortby_combo,$this->sortby).
+		'</p>'.
+		'<p><label for="order">'.__('Order:').
+		'</label>&nbsp;'.form::combo('order',$order_combo,$this->order).
+		'</p>';
+	}
+	
+	public function updateRequestParams($params) {
+		if (!is_null($this->sortby) && isset($this->columns[$this->sortby])) {
+			$params['sortby'] = $this->columns[$this->sortby]->getInfo('alias');
+		}
+		if (!is_null($this->order)) {
+			$params['order'] = $this->order;
+		}
+		if (!is_null($this->nb_per_page)) {
+			$params['nb_per_page'] = $this->nb_per_page;
+		}
+		if (!is_null($this->page)) {
+			$params['page'] = $this->page;
+		}
+		foreach ($this->columns as $k => $v) {
+			if($v->isVisible())
+				$params[$this->form_prefix.$k] = 1;
+		}
+
+	}
+	
+	/**
+	Returns HTML hidden fields for list options
+	
+	@return	<b>string</b>		HTML hidden fields
+	*/
+	public function getFormFieldsAsHidden()
+	{
+		$res = '';
+		
+		if (!is_null($this->sortby)) {
+			$res .= form::hidden(array('sortby'),$this->sortby);
+		}
+		if (!is_null($this->order)) {
+			$res .= form::hidden(array('order'),$this->order);
+		}
+		if (!is_null($this->nb_per_page)) {
+			$res .= form::hidden(array('nb_per_page'),$this->nb_per_page);
+		}
+		if (!is_null($this->page)) {
+			$res .= form::hidden(array('page'),$this->page);
+		}
+		
+		return $res;
+	}
+	
+	/**
+	Returns HTML code list to display
+	
+	@param	enclose_block	<b>string</b>		HTML wrapper of defined list
+	
+	@return	<b>string</b>		HTML code list
+	*/
+	public function display($enclose_block = '')
+	{
+		if ($this->rs->isEmpty())
+		{
+			echo '<p><strong>'.__('No item').'</strong></p>';
+		}
+		else
+		{
+			$pager = new adminItemsPager($this->page,$this->rs_count,$this->nb_per_page,10);
+			$pager->html_prev = $this->html_prev;
+			$pager->html_next = $this->html_next;
+			$pager->html_start = $this->html_start;
+			$pager->html_end = $this->html_end;
+			$pager->var_page = 'page';
+			
+			$html_block =
+			'<table class="maximal clear">'.
+			$this->getCaption($this->page).
+			'<thead><tr>';
+			
+			foreach ($this->columns as $k => $v) {
+				if ($v->isVisible()) {
+					$title = $v->getInfo('title');
+					if ($v->isSortable()) {
+						$title = sprintf('<a href="%2$s">%1$s</a>',$title,$this->getSortLink($v));
+					}
+					$html_extra = '';
+					foreach ($v->getInfo('html') as $i => $j) {
+						$html_extra = $i.'="'.implode(' ',$j).'"';
+					}
+					$html_extra = !empty($html_extra) ? ' '.$html_extra : '';
+					$html_block .= sprintf('<th scope="col"%2$s>%1$s</th>',$title,$html_extra);
+				}
+			}
+			
+			$html_block .=
+			'</tr></thead>'.
+			'<tbody>%s</tbody>'.
+			'</table>';
+			
+			if ($enclose_block) {
+				$html_block = sprintf($enclose_block,$html_block);
+			}
+			
+			echo '<div class="pagination">'.$pager->getLinks().'</div>';
+			
+			$blocks = explode('%s',$html_block);
+			
+			echo $blocks[0];
+			
+			while ($this->rs->fetch())
+			{
+				echo $this->displayLine();
+			}
+			
+			echo $blocks[1];
+			
+			echo '<div class="pagination">'.$pager->getLinks().'</div>';
+		}
+	}
+	
+	/**
+	Adds column to defined list
+	
+	@param	id		<b>string</b>		Column id
+	@param	alias	<b>string</b>		Column alias for SQL
+	@param	title	<b>string</b>		Column title (for table headers)
+	@param	callback	<b>array</b>		Column callback (used for display)
+	@param	html		<b>string</b>		Extra html (used for table headers)
+	@param	sortable	<b>boolean</b>		Defines if the column can be sorted or not
+	@param	listable	<b>boolean</b>		Defines if the column can be listed or not
+	@param	can_hide	<b>boolean</b>		Defines if the column can be hidden or not
+	*/
+	protected function addColumn($id,$alias,$title,$callback,$html = null,$sortable = true,$listable = true,$can_hide = true)
+	{
+		try {
+			if (is_null($html) || !is_array($html)) {
+				$html = array();
+			}
+			if ($this->sortby === $alias && !is_null($this->order)) {
+				if (array_key_exists('class',$html)) {
+					array_push($html['class'],$this->order);
+				}
+				else {
+					$html['class'] = array($this->order);
+				}
+			}
+			$c = new adminItemsColumn($id,$alias,$title,$callback,$html,$sortable,$listable,$can_hide);
+			$this->columns[$id] = $c;
+		}
+		catch (Exception $e) {
+			if (DC_DEBUG) {
+				$this->core->error->add(sprintf('[%s] %s',$id,$e->getMessage()));
+			}
+		}
+	}
+	
+	/**
+	Returns default caption text
+	
+	@return	<b>string</b>		Default caption
+	*/
+	protected function getDefaultCaption()
+	{
+		return;
+	}
+	
+	/**
+	Returns default HTML code line
+	
+	@return	<b>string</b>		Default HTMl code line
+	*/
+	protected function getDefaultLine()
+	{
+		return '<tr class="line">%s</tr>';
+	}
+	
+	/**
+	Loads list from user settings
+	*/
+	public function load() {
+		$ws = $this->core->auth->user_prefs->addWorkspace('lists');
+		$user_pref = !is_null($ws->{$this->context.'_opts'}) ? unserialize($ws->{$this->context.'_opts'}) : array();
+		$this->sortby = array_key_exists('sortby',$user_pref) ? $user_pref['sortby'] : $this->default_sortby;
+		$this->order = array_key_exists('order',$user_pref) ? $user_pref['order'] : $this->default_order;
+		$this->nb_per_page = array_key_exists('nb_per_page',$user_pref) ? $user_pref['nb_per_page'] : 10;
+		$user_pref = !is_null($ws->{$this->context.'_col'}) ? unserialize($ws->{$this->context.'_col'}) : array();
+		foreach ($this->columns as $k => $v) {
+			$visibility =  array_key_exists($k,$user_pref) ? $user_pref[$k] : true;
+			$v->setVisibility($visibility);
+		}
+		if ($this->sortby != null && !isset($this->columns[$this->sortby])) {
+			// No alias found
+			$this->sortby=$this->default_sortby;
+			$this->order=$this->default_order;
+		}
+
+	}
+	
+	/**
+	Saves list to user settings
+	*/
+	public function save() {
+		$ws = $this->core->auth->user_prefs->addWorkspace('lists');
+		$user_pref = !is_null($ws->{$this->context.'_opts'}) ? unserialize($ws->{$this->context.'_opts'}) : array();
+		$user_pref['order'] = $this->order;
+		$user_pref['nb_per_page'] = $this->nb_per_page;
+		$user_pref['sortby'] = $this->sortby;
+		
+		$this->core->auth->user_prefs->lists->put($this->context.'_opts',serialize($user_pref),'string');
+		
+		$user_pref = !is_null($ws->{$this->context.'_col'}) ? unserialize($ws->{$this->context.'_col'}) : array();
+		
+		foreach ($this->columns as $k => $v) {
+			$user_pref[$k] = $v->isVisible();
+		}
+		$this->core->auth->user_prefs->lists->put($this->context.'_col',serialize($user_pref),'string');
+	}
+	
+	/**
+	Set dedicated data from form submission 
+	(either $_GET or $_POST depending on the context
+	
+	@param	data		<b>array</b>		Data to retrieve information from
+	*/
+	public function initializeFromData ($data)
+	{
+		$load_from_settings = true;
+		foreach ($data as $k=>$v) {
+			if (strpos($k,$this->form_prefix) === 0) {
+				$load_from_settings = false;
+			}
+		}
+		if ($load_from_settings) {
+			$this->load();
+		}
+		# Sortby
+		$this->sortby = array_key_exists('sortby',$data) ? $data['sortby'] : $this->sortby;
+		$this->order = array_key_exists('order',$data) ? $data['order'] : $this->order;
+		$this->nb_per_page = array_key_exists('nb_per_page',$data) ? (integer) $data['nb_per_page'] : $this->nb_per_page;
+		# Page
+		$this->page = array_key_exists('page',$data) ? (integer) $data['page'] : 1;
+		if ($load_from_settings)
+			return;
+		foreach ($this->columns as $k => $v) {
+			$key = $this->form_prefix.$k;
+			$visibility = !array_key_exists($key,$data) ? false : true;
+			$v->setVisibility($visibility);
+		}
+	}
+	
+	/**
+	Returns HTML code for each line of defined list
+	
+	@return	<b>string</b>		HTML code line
+	*/
+	private function displayLine()
+	{
+		$res = '';
+		
+		foreach ($this->columns as $k => $v) {
+			if ($v->isVisible()) {
+				$c = $v->getInfo('callback');
+				$res .= $this->{$c[1]}();
+			}
+		}
+		
+		return sprintf($this->getDefaultLine(),$res);
+	}
+	
+	/**
+	Returns caption of defined list
+	
+	@param	page			<b>string|int</b>	Current page
+	
+	@return	<b>string</b>		HTML caption tag
+	*/
+	private function getCaption($page)
+	{
+		$caption = $this->getDefaultCaption();
+		
+		if (!empty($caption)) {
+			$caption = sprintf(
+				'<caption>%s - %s</caption>',
+				$caption,sprintf(__('Page %s'),$page)
+			);
+		}
+		
+		return $caption;
+	}
+	
+	/**
+	Returns link to sort the defined column
+	
+	@param	c		<b>adminGenericColumn</b>	Current column
+	
+	@return	<b>string</b>		HTML link
+	*/
+	private function getSortLink($c)
+	{
+		$order = 'desc';
+		if (!is_null($this->sortby) && $this->sortby === $c->getInfo('id')) {
+			if (!is_null($this->order) && $this->order === $order) {
+				$order = 'asc';
+			}
+		}
+		
+		$args = $_GET;
+		$args['sortby'] = $c->getInfo('id');
+		$args['order'] = $order;
+		
+		array_walk($args,create_function('&$v,$k','$v=$k."=".$v;'));
+		
+		$url = $_SERVER['PHP_SELF'];
+		$url .= '?'.implode('&amp;',$args);
+		
+		return $url;
+	}
+}
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief abstract posts list class.
+
+Handle posts list on admin side
+*/
+class adminPostList extends adminItemsList
+{
+	public function setColumns()
+	{
+		$this->addColumn('title','post_title',__('Title'),array('adminPostList','getTitle'),array('class' => array('maximal')),true,true,false);
+		$this->addColumn('date','post_dt',__('Date'),array('adminPostList','getDate'));
+		$this->addColumn('datetime','post_dt',__('Date and time'),array('adminPostList','getDateTime'));
+		$this->addColumn('category','cat_title',__('Category'),array('adminPostList','getCategory'));
+		$this->addColumn('author','user_id',__('Author'),array('adminPostList','getAuthor'));
+		$this->addColumn('comments','nb_comment',__('Comments'),array('adminPostList','getComments'));
+		$this->addColumn('trackbacks','nb_trackback',__('Trackbacks'),array('adminPostList','getTrackbacks'));
+		$this->addColumn('status','post_status',__('Status'),array('adminPostList','getStatus'));
+		$this->default_sortby = 'datetime';
+		$this->default_order = 'desc';
+
+	}
+	
+	protected function getDefaultCaption()
+	{
+		return __('Entries list');
+	}
+	
+	protected function getDefaultLine()
+	{
+		return
+		'<tr class="line'.($this->rs->post_status != 1 ? ' offline' : '').'"'.
+		' id="p'.$this->rs->post_id.'">%s</tr>';
+	}
+	
+	protected function getTitle()
+	{
+		return
+		'<th scope="row" class="maximal">'.
+		form::checkbox(array('entries[]'),$this->rs->post_id,'','','',!$this->rs->isEditable()).'&nbsp;'.
+		'<a href="'.$this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id).'">'.
+		html::escapeHTML($this->rs->post_title).'</a></th>';
+	}
+	
+	protected function getDate()
+	{
+		return '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d'),$this->rs->post_dt).'</td>';
+	}
+	
+	protected function getDateTime()
+	{
+		return '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>';
+	}
+	
+	protected function getCategory()
+	{
+		if ($this->core->auth->check('categories',$this->core->blog->id)) {
+			$cat_link = '<a href="category.php?id=%s">%s</a>';
+		} else {
+			$cat_link = '%2$s';
+		}
+		
+		if ($this->rs->cat_title) {
+			$cat_title = sprintf($cat_link,$this->rs->cat_id,
+			html::escapeHTML($this->rs->cat_title));
+		} else {
+			$cat_title = __('None');
+		}
+		
+		return '<td class="nowrap">'.$cat_title.'</td>';
+	}
+	
+	protected function getAuthor()
+	{
+		return '<td class="nowrap">'.$this->rs->user_id.'</td>';
+	}
+	
+	protected function getComments()
+	{
+		return '<td class="nowrap">'.$this->rs->nb_comment.'</td>';
+	}
+	
+	protected function getTrackbacks()
+	{
+		return '<td class="nowrap">'.$this->rs->nb_trackback.'</td>';
+	}
+	
+	protected function getStatus()
+	{
+		$img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
+		switch ($this->rs->post_status) {
+			case 1:
+				$img_status = sprintf($img,__('published'),'check-on.png');
+				break;
+			case 0:
+				$img_status = sprintf($img,__('unpublished'),'check-off.png');
+				break;
+			case -1:
+				$img_status = sprintf($img,__('scheduled'),'scheduled.png');
+				break;
+			case -2:
+				$img_status = sprintf($img,__('pending'),'check-wrn.png');
+				break;
+		}
+		
+		$protected = '';
+		if ($this->rs->post_password) {
+			$protected = sprintf($img,__('protected'),'locker.png');
+		}
+		
+		$selected = '';
+		if ($this->rs->post_selected) {
+			$selected = sprintf($img,__('selected'),'selected.png');
+		}
+		
+		$attach = '';
+		$nb_media = $this->rs->countMedia();
+		if ($nb_media > 0) {
+			$attach_str = $nb_media == 1 ? __('%d attachment') : __('%d attachments');
+			$attach = sprintf($img,sprintf($attach_str,$nb_media),'attach.png');
+		}
+		
+		return '<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.' '.$attach.'</td>';
+	}
+}
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief abstract mini posts list class.
+
+Handle mini posts list on admin side (used for link popup)
+*/
+class adminPostMiniList extends adminPostList
+{
+	public function setColumns()
+	{
+		$this->addColumn('title','post_title',__('Title'),array('adminPostMiniList','getTitle'),array('class' => array('maximal')),true,true,false);
+		$this->addColumn('date','post_dt',__('Date'),array('adminPostList','getDate'));
+		$this->addColumn('author','user_id',__('Author'),array('adminPostList','getAuthor'));
+		$this->addColumn('status','post_status',__('Status'),array('adminPostList','getStatus'));
+	}
+	
+	protected function getTitle() 
+	{
+		return
+		'<th scope="row" class="maximal">'.
+		form::checkbox(array('entries[]'),$this->rs->post_id,'','','',!$this->rs->isEditable()).'&nbsp;'.
+		'<a href="'.$this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id).'" '.
+		'title="'.html::escapeHTML($this->rs->getURL()).'">'.
+		html::escapeHTML($this->rs->post_title).'</a></td>';
+	}
+}
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief abstract comments list class.
+
+Handle comments list on admin side
+*/
+class adminCommentList extends adminItemsList
+{
+	public function setColumns()
+	{
+		$this->addColumn('title','post_title',__('Title'),array('adminCommentList','getTitle'),array('class' => array('maximal')),true,true,false);
+		$this->addColumn('date','comment_dt',__('Date'),array('adminCommentList','getDate'));
+		$this->addColumn('author','comment_author',__('Author'),array('adminCommentList','getAuthor'));
+		$this->addColumn('type','comment_trackback',__('Type'),array('adminCommentList','getType'));
+		$this->addColumn('status','comment_status',__('Status'),array('adminCommentList','getStatus'));
+		$this->addColumn('edit',null,'',array('adminCommentList','getEdit'),null,false,false,false);
+		$this->default_sortby = 'date';
+		$this->default_order = 'desc';
+	}
+	
+	protected function getDefaultCaption()
+	{
+		return __('Comments list');
+	}
+	
+	protected function getDefaultLine()
+	{
+		return
+		'<tr class="line'.($this->rs->comment_status != 1 ? ' offline' : '').'"'.
+		' id="c'.$this->rs->comment_id.'">%s</tr>';
+	}
+	
+	protected function getTitle()
+	{
+		$post_url = $this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id);
+		
+		return
+		'<th scope="row" class="maximal">'.
+		form::checkbox(array('comments[]'),$this->rs->comment_id,'','','',0).'&nbsp;'.
+		'<a href="'.$post_url.'">'.
+		html::escapeHTML($this->rs->post_title).'</a>'.
+		($this->rs->post_type != 'post' ? ' ('.html::escapeHTML($this->rs->post_type).')' : '').'</th>';
+	}
+	
+	protected function getDate()
+	{
+		return '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->comment_dt).'</td>';
+	}
+	
+	protected function getAuthor()
+	{
+		global $author, $status, $sortby, $order, $nb_per_page;
+		
+		$author_url =
+		'comments.php?n='.$nb_per_page.
+		'&amp;status='.$status.
+		'&amp;sortby='.$sortby.
+		'&amp;order='.$order.
+		'&amp;author='.rawurlencode($this->rs->comment_author);
+		
+		$comment_author = html::escapeHTML($this->rs->comment_author);
+		if (mb_strlen($comment_author) > 20) {
+			$comment_author = mb_strcut($comment_author,0,17).'...';
+		}
+		
+		return '<td class="nowrap"><a href="'.$author_url.'">'.$comment_author.'</a></td>';
+	}
+	
+	protected function getType()
+	{
+		return '<td class="nowrap">'.($this->rs->comment_trackback ? __('trackback') : __('comment')).'</td>';
+	}
+	
+	protected function getStatus()
+	{
+		$img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
+		switch ($this->rs->comment_status) {
+			case 1:
+				$img_status = sprintf($img,__('published'),'check-on.png');
+				break;
+			case 0:
+				$img_status = sprintf($img,__('unpublished'),'check-off.png');
+				break;
+			case -1:
+				$img_status = sprintf($img,__('pending'),'check-wrn.png');
+				break;
+			case -2:
+				$img_status = sprintf($img,__('junk'),'junk.png');
+				break;
+		}
+		
+		return '<td class="nowrap status">'.$img_status.'</td>';
+	}
+	
+	protected function getEdit()
+	{
+		$comment_url = 'comment.php?id='.$this->rs->comment_id;
+		
+		return
+		'<td class="nowrap status"><a href="'.$comment_url.'">'.
+		'<img src="images/edit-mini.png" alt="" title="'.__('Edit this comment').'" /></a></td>';
+	}
+}
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief abstract users list class.
+
+Handle users list on admin side
+*/
+class adminUserList extends adminItemsList
+{
+	public function setColumns()
+	{
+		$this->addColumn('username','U.user_id',__('Username'),array('adminUserList','getUserName'),array('class' => array('maximal')),true,true,false);
+		$this->addColumn('firstname','user_firstname',__('First name'),array('adminUserList','getFirstName'),array('class' => array('nowrap')));
+		$this->addColumn('lastname','user_name',__('Last name'),array('adminUserList','getLastName'),array('class' => array('nowrap')));
+		$this->addColumn('displayname','user_displayname',__('Display name'),array('adminUserList','getDisplayName'),array('class' => array('nowrap')));
+		$this->addColumn('entries','nb_post',__('Entries'),array('adminUserList','getEntries'),array('class' => array('nowrap')));
+		$this->default_sortby='lastname';
+		$this->default_order='asc';
+	}
+	
+	protected function getDefaultCaption()
+	{
+		return __('Users list');
+	}
+	
+	protected function getUserName()
+	{
+		$img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
+		$img_status = '';
+		
+		$p = $this->core->getUserPermissions($this->rs->user_id);
+		
+		if (isset($p[$this->core->blog->id]['p']['admin'])) {
+			$img_status = sprintf($img,__('admin'),'admin.png');
+		}
+		if ($this->rs->user_super) {
+			$img_status = sprintf($img,__('superadmin'),'superadmin.png');
+		}
+		
+		return
+		'<th scope="row" class="maximal">'.form::hidden(array('nb_post[]'),(integer) $this->rs->nb_post).
+		form::checkbox(array('user_id[]'),$this->rs->user_id).'&nbsp;'.
+		'<a href="user.php?id='.$this->rs->user_id.'">'.
+		$this->rs->user_id.'</a>&nbsp;'.$img_status.'</th>';
+	}
+	
+	protected function getFirstName()
+	{
+		return '<td class="nowrap">'.$this->rs->user_firstname.'</td>';
+	}
+	
+	protected function getLastName()
+	{
+		return '<td class="nowrap">'.$this->rs->user_name.'</td>';
+	}
+	
+	protected function getDisplayName()
+	{
+		return '<td class="nowrap">'.$this->rs->user_displayname.'</td>';
+	}
+	
+	protected function getEntries()
+	{
+		return
+		'<td class="nowrap"><a href="posts.php?user_id='.$this->rs->user_id.'">'.
+		$this->rs->nb_post.'</a></td>';
+	}
+}
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief abstract blogs list class.
+
+Handle blogs list on admin side
+*/
+class adminBlogList extends adminItemsList
+{
+	public function setColumns()
+	{
+		$this->addColumn('blogname','UPPER(blog_name)',__('Blog name'),array('adminBlogList','getBlogName'),array('class' => array('maximal')),true,true,false);
+		$this->addColumn('lastupdate','blog_upddt',__('Last update'),array('adminBlogList','getLastUpdate'),array('class' => array('nowrap')));
+		$this->addColumn('entries',null,__('Entries'),array('adminBlogList','getEntries'),array('class' => array('nowrap')),false);
+		$this->addColumn('blogid','B.blog_id',__('Blog ID'),array('adminBlogList','getBlogId'),array('class' => array('nowrap')));
+		$this->addColumn('action',null,'',array('adminBlogList','getAction'),array('class' => array('nowrap')),false);
+		$this->addColumn('status','blog_status',__('status'),array('adminBlogList','getStatus'),array('class' => array('nowrap')));
+		$this->default_sortby='lastupdate';
+		$this->default_order='desc';
+	}
+	
+	protected function getDefaultCaption()
+	{
+		return __('Blogs list');
+	}
+	
+	protected function getBlogName()
+	{
+		return
+		'<th scope="row" class="maximal"><a href="index.php?switchblog='.$this->rs->blog_id.'" '.
+		'title="'.sprintf(__('Switch to blog %s'),$this->rs->blog_id).'">'.
+		html::escapeHTML($this->rs->blog_name).'</a></th>';
+	}
+	
+	protected function getLastUpdate()
+	{
+		$offset = dt::getTimeOffset($this->core->auth->getInfo('user_tz'));
+		$blog_upddt = dt::str(__('%Y-%m-%d %H:%M'),strtotime($this->rs->blog_upddt) + $offset);
+	
+		return '<td class="nowrap">'.$blog_upddt.'</td>';
+	}
+	
+	protected function getEntries()
+	{
+		return '<td class="nowrap">'.$this->core->countBlogPosts($this->rs->blog_id).'</td>';
+	}
+	
+	protected function getBlogId()
+	{
+		return '<td class="nowrap">'.html::escapeHTML($this->rs->blog_id).'</td>';
+	}
+	
+	protected function getAction()
+	{
+		$edit_link = '';
+		$blog_id = html::escapeHTML($this->rs->blog_id);
+	
+		if ($GLOBALS['core']->auth->isSuperAdmin()) {
+			$edit_link = 
+			'<a href="blog.php?id='.$blog_id.'" '.
+			'title="'.sprintf(__('Edit blog %s'),$blog_id).'">'.
+			__('edit').'</a>';
+		}
+		
+		return '<td class="nowrap">'.$edit_link.'</td>';
+	}
+	
+	protected function getStatus()
+	{
+		$img_status = $this->rs->blog_status == 1 ? 'check-on' : 'check-off';
+		$txt_status = $GLOBALS['core']->getBlogStatus($this->rs->blog_status);
+		$img_status = sprintf('<img src="images/%1$s.png" alt="%2$s" title="%2$s" />',$img_status,$txt_status);
+		
+		return '<td class="status">'.$img_status.'</td>';
+	}
+}
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief abstract blogs permissions list class.
+
+Handle blogs permissions list on admin side
+*/
+class adminBlogPermissionsList extends adminBlogList
+{
+	public function setColumns()
+	{
+		$this->addColumn('blogid','B.blog_id',__('Blog ID'),array('adminBlogPermissionsList','getBlogId'),array('class' => array('nowrap')),false,true,false);
+		$this->addColumn('blogname','UPPER(blog_name)',__('Blog name'),array('adminBlogPermissionsList','getBlogName'),array('class' => array('maximal')),false);
+		$this->addColumn('entries',null,__('Entries'),array('adminBlogList','getEntries'),array('class' => array('nowrap')),false);
+		$this->addColumn('status','blog_status',__('status'),array('adminBlogList','getStatus'),array('class' => array('nowrap')),false);
+	}
+	
+	protected function getBlogId()
+	{
+		return
+		'<th scope="row" class="nowrap">'.
+		form::checkbox(array('blog_id[]'),$this->rs->blog_id,'','','',false,'title="'.__('select').' '.$this->rs->blog_id.'"').
+		$this->rs->blog_id.'</th>';
+	}
+	
+	protected function getBlogName()
+	{
+		return '<td class="maximal">'.html::escapeHTML($this->rs->blog_name).'</td>';
+	}
+}
+
+?>
Index: inc/admin/lib.dc.page.php
===================================================================
--- inc/admin/lib.dc.page.php	(revision 973)
+++ inc/admin/lib.dc.page.php	(revision 782)
@@ -124,5 +124,5 @@
 		
 		'<div id="header">'.
-		'<ul id="prelude"><li><a href="#content">'.__('Go to the content').'</a></li><li><a href="#main-menu">'.__('Go to the menu').'</a></li></ul>'."\n".
+		'<ul id="prelude"><li><a href="#content">Aller au contenu</a></li><li><a href="#main-menu">Aller au menu</a></li></ul>'."\n".
 		'<div id="top"><h1><a href="index.php">'.DC_VENDOR_NAME.'</a></h1></div>'."\n";	
 		
@@ -159,5 +159,5 @@
 		if ($core->error->flag()) {
 			echo
-			'<div class="error"><p><strong>'.(count($core->error->getErrors()) > 1 ? __('Errors:') : __('Error:')).'</p></strong>'.
+			'<div class="error"><strong>'.__('Errors:').'</strong>'.
 			$core->error->toHTML().
 			'</div>';
@@ -167,6 +167,4 @@
 	public static function close()
 	{
-		global $core;
-
 		$menu =& $GLOBALS['_menu'];
 		
@@ -181,12 +179,9 @@
 		}
 		
-		$text = sprintf(__('Thank you for using %s.'),'<a href="http://dotclear.org/">Dotclear '.DC_VERSION.'</a>');
-
-		# --BEHAVIOR-- adminPageFooter
-		$textAlt = $core->callBehavior('adminPageFooter',$core,$text);
-
 		echo
 		'</div>'."\n".		// End of #main-menu
-		'<div id="footer"><p>'.($textAlt != '' ? $textAlt : $text).'</p></div>'."\n".
+		'<div id="footer"><p>'.
+		sprintf(__('Thank you for using %s.'),'<a href="http://dotclear.org/">Dotclear '.DC_VERSION.'</a>').
+		'</p></div>'."\n".
 		"</div>\n";		// End of #wrapper
 		
@@ -259,20 +254,4 @@
 		"</div>\n".		// End of #wrapper
 		'</body></html>';
-	}
-
-	public static function message($msg,$timestamp=true,$div=false,$echo=true)
-	{
-		global $core;
-		
-		$res = '';
-		if ($msg != '') {
-			$res = ($div ? '<div class="message">' : '').'<p'.($div ? '' : ' class="message"').'>'.
-				($timestamp ? dt::str(__('%H:%M:%S:'),null,$core->auth->getInfo('user_tz')).' ' : '').$msg.
-				'</p>'.($div ? '</div>' : '');
-			if ($echo) {
-				echo $res;
-			}
-		}
-		return $res;
 	}
 	
@@ -391,5 +370,4 @@
 		self::jsLoad('js/jquery/jquery.biscuit.js').
 		self::jsLoad('js/jquery/jquery.bgFade.js').
-		self::jsLoad('js/jquery/jquery.constantfooter.js').
 		self::jsLoad('js/common.js').
 		self::jsLoad('js/prelude.js').
@@ -537,4 +515,11 @@
 	}
 	
+	public static function jqueryUI()
+	{
+		return
+		'<link rel="stylesheet" type="text/css" href="style/jquery-ui-1.8.16.custom.css" />'."\n".
+		self::jsLoad('js/jquery/jquery-ui-1.8.16.custom.min.js');
+	}
+
 	public static function jsColorPicker()
 	{
Index: inc/admin/lib.pager.php
===================================================================
--- inc/admin/lib.pager.php	(revision 860)
+++ inc/admin/lib.pager.php	(revision 782)
@@ -12,4 +12,12 @@
 if (!defined('DC_RC_PATH')) { return; }
 
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief Dotclear generic list class.
+@deprecated Please use class adminItemslist to create admin lists
+
+Dotclear generic list handles every admin list.
+*/
 class adminGenericList
 {
@@ -18,6 +26,17 @@
 	protected $rs_count;
 	
+	/**
+	@deprecated Please use class adminItemslist to create admin lists
+	
+	@param	core		<b>dcCore</b>		dcCore object
+	@param	rs		<b>recordSet</b>	Items recordSet to display
+	@param	rs_count	<b>int</b>		Total items number
+	*/
 	public function __construct($core,$rs,$rs_count)
 	{
+		// For backward compatibility only: the developer tried to create
+		// a list with the old constructor.
+		ob_start($this->raiseDeprecated(get_class($this)));
+		
 		$this->core =& $core;
 		$this->rs =& $rs;
@@ -26,395 +45,23 @@
 		$this->html_next = __('next&#187;');
 	}
-}
-
-class adminPostList extends adminGenericList
-{
-	public function display($page,$nb_per_page,$enclose_block='')
+	
+	/**
+	Raises a E_USER_NOTICE error for deprecated classes. 
+	This allows the developer to know he's been using deprecated classes.
+	
+	@param	name	<b>string</b>	Name of the deprecated classes that was called.
+	*/
+	private function raiseDeprecated($name)
 	{
-		if ($this->rs->isEmpty())
-		{
-			echo '<p><strong>'.__('No entry').'</strong></p>';
+		if (DC_DEBUG) {
+			$trace = debug_backtrace();
+			array_shift($trace);
+			$grand = array_shift($trace);
+			$msg = 'Deprecated class called. (';
+			$msg .= $name.' was called from '.$grand['file'].' ['.$grand['line'].'])';
+			trigger_error($msg, E_USER_NOTICE);
 		}
-		else
-		{
-			$pager = new pager($page,$this->rs_count,$nb_per_page,10);
-			$pager->html_prev = $this->html_prev;
-			$pager->html_next = $this->html_next;
-			$pager->var_page = 'page';
-			
-			$html_block =
-			'<table class="clear"><tr>'.
-			'<th colspan="2">'.__('Title').'</th>'.
-			'<th>'.__('Date').'</th>'.
-			'<th>'.__('Category').'</th>'.
-			'<th>'.__('Author').'</th>'.
-			'<th>'.__('Comments').'</th>'.
-			'<th>'.__('Trackbacks').'</th>'.
-			'<th>'.__('Status').'</th>'.
-			'</tr>%s</table>';
-			
-			if ($enclose_block) {
-				$html_block = sprintf($enclose_block,$html_block);
-			}
-			
-			echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-			
-			$blocks = explode('%s',$html_block);
-			
-			echo $blocks[0];
-			
-			while ($this->rs->fetch())
-			{
-				echo $this->postLine();
-			}
-			
-			echo $blocks[1];
-			
-			echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-		}
-	}
-	
-	private function postLine()
-	{
-		if ($this->core->auth->check('categories',$this->core->blog->id)) {
-			$cat_link = '<a href="category.php?id=%s">%s</a>';
-		} else {
-			$cat_link = '%2$s';
-		}
-		
-		if ($this->rs->cat_title) {
-			$cat_title = sprintf($cat_link,$this->rs->cat_id,
-			html::escapeHTML($this->rs->cat_title));
-		} else {
-			$cat_title = __('None');
-		}
-		
-		$img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
-		switch ($this->rs->post_status) {
-			case 1:
-				$img_status = sprintf($img,__('published'),'check-on.png');
-				break;
-			case 0:
-				$img_status = sprintf($img,__('unpublished'),'check-off.png');
-				break;
-			case -1:
-				$img_status = sprintf($img,__('scheduled'),'scheduled.png');
-				break;
-			case -2:
-				$img_status = sprintf($img,__('pending'),'check-wrn.png');
-				break;
-		}
-		
-		$protected = '';
-		if ($this->rs->post_password) {
-			$protected = sprintf($img,__('protected'),'locker.png');
-		}
-		
-		$selected = '';
-		if ($this->rs->post_selected) {
-			$selected = sprintf($img,__('selected'),'selected.png');
-		}
-		
-		$attach = '';
-		$nb_media = $this->rs->countMedia();
-		if ($nb_media > 0) {
-			$attach_str = $nb_media == 1 ? __('%d attachment') : __('%d attachments');
-			$attach = sprintf($img,sprintf($attach_str,$nb_media),'attach.png');
-		}
-		
-		$res = '<tr class="line'.($this->rs->post_status != 1 ? ' offline' : '').'"'.
-		' id="p'.$this->rs->post_id.'">';
-		
-		$res .=
-		'<td class="nowrap">'.
-		form::checkbox(array('entries[]'),$this->rs->post_id,'','','',!$this->rs->isEditable()).'</td>'.
-		'<td class="maximal"><a href="'.$this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id).'">'.
-		html::escapeHTML($this->rs->post_title).'</a></td>'.
-		'<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>'.
-		'<td class="nowrap">'.$cat_title.'</td>'.
-		'<td class="nowrap">'.$this->rs->user_id.'</td>'.
-		'<td class="nowrap">'.$this->rs->nb_comment.'</td>'.
-		'<td class="nowrap">'.$this->rs->nb_trackback.'</td>'.
-		'<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.' '.$attach.'</td>'.
-		'</tr>';
-		
-		return $res;
 	}
 }
 
-class adminPostMiniList extends adminGenericList
-{
-	public function display($page,$nb_per_page,$enclose_block='')
-	{
-		if ($this->rs->isEmpty())
-		{
-			echo '<p><strong>'.__('No entry').'</strong></p>';
-		}
-		else
-		{
-			$pager = new pager($page,$this->rs_count,$nb_per_page,10);
-			$pager->html_prev = $this->html_prev;
-			$pager->html_next = $this->html_next;
-			$pager->var_page = 'page';
-			
-			$html_block =
-			'<table class="clear"><tr>'.
-			'<th>'.__('Title').'</th>'.
-			'<th>'.__('Date').'</th>'.
-			'<th>'.__('Author').'</th>'.
-			'<th>'.__('Status').'</th>'.
-			'</tr>%s</table>';
-			
-			if ($enclose_block) {
-				$html_block = sprintf($enclose_block,$html_block);
-			}
-			
-			echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-			
-			$blocks = explode('%s',$html_block);
-			
-			echo $blocks[0];
-			
-			while ($this->rs->fetch())
-			{
-				echo $this->postLine();
-			}
-			
-			echo $blocks[1];
-			
-			echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-		}
-	}
-	
-	private function postLine()
-	{
-		$img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
-		switch ($this->rs->post_status) {
-			case 1:
-				$img_status = sprintf($img,__('published'),'check-on.png');
-				break;
-			case 0:
-				$img_status = sprintf($img,__('unpublished'),'check-off.png');
-				break;
-			case -1:
-				$img_status = sprintf($img,__('scheduled'),'scheduled.png');
-				break;
-			case -2:
-				$img_status = sprintf($img,__('pending'),'check-wrn.png');
-				break;
-		}
-		
-		$protected = '';
-		if ($this->rs->post_password) {
-			$protected = sprintf($img,__('protected'),'locker.png');
-		}
-		
-		$selected = '';
-		if ($this->rs->post_selected) {
-			$selected = sprintf($img,__('selected'),'selected.png');
-		}
-		
-		$attach = '';
-		$nb_media = $this->rs->countMedia();
-		if ($nb_media > 0) {
-			$attach_str = $nb_media == 1 ? __('%d attachment') : __('%d attachments');
-			$attach = sprintf($img,sprintf($attach_str,$nb_media),'attach.png');
-		}
-		
-		$res = '<tr class="line'.($this->rs->post_status != 1 ? ' offline' : '').'"'.
-		' id="p'.$this->rs->post_id.'">';
-		
-		$res .=
-		'<td class="maximal"><a href="'.$this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id).'" '.
-		'title="'.html::escapeHTML($this->rs->getURL()).'">'.
-		html::escapeHTML($this->rs->post_title).'</a></td>'.
-		'<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>'.
-		'<td class="nowrap">'.$this->rs->user_id.'</td>'.
-		'<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.' '.$attach.'</td>'.
-		'</tr>';
-		
-		return $res;
-	}
-}
-
-class adminCommentList extends adminGenericList
-{
-	public function display($page,$nb_per_page,$enclose_block='')
-	{
-		if ($this->rs->isEmpty())
-		{
-			echo '<p><strong>'.__('No comment').'</strong></p>';
-		}
-		else
-		{
-			$pager = new pager($page,$this->rs_count,$nb_per_page,10);
-			$pager->html_prev = $this->html_prev;
-			$pager->html_next = $this->html_next;
-			$pager->var_page = 'page';
-			
-			$html_block =
-			'<table><tr>'.
-			'<th colspan="2">'.__('Title').'</th>'.
-			'<th>'.__('Date').'</th>'.
-			'<th>'.__('Author').'</th>'.
-			'<th>'.__('Type').'</th>'.
-			'<th>'.__('Status').'</th>'.
-			'<th>&nbsp;</th>'.
-			'</tr>%s</table>';
-			
-			if ($enclose_block) {
-				$html_block = sprintf($enclose_block,$html_block);
-			}
-			
-			echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-			
-			$blocks = explode('%s',$html_block);
-			
-			echo $blocks[0];
-			
-			while ($this->rs->fetch())
-			{
-				echo $this->commentLine();
-			}
-			
-			echo $blocks[1];
-			
-			echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-		}
-	}
-	
-	private function commentLine()
-	{
-		global $author, $status, $sortby, $order, $nb_per_page;
-		
-		$author_url =
-		'comments.php?n='.$nb_per_page.
-		'&amp;status='.$status.
-		'&amp;sortby='.$sortby.
-		'&amp;order='.$order.
-		'&amp;author='.rawurlencode($this->rs->comment_author);
-		
-		$post_url = $this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id);
-		
-		$comment_url = 'comment.php?id='.$this->rs->comment_id;
-		
-		$comment_dt =
-		dt::dt2str($this->core->blog->settings->system->date_format.' - '.
-		$this->core->blog->settings->system->time_format,$this->rs->comment_dt);
-		
-		$img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
-		switch ($this->rs->comment_status) {
-			case 1:
-				$img_status = sprintf($img,__('published'),'check-on.png');
-				break;
-			case 0:
-				$img_status = sprintf($img,__('unpublished'),'check-off.png');
-				break;
-			case -1:
-				$img_status = sprintf($img,__('pending'),'check-wrn.png');
-				break;
-			case -2:
-				$img_status = sprintf($img,__('junk'),'junk.png');
-				break;
-		}
-		
-		$comment_author = html::escapeHTML($this->rs->comment_author);
-		if (mb_strlen($comment_author) > 20) {
-			$comment_author = mb_strcut($comment_author,0,17).'...';
-		}
-		
-		$res = '<tr class="line'.($this->rs->comment_status != 1 ? ' offline' : '').'"'.
-		' id="c'.$this->rs->comment_id.'">';
-		
-		$res .=
-		'<td class="nowrap">'.
-		form::checkbox(array('comments[]'),$this->rs->comment_id,'','','',0).'</td>'.
-		'<td class="maximal"><a href="'.$post_url.'">'.
-		html::escapeHTML($this->rs->post_title).'</a>'.
-		($this->rs->post_type != 'post' ? ' ('.html::escapeHTML($this->rs->post_type).')' : '').'</td>'.
-		'<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->comment_dt).'</td>'.
-		'<td class="nowrap"><a href="'.$author_url.'">'.$comment_author.'</a></td>'.
-		'<td class="nowrap">'.($this->rs->comment_trackback ? __('trackback') : __('comment')).'</td>'.
-		'<td class="nowrap status">'.$img_status.'</td>'.
-		'<td class="nowrap status"><a href="'.$comment_url.'">'.
-		'<img src="images/edit-mini.png" alt="" title="'.__('Edit this comment').'" /></a></td>';
-		
-		$res .= '</tr>';
-		
-		return $res;
-	}
-}
-
-class adminUserList extends adminGenericList
-{
-	public function display($page,$nb_per_page,$enclose_block='')
-	{
-		if ($this->rs->isEmpty())
-		{
-			echo '<p><strong>'.__('No user').'</strong></p>';
-		}
-		else
-		{
-			$pager = new pager($page,$this->rs_count,$nb_per_page,10);
-			$pager->html_prev = $this->html_prev;
-			$pager->html_next = $this->html_next;
-			$pager->var_page = 'page';
-			
-			$html_block =
-			'<table class="clear"><tr>'.
-			'<th colspan="2">'.__('Username').'</th>'.
-			'<th>'.__('First Name').'</th>'.
-			'<th>'.__('Last Name').'</th>'.
-			'<th>'.__('Display name').'</th>'.
-			'<th class="nowrap">'.__('Entries').'</th>'.
-			'</tr>%s</table>';
-			
-			if ($enclose_block) {
-				$html_block = sprintf($enclose_block,$html_block);
-			}
-			
-			echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-			
-			$blocks = explode('%s',$html_block);
-			
-			echo $blocks[0];
-			
-			while ($this->rs->fetch())
-			{
-				echo $this->userLine();
-			}
-			
-			echo $blocks[1];
-			
-			echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-		}
-	}
-	
-	private function userLine()
-	{
-		$img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
-		$img_status = '';
-		
-		$p = $this->core->getUserPermissions($this->rs->user_id);
-		
-		if (isset($p[$this->core->blog->id]['p']['admin'])) {
-			$img_status = sprintf($img,__('admin'),'admin.png');
-		}
-		if ($this->rs->user_super) {
-			$img_status = sprintf($img,__('superadmin'),'superadmin.png');
-		}
-		return
-		'<tr class="line">'.
-		'<td class="nowrap">'.form::hidden(array('nb_post[]'),(integer) $this->rs->nb_post).
-		form::checkbox(array('users[]'),$this->rs->user_id).'</td>'.
-		'<td class="maximal"><a href="user.php?id='.$this->rs->user_id.'">'.
-		$this->rs->user_id.'</a>&nbsp;'.$img_status.'</td>'.
-		'<td class="nowrap">'.$this->rs->user_firstname.'</td>'.
-		'<td class="nowrap">'.$this->rs->user_name.'</td>'.
-		'<td class="nowrap">'.$this->rs->user_displayname.'</td>'.
-		'<td class="nowrap"><a href="posts.php?user_id='.$this->rs->user_id.'">'.
-		$this->rs->nb_post.'</a></td>'.
-		'</tr>';
-	}
-}
 ?>
Index: inc/admin/prepend.php
===================================================================
--- inc/admin/prepend.php	(revision 962)
+++ inc/admin/prepend.php	(revision 692)
@@ -37,5 +37,5 @@
 function dc_prepare_url($url) {
 
-	$u = str_replace(array('?','&amp;','/'),array('\?','&','\\/'),$url);
+	$u = str_replace(array('?','&amp;'),array('\?','&'),$url);
 	return (!strpos($u,'\?') ? 
 		'/'.$u.'$/' :
@@ -55,5 +55,4 @@
 	}
 	l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/main');
-	l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/public');
 	l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/plugins');
 }
@@ -216,7 +215,4 @@
 	}
 	unset($hfiles,$locales_root);
-
-	$core->auth->user_prefs->addWorkspace('interface');
-	$user_ui_nofavmenu = $core->auth->user_prefs->interface->nofavmenu;
 
 	# Standard favorites
@@ -270,6 +266,5 @@
 	# Menus creation
 	$_menu['Dashboard'] = new dcMenu('dashboard-menu',null);
-	if (!$user_ui_nofavmenu)
-		$_menu['Favorites'] = new dcMenu('favorites-menu','My favorites');
+	$_menu['Favorites'] = new dcMenu('favorites-menu','My favorites');
 	$_menu['Blog'] = new dcMenu('blog-menu','Blog');
 	$_menu['System'] = new dcMenu('system-menu','System');
@@ -287,6 +282,5 @@
 	$_menu['Blog']->title = __('Blog');
 	$_menu['Plugins']->title = __('Plugins');
-	if (!$user_ui_nofavmenu)
-		$_menu['Favorites']->title = __('My favorites');
+	$_menu['Favorites']->title = __('My favorites');
 
 /*	
@@ -339,38 +333,36 @@
 		$core->auth->check('usage,contentadmin',$core->blog->id) && $core->auth->blog_count > 1);
 
-	if (!$user_ui_nofavmenu) {
-		// Set favorites menu
-		$ws = $core->auth->user_prefs->addWorkspace('favorites');
-		$count = 0;
+	// Set favorites menu
+	$ws = $core->auth->user_prefs->addWorkspace('favorites');
+	$count = 0;
+	foreach ($ws->dumpPrefs() as $k => $v) {
+		// User favorites only
+		if (!$v['global']) {
+			$fav = unserialize($v['value']);
+			if (dc_valid_fav($fav['url'])) {
+				$count++;
+				$_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
+					preg_match(dc_prepare_url($fav['url']),$_SERVER['REQUEST_URI']),
+					(($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
+			}
+		}
+	}	
+	if (!$count) {
+		// Global favorites if any
 		foreach ($ws->dumpPrefs() as $k => $v) {
-			// User favorites only
-			if (!$v['global']) {
-				$fav = unserialize($v['value']);
-				if (dc_valid_fav($fav['url'])) {
-					$count++;
-					$_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
-						preg_match(dc_prepare_url($fav['url']),$_SERVER['REQUEST_URI']),
-						(($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
-				}
-			}
-		}	
-		if (!$count) {
-			// Global favorites if any
-			foreach ($ws->dumpPrefs() as $k => $v) {
-				$fav = unserialize($v['value']);
-				if (dc_valid_fav($fav['url'])) {
-					$count++;
-					$_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
-						preg_match(dc_prepare_url($fav['url']),$_SERVER['REQUEST_URI']),
-						(($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
-				}
-			}
-		}
-		if (!$count) {
-			// No user or global favorites, add "new entry" fav
-			$_menu['Favorites']->addItem(__('New entry'),'post.php','images/menu/edit.png',
-				preg_match('/post.php$/',$_SERVER['REQUEST_URI']),
-				$core->auth->check('usage,contentadmin',$core->blog->id),'menu-new-post',null);
-		}
+			$fav = unserialize($v['value']);
+			if (dc_valid_fav($fav['url'])) {
+				$count++;
+				$_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
+					preg_match(dc_prepare_url($fav['url']),$_SERVER['REQUEST_URI']),
+					(($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
+			}
+		}
+	}
+	if (!$count) {
+		// No user or global favorites, add "new entry" fav
+		$_menu['Favorites']->addItem(__('New entry'),'post.php','images/menu/edit.png',
+			preg_match('/post.php$/',$_SERVER['REQUEST_URI']),
+			$core->auth->check('usage,contentadmin',$core->blog->id),'menu-new-post',null);
 	}
 }
Index: inc/core/class.dc.blog.php
===================================================================
--- inc/core/class.dc.blog.php	(revision 970)
+++ inc/core/class.dc.blog.php	(revision 782)
@@ -106,4 +106,22 @@
 	}
 	
+	/**
+	Returns sql statement for a given parameter. 
+	Computes in() or not_in lists in parameter
+
+	@param	params	<b>array</b> query parameters
+	@param	param_name	<b>array</b> parameter to check
+	@param	sql column	<b>array</b> sql column matching parameter name
+	
+	@return	<b>string</b> the generated SQL statement
+	*/
+	protected function getInParamStr($params, $param_name, $sql_column) {
+		$not='';
+		if (isset($params[$param_name.'_not'])) {
+			$not = "NOT ";
+		}
+		return $sql_column.' '.$not.$this->con->in($params[$param_name]).' ';
+	}
+	
 	/// @name Common public methods
 	//@{
@@ -317,5 +335,5 @@
 		
 		# We need to apply filter after counting
-		if (isset($params['cat_id']) && $params['cat_id'] !== '')
+		if (!empty($params['cat_id']))
 		{
 			$found = false;
@@ -332,6 +350,5 @@
 		}
 		
-		if (isset($params['cat_url']) && ($params['cat_url'] !== '') 
-			&& !isset($params['cat_id']))
+		if (!empty($params['cat_url']) && empty($params['cat_id']))
 		{
 			$found = false;
@@ -580,5 +597,5 @@
 	{
 		if (!$this->core->auth->check('categories',$this->id)) {
-			throw new Exception(__('You are not allowed to reset categories order'));
+			throw new Exception(__('You are not allowed to delete categories'));
 		}
 		
@@ -670,8 +687,4 @@
 	public function getPosts($params=array(),$count_only=false)
 	{
-		# --BEHAVIOR-- coreBlogBeforeGetPosts
-		$params = new ArrayObject($params);
-		$this->core->callBehavior('coreBlogBeforeGetPosts',$params);
-
 		if ($count_only)
 		{
@@ -746,5 +759,5 @@
 		}
 		
-		if (isset($params['post_id']) && $params['post_id'] !== '') {
+		if (!empty($params['post_id'])) {
 			if (is_array($params['post_id'])) {
 				array_walk($params['post_id'],create_function('&$v,$k','if($v!==null){$v=(integer)$v;}'));
@@ -755,13 +768,13 @@
 		}
 		
-		if (isset($params['post_url']) && $params['post_url'] !== '') {
+		if (!empty($params['post_url'])) {
 			$strReq .= "AND post_url = '".$this->con->escape($params['post_url'])."' ";
 		}
 		
 		if (!empty($params['user_id'])) {
-			$strReq .= "AND U.user_id = '".$this->con->escape($params['user_id'])."' ";
-		}
-		
-		if (isset($params['cat_id']) && $params['cat_id'] !== '')
+			$strReq .= 'AND '.$this->getInParamStr($params,'user_id','U.user_id');
+		}
+		
+		if (!empty($params['cat_id']))
 		{
 			if (!is_array($params['cat_id'])) {
@@ -773,5 +786,5 @@
 			$strReq .= 'AND '.$this->getPostsCategoryFilter($params['cat_id'],'cat_id').' ';
 		}
-		elseif (isset($params['cat_url']) && $params['cat_url'] !== '')
+		elseif (!empty($params['cat_url']))
 		{
 			if (!is_array($params['cat_url'])) {
@@ -786,5 +799,5 @@
 		/* Other filters */
 		if (isset($params['post_status'])) {
-			$strReq .= 'AND post_status = '.(integer) $params['post_status'].' ';
+			$strReq .= 'AND '.$this->getInParamStr($params,'post_status','post_status');
 		}
 		
@@ -809,5 +822,5 @@
 		
 		if (!empty($params['post_lang'])) {
-			$strReq .= "AND P.post_lang = '".$this->con->escape($params['post_lang'])."' ";
+			$strReq .= 'AND '.$this->getInParamStr($params,'post_lang','P.post_lang');
 		}
 		
@@ -1010,8 +1023,8 @@
 		$cat_field = $catReq = $limit = '';
 		
-		if (isset($params['cat_id']) && $params['cat_id'] !== '') {
+		if (!empty($params['cat_id'])) {
 			$catReq = 'AND P.cat_id = '.(integer) $params['cat_id'].' ';
 			$cat_field = ', C.cat_url ';
-		} elseif (isset($params['cat_url']) && $params['cat_url'] !== '') {
+		} elseif (!empty($params['cat_url'])) {
 			$catReq = "AND C.cat_url = '".$this->con->escape($params['cat_url'])."' ";
 			$cat_field = ', C.cat_url ';
@@ -1393,6 +1406,6 @@
 		
 		$now = dt::toUTC(time());
-		$to_change = new ArrayObject();
-
+		$to_change = array();
+		
 		if ($rs->isEmpty()) {
 			return;
@@ -1412,21 +1425,16 @@
 			}
 		}
-		if (count($to_change))
-		{
-			# --BEHAVIOR-- coreBeforeScheduledEntriesPublish
-			$this->core->callBehavior('coreBeforeScheduledEntriesPublish',$this,$to_change);
-
+		
+		if (!empty($to_change))
+		{
 			$strReq =
 			'UPDATE '.$this->prefix.'post SET '.
 			'post_status = 1 '.
 			"WHERE blog_id = '".$this->con->escape($this->id)."' ".
-			'AND post_id '.$this->con->in((array)$to_change).' ';
+			'AND post_id '.$this->con->in($to_change).' ';
+			
 			$this->con->execute($strReq);
 			$this->triggerBlog();
-
-			# --BEHAVIOR-- coreAfterScheduledEntriesPublish
-			$this->core->callBehavior('coreAfterScheduledEntriesPublish',$this,$to_change);
-		}
-		
+		}
 	}
 	
@@ -1457,5 +1465,4 @@
 	{
 		$field = $field == 'cat_id' ? 'cat_id' : 'cat_url';
-		
 		$sub = array();
 		$not = array();
@@ -1471,7 +1478,11 @@
 			if (isset($args['not'])) { $not[$id] = 1; }
 			if (isset($args['sub'])) { $sub[$id] = 1; }
+			$nullExcluded = false;
 			if ($field == 'cat_id') {
 				if (preg_match('/^null$/i',$id)) {
 					$queries[$id] = 'P.cat_id IS NULL';
+					if (isset($not[$id]) && ($not[$id] == 1)) {
+						$nullExcluded = true;
+					}
 				}
 				else {
@@ -1515,9 +1526,12 @@
 		
 		if ($sql[1]) {
-			$sql[1] = '(P.cat_id IS NULL OR NOT('.$sql[1].'))';
+			if ($nullExcluded) {
+				$sql[1] = 'NOT('.$sql[1].')';
+			} else {
+				$sql[1] = '(P.cat_id IS NULL OR NOT('.$sql[1].'))';
+			}
 		} else {
 			unset($sql[1]);
 		}
-		
 		return implode(' AND ',$sql);
 	}
@@ -1598,19 +1612,4 @@
 			$this->core->initWikiPost();
 			$this->core->wiki2xhtml->setOpt('note_prefix','pnote-'.$post_id);
-			switch ($this->settings->system->note_title_tag) {
-				case 1:
-					$tag = 'h3';
-					break;
-				case 2:
-					$tag = 'p';
-					break;
-				default:
-					$tag = 'h4';
-					break;
-			}
-			$this->core->wiki2xhtml->setOpt('note_str','<div class="footnotes"><'.$tag.' class="footnotes-title">'.
-				__('Notes').'</'.$tag.'>%s</div>');
-			$this->core->wiki2xhtml->setOpt('note_str_single','<div class="footnotes"><'.$tag.' class="footnotes-title">'.
-				__('Note').'</'.$tag.'>%s</div>');
 			if (strpos($lang,'fr') === 0) {
 				$this->core->wiki2xhtml->setOpt('active_fr_syntax',1);
@@ -1820,21 +1819,20 @@
 		}
 		
-		if (isset($params['post_id']) && $params['post_id'] !== '') {
+		if (!empty($params['post_id'])) {
 			$strReq .= 'AND P.post_id = '.(integer) $params['post_id'].' ';
 		}
 		
-		if (isset($params['cat_id']) && $params['cat_id'] !== '') {
+		if (!empty($params['cat_id'])) {
 			$strReq .= 'AND P.cat_id = '.(integer) $params['cat_id'].' ';
 		}
 		
-		if (isset($params['comment_id']) && $params['comment_id'] !== '') {
+		if (!empty($params['comment_id'])) {
 			$strReq .= 'AND comment_id = '.(integer) $params['comment_id'].' ';
 		}
 		
 		if (isset($params['comment_status'])) {
-			$strReq .= 'AND comment_status = '.(integer) $params['comment_status'].' ';
-		}
-		
-		if (!empty($params['comment_status_not']))
+			$strReq .= 'AND '.$this->getInParamStr($params,'comment_status','comment_status');
+		} 
+		elseif (!empty($params['comment_status_not'])) // older method, deprecated
 		{
 			$strReq .= 'AND comment_status <> '.(integer) $params['comment_status_not'].' ';
@@ -1852,4 +1850,7 @@
 			$q_author = $this->con->escape(str_replace('*','%',strtolower($params['q_author'])));
 			$strReq .= "AND LOWER(comment_author) LIKE '".$q_author."' ";
+		}
+		if (isset($params['comment_author'])) {
+			$strReq .= "AND comment_author ".$this->con->in($params['comment_author']).' ';
 		}
 		
Index: inc/core/class.dc.media.php
===================================================================
--- inc/core/class.dc.media.php	(revision 909)
+++ inc/core/class.dc.media.php	(revision 771)
@@ -912,7 +912,6 @@
 					($suffix == 'sq' || $w > $s[0] || $h > $s[0]))
 				{
-					$rate = ($s[0] < 100 ? 95 : ($s[0] < 600 ? 90 : 85));
 					$img->resize($s[0],$s[0],$s[1]);
-					$img->output('jpeg',$thumb_file,$rate);
+					$img->output('jpeg',$thumb_file,80);
 				}
 			}
Index: inc/core/class.dc.namespace.php
===================================================================
--- inc/core/class.dc.namespace.php	(revision 934)
+++ inc/core/class.dc.namespace.php	(revision 270)
@@ -259,37 +259,7 @@
 		}
 	}
-
-	/**
-	Rename an existing setting in a Namespace
-
-	@param 	$oldId 	<b>string</b> 	Current setting name
-	@param 	$newId 	<b>string</b> 	New setting name
-	@return 	<b>boolean</b>
-	*/
-	public function rename($oldId,$newId)
-	{
-		if (!$this->ns) {
-			throw new Exception(__('No namespace specified'));
-		}
-		
-		if (!array_key_exists($oldId,$this->settings) || array_key_exists($newId,$this->settings)) {
-			return false;
-		}
-
-		// Rename the setting in the settings array
-		$this->settings[$newId] = $this->settings[$oldId];
-		unset($this->settings[$oldId]);
-
-		// Rename the setting in the database
-		$strReq = 'UPDATE '.$this->table.
-			" SET setting_id = '".$this->con->escape($newId)."' ".
-			" WHERE setting_ns = '".$this->con->escape($this->ns)."' ".
-			" AND setting_id = '".$this->con->escape($oldId)."' ";
-		$this->con->execute($strReq);
-		return true;
-	}
-
-	/**
-	Removes an existing setting in a Namespace 
+	
+	/**
+	Removes an existing setting. Namespace 
 	
 	@param	id		<b>string</b>		Setting ID
@@ -316,37 +286,4 @@
 	
 	/**
-	Removes all existing settings in a Namespace 
-	
-	@param	force_global	<b>boolean</b>	Force global pref drop
-	*/
-	public function dropAll($force_global=false)
-	{
-		if (!$this->ns) {
-			throw new Exception(__('No namespace specified'));
-		}
-		
-		$strReq =	'DELETE FROM '.$this->table.' ';
-		
-		if (($force_global) || ($this->blog_id === null)) {
-			$strReq .= 'WHERE blog_id IS NULL ';
-			$global = true;
-		} else {
-			$strReq .= "WHERE blog_id = '".$this->con->escape($this->blog_id)."' ";
-			$global = false;
-		}
-		
-		$strReq .= "AND setting_ns = '".$this->con->escape($this->ns)."' ";
-		
-		$this->con->execute($strReq);
-		
-		$array = $global ? 'global' : 'local';
-		unset($this->{$array.'_settings'});
-		$this->{$array.'_settings'} = array();
-		
-		$array = $global ? 'local' : 'global';
-		$this->settings = $this->{$array.'_settings'};
-	}
-	
-	/**
 	Returns $settings property content.
 	
Index: inc/core/class.dc.prefs.php
===================================================================
--- inc/core/class.dc.prefs.php	(revision 934)
+++ inc/core/class.dc.prefs.php	(revision 147)
@@ -98,51 +98,4 @@
 	
 	/**
-	Rename a workspace.
-
-	@param	oldWs 	<b>string</b> 	Old workspace name
-	@param	newws 	<b>string</b> 	New workspace name
-	@return 	<b>boolean</b>
-	*/
-	public function renWorkspace($oldNs,$newNs)
-	{
-		if (!array_key_exists($oldWs, $this->workspaces) || array_key_exists($newWs, $this->workspaces)) {
-			return false;
-		}
-
-		// Rename the workspace in the workspace array
-		$this->workspaces[$newWs] = $this->workspaces[$oldWs];
-		unset($this->workspaces[$oldWs]);
-
-		// Rename the workspace in the database
-		$strReq = 'UPDATE '.$this->table.
-			" SET pref_ws = '".$this->con->escape($newWs)."' ".
-			" WHERE pref_ws = '".$this->con->escape($oldWs)."' ";
-		$this->con->execute($strReq);
-		return true;
-	}
-
-	/**
-	Delete a whole workspace with all preferences pertaining to it.
-
-	@param 	ws 	<b>string</b> 	Workspace name
-	@return 	<b>boolean</b>
-	*/
-	public function delWorkspace($ws)
-	{
-		if (!array_key_exists($ws, $this->workspaces)) {
-			return false;
-		}
-
-		// Remove the workspace from the workspace array
-		unset($this->workspaces[$ws]);
-
-		// Delete all preferences from the workspace in the database
-		$strReq = 'DELETE FROM '.$this->table.
-			" WHERE pref_ws = '".$this->con->escape($ws)."' ";
-		$this->con->execute($strReq);
-		return true;
-	}
-	
-	/**
 	Returns full workspace with all prefs pertaining to it.
 	
Index: inc/core/class.dc.rs.extensions.php
===================================================================
--- inc/core/class.dc.rs.extensions.php	(revision 912)
+++ inc/core/class.dc.rs.extensions.php	(revision 776)
@@ -165,14 +165,4 @@
 	{
 		return $rs->nb_trackback > 0;
-	}
-
-	/**
-	Returns whether post has been updated since publication.
-
-	@return <b>boolean</b>
-	*/
-	public static function isRepublished($rs)
-	{
-		return ($rs->getTS('upddt') + dt::getTimeOffset($rs->post_tz)) > $rs->getTS();
 	}
 	
Index: inc/core/class.dc.settings.php
===================================================================
--- inc/core/class.dc.settings.php	(revision 934)
+++ inc/core/class.dc.settings.php	(revision 301)
@@ -92,51 +92,4 @@
 		return $this->namespaces[$ns];
 	}
-
-	/**
-	Rename a namespace.
-
-	@param	oldNs 	<b>string</b> 	Old namespace name
-	@param	newNs 	<b>string</b> 	New namespace name
-	@return 	<b>boolean</b>
-	*/
-	public function renNamespace($oldNs,$newNs)
-	{
-		if (!array_key_exists($oldNs, $this->namespaces) || array_key_exists($newNs, $this->namespaces)) {
-			return false;
-		}
-
-		// Rename the namespace in the namespace array
-		$this->namespaces[$newNs] = $this->namespaces[$oldNs];
-		unset($this->namespaces[$oldNs]);
-
-		// Rename the namespace in the database
-		$strReq = 'UPDATE '.$this->table.
-			" SET setting_ns = '".$this->con->escape($newNs)."' ".
-			" WHERE setting_ns = '".$this->con->escape($oldNs)."' ";
-		$this->con->execute($strReq);
-		return true;
-	}
-
-	/**
-	Delete a whole namespace with all settings pertaining to it.
-
-	@param 	ns 	<b>string</b> 	Namespace name
-	@return 	<b>boolean</b>
-	*/
-	public function delNamespace($ns)
-	{
-		if (!array_key_exists($ns, $this->namespaces)) {
-			return false;
-		}
-
-		// Remove the namespace from the namespace array
-		unset($this->namespaces[$ns]);
-
-		// Delete all settings from the namespace in the database
-		$strReq = 'DELETE FROM '.$this->table.
-			" WHERE setting_ns = '".$this->con->escape($ns)."' ";
-		$this->con->execute($strReq);
-		return true;
-	}
 	
 	/**
Index: inc/core/class.dc.workspace.php
===================================================================
--- inc/core/class.dc.workspace.php	(revision 934)
+++ inc/core/class.dc.workspace.php	(revision 147)
@@ -263,34 +263,4 @@
 		}
 	}
-
-	/**
-	Rename an existing pref in a Workspace
-
-	@param 	$oldId 	<b>string</b> 	Current pref name
-	@param 	$newId 	<b>string</b> 	New pref name
-	@return 	<b>boolean</b>
-	*/
-	public function rename($oldId,$newId)
-	{
-		if (!$this->ws) {
-			throw new Exception(__('No workspace specified'));
-		}
-		
-		if (!array_key_exists($oldId,$this->prefs) || array_key_exists($newId,$this->prefs)) {
-			return false;
-		}
-
-		// Rename the pref in the prefs array
-		$this->prefs[$newId] = $this->prefs[$oldId];
-		unset($this->prefs[$oldId]);
-
-		// Rename the pref in the database
-		$strReq = 'UPDATE '.$this->table.
-			" SET pref_id = '".$this->con->escape($newId)."' ".
-			" WHERE pref_ws = '".$this->con->escape($this->ws)."' ".
-			" AND pref_id = '".$this->con->escape($oldId)."' ";
-		$this->con->execute($strReq);
-		return true;
-	}
 	
 	/**
Index: inc/core_error.php
===================================================================
--- inc/core_error.php	(revision 921)
+++ inc/core_error.php	(revision 270)
@@ -12,5 +12,4 @@
 
 header('Content-Type: text/html; charset=utf-8');
-header("HTTP/1.0 ".$code." ".$summary);
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
Index: inc/dbschema/db-schema.php
===================================================================
--- inc/dbschema/db-schema.php	(revision 919)
+++ inc/dbschema/db-schema.php	(revision 407)
@@ -164,5 +164,5 @@
 	->log_dt		('timestamp',	0,	false,	'now()')
 	->log_ip		('varchar',	39,	false)
-	->log_msg		('text',	0,	true,	null)
+	->log_msg		('varchar',	255,	false)
 	
 	->primary('pk_log','log_id')
Index: inc/dbschema/upgrade-cli.php
===================================================================
--- inc/dbschema/upgrade-cli.php	(revision 838)
+++ inc/dbschema/upgrade-cli.php	(revision 270)
@@ -36,5 +36,5 @@
 	$core->con->begin();
 	try {
-		$changes = dotclearUpgrade($core);
+		$changes = dotclearUpgrade(&$core);
 	} catch (Exception $e) {
 		$core->con->rollback();
Index: inc/prepend.php
===================================================================
--- inc/prepend.php	(revision 801)
+++ inc/prepend.php	(revision 782)
@@ -55,8 +55,16 @@
 $__autoload['dcPage']				= dirname(__FILE__).'/admin/lib.dc.page.php';
 $__autoload['adminGenericList']		= dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminPostList']			= dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminPostMiniList']		= dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminCommentList']		= dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminUserList']			= dirname(__FILE__).'/admin/lib.pager.php';
+$__autoload['adminItemsList']			= dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['adminPostList']			= dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['adminPostMiniList']		= dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['adminCommentList']		= dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['adminUserList']			= dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['adminBlogList']			= dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['adminBlogPermissionsList']	= dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['dcFilterSet']			= dirname(__FILE__).'/admin/class.dc.filter.php';
+$__autoload['dcFilter']				= dirname(__FILE__).'/admin/class.dc.filter.php';
+$__autoload['textFilter']				= dirname(__FILE__).'/admin/class.dc.filter.php';
+$__autoload['comboFilter']				= dirname(__FILE__).'/admin/class.dc.filter.php';
+$__autoload['dcFilterExtraInterface']				= dirname(__FILE__).'/admin/class.dc.filter.php';
 
 $__autoload['dcTemplate']			= dirname(__FILE__).'/public/class.dc.template.php';
@@ -123,5 +131,5 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.5-dev');
+define('DC_VERSION','2.4.0');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');
Index: inc/public/class.dc.template.php
===================================================================
--- inc/public/class.dc.template.php	(revision 937)
+++ inc/public/class.dc.template.php	(revision 779)
@@ -85,5 +85,4 @@
 		$this->addValue('CategoryDescription',array($this,'CategoryDescription'));
 		$this->addValue('CategoryTitle',array($this,'CategoryTitle'));
-		$this->addValue('CategoryEntriesCount',array($this,'CategoryEntriesCount'));
 		
 		# Comments
@@ -206,7 +205,4 @@
 		$this->addValue('SysSearchString',array($this,'SysSearchString'));
 		$this->addValue('SysSelfURI',array($this,'SysSelfURI'));
-
-		# Generic
-		$this->addValue('else',array($this,'GenericElse'));
 	}
 	
@@ -392,5 +388,5 @@
 		$p[2] = '0';	# cut_string
 		$p[3] = '0';	# lower_case
-		$p[4] = '0';	# upper_case or capitalize
+		$p[4] = '0';	# upper_case
 		
 		$p[0] = (integer) (!empty($attr['encode_xml']) || !empty($attr['encode_html']));
@@ -403,5 +399,4 @@
 		$p[3] = (integer) !empty($attr['lower_case']);
 		$p[4] = (integer) !empty($attr['upper_case']);
-		$p[4] = (!empty($attr['capitalize']) ? 2 : $p[4]);
 		
 		return "context::global_filter(%s,".implode(",",$p).",'".addslashes($this->current_tag)."')";
@@ -492,5 +487,5 @@
 	}
 	
-	public static function getAge($attr)
+	public function getAge($attr)
 	{
 		if (isset($attr['age']) && preg_match('/^(\-[0-9]+|last).*$/i',$attr['age'])) {
@@ -577,7 +572,5 @@
 		$res = "<?php\n";
 		$res .= $p;
-		$res .= $this->core->callBehavior("templatePrepareParams", 
-			array("tag" => "Archives","method" => "blog::getDates"), 
-			$attr,$content);
+		$res .= $this->core->callBehavior("templatePrepareParams","Archives", $attr,$content);
 		$res .= '$_ctx->archives = $core->blog->getDates($params); unset($params);'."\n";
 		$res .= "?>\n";
@@ -687,7 +680,5 @@
 		$res = "<?php\n";
 		$res .= $p;
-		$res .= $this->core->callBehavior("templatePrepareParams",
-			array("tag" => "ArchiveNext","method" => "blog::getDates"), 
-			$attr, $content);
+		$res .= $this->core->callBehavior("templatePrepareParams","ArchiveNext", $attr, $content);
 		$res .= '$_ctx->archives = $core->blog->getDates($params); unset($params);'."\n";
 		$res .= "?>\n";
@@ -726,7 +717,5 @@
 		
 		$res = "<?php\n";
-		$res .= $this->core->callBehavior("templatePrepareParams",
-			array("tag" => "ArchivePrevious","method" => "blog::getDates"), 
-			$attr, $content);
+		$res .= $this->core->callBehavior("templatePrepareParams","ArchivePrevious", $attr, $content);
 		$res .= $p;
 		$res .= '$_ctx->archives = $core->blog->getDates($params); unset($params);'."\n";
@@ -951,7 +940,5 @@
 		$res = "<?php\n";
 		$res .= $p;
-		$res .= $this->core->callBehavior("templatePrepareParams", 
-			array("tag" => "Categories","method" => "blog::getCategories"), 
-			$attr,$content);
+		$res .= $this->core->callBehavior("templatePrepareParams","Categories", $attr, $content);
 		$res .= '$_ctx->categories = $core->blog->getCategories($params);'."\n";
 		$res .= "?>\n";
@@ -1101,13 +1088,4 @@
 		$f = $this->getFilters($attr);
 		return '<?php echo '.sprintf($f,'$_ctx->categories->cat_title').'; ?>';
-	}
-
-	/*dtd
-	<!ELEMENT tpl:CategoryEntriesCount - O -- Category number of entries -->
-	*/
-	public function CategoryEntriesCount($attr)
-	{
-		$f = $this->getFilters($attr);
-		return '<?php echo '.sprintf($f,'$_ctx->categories->nb_post').'; ?>';
 	}
 	
@@ -1232,7 +1210,5 @@
 		$res = "<?php\n";
 		$res .= $p;
-		$res .= $this->core->callBehavior("templatePrepareParams", 
-			array("tag" => "Entries","method" => "blog::getPosts"), 
-			$attr,$content);
+		$res .= $this->core->callBehavior("templatePrepareParams","Entries",$attr,$content);
 		$res .= '$_ctx->post_params = $params;'."\n";
 		$res .= '$_ctx->posts = $core->blog->getPosts($params); unset($params);'."\n";
@@ -1283,5 +1259,4 @@
 	show_comments	(0|1)	#IMPLIED	-- there are comments for this post (value : 1) or not (value : 0)
 	show_pings	(0|1)	#IMPLIED	-- there are trackbacks for this post (value : 1) or not (value : 0)
-	republished	(0|1)	#IMPLIED	-- post has been updated since publication (value : 1) or not (value : 0)
 	operator	(and|or)	#IMPLIED	-- combination of conditions, if more than 1 specifiec (default: and)
 	url		CDATA	#IMPLIED	-- post has given url
@@ -1383,9 +1358,4 @@
 		}
 		
-		if (isset($attr['republished'])) {
-			$sign = (boolean) $attr['republished'] ? '' : '!';
-			$if[] = $sign.'(boolean)$_ctx->posts->isRepublished()';
-		}
-		
 		$this->core->callBehavior('tplIfConditions','EntryIf',$attr,$content,$if);
 		
@@ -1621,7 +1591,4 @@
 	class		CDATA		#IMPLIED	-- Class to add on image tag
 	with_category	(1|0)		#IMPLIED	-- Search in entry category description if present (default 0)
-	no_tag	(1|0)	#IMPLIED	-- Return image URL without HTML tag (default 0)
-	content_only	(1|0)		#IMPLIED	-- Search in content entry only, not in excerpt (default 0)
-	cat_only	(1|0)		#IMPLIED	-- Search in category description only (default 0)
 	>
 	*/
@@ -1630,11 +1597,7 @@
 		$size = !empty($attr['size']) ? $attr['size'] : '';
 		$class = !empty($attr['class']) ? $attr['class'] : '';
-		$with_category = !empty($attr['with_category']) ? 1 : 0;
-		$no_tag = !empty($attr['no_tag']) ? 1 : 0;
-		$content_only = !empty($attr['content_only']) ? 1 : 0;
-		$cat_only = !empty($attr['cat_only']) ? 1 : 0;
-		
-		return "<?php echo context::EntryFirstImageHelper('".addslashes($size)."',".$with_category.",'".addslashes($class)."',".
-			$no_tag.",".$content_only.",".$cat_only."); ?>";
+		$with_category = !empty($attr['with_category']) ? 'true' : 'false';
+		
+		return "<?php echo context::EntryFirstImageHelper('".addslashes($size)."',".$with_category.",'".addslashes($class)."'); ?>";
 	}
 	
@@ -1917,7 +1880,5 @@
 		$res = "<?php\n";
 		$res .= $p;
-		$res .= $this->core->callBehavior("templatePrepareParams", 
-			array("tag" => "Languages","method" => "blog::getLangs"), 
-			$attr,$content);
+		$res .= $this->core->callBehavior("templatePrepareParams","Languages",$attr,$content);
 		$res .= '$_ctx->langs = $core->blog->getLangs($params); unset($params);'."\n";
 		$res .= "?>\n";
@@ -1994,7 +1955,4 @@
 		$p = "<?php\n";
 		$p .= '$params = $_ctx->post_params;'."\n";
-		$p .= $this->core->callBehavior("templatePrepareParams", 
-			array("tag" => "Pagination","method" => "blog::getPosts"), 
-			$attr,$content);
 		$p .= '$_ctx->pagination = $core->blog->getPosts($params,true); unset($params);'."\n";
 		$p .= "?>\n";
@@ -2006,4 +1964,5 @@
 		return
 			$p.
+			$this->core->callBehavior("templatePrepareParams","Pagination",$attr,$content).
 			'<?php if ($_ctx->pagination->f(0) > $_ctx->posts->count()) : ?>'.
 			$content.
@@ -2145,7 +2104,5 @@
 		
 		$res = "<?php\n";
-		$res .= $this->core->callBehavior("templatePrepareParams", 
-			array("tag" => "Comments","method" => "blog::getComments"), 
-			$attr,$content);
+		$res .= $this->core->callBehavior("templatePrepareParams","Comments",$attr,$content);
 		$res .= $p;
 		$res .= '$_ctx->comments = $core->blog->getComments($params); unset($params);'."\n";
@@ -2747,7 +2704,5 @@
 		$res = "<?php\n";
 		$res .= $p;
-		$res .= $this->core->callBehavior("templatePrepareParams", 
-			array("tag" => "Pings","method" => "blog::getComments"), 
-			$attr,$content);
+		$res .= $this->core->callBehavior("templatePrepareParams","Pings",$attr,$content);
 		$res .= '$_ctx->pings = $core->blog->getComments($params); unset($params);'."\n";
 		$res .= "if (\$_ctx->posts !== null) { \$core->blog->withoutPassword(true);}\n";
@@ -2829,5 +2784,5 @@
 	current_mode		CDATA	#IMPLIED	-- tests if current URL mode is the one given in parameter
 	has_tpl			CDATA     #IMPLIED  -- tests if a named template exists
-	has_tag			CDATA     #IMPLIED  -- tests if a named template block or value exists
+	has_tag			CDATA     #IMPLIED  -- tests if a named template tag exists (see Tag plugin for code)
 	blog_id			CDATA     #IMPLIED  -- tests if current blog ID is the one given in parameter
 	comments_active	(0|1)	#IMPLIED	-- test if comments are enabled blog-wide 
@@ -2885,13 +2840,4 @@
 		}
 		
-		if (isset($attr['has_tag'])) {
-			$sign = 'true';
-			if (substr($attr['has_tag'],0,1) == '!') {
-				$sign = 'false';
-				$attr['has_tag'] = substr($attr['has_tag'],1);
-			}
-			$if[] =  "\$core->tpl->tagExists('".addslashes($attr['has_tag'])."') === ".$sign;
-		}
-		
 		if (isset($attr['blog_id'])) {
 			$sign = '';
@@ -3001,12 +2947,4 @@
 		$f = $this->getFilters($attr);
 		return '<?php echo '.sprintf($f,'http::getSelfURI()').'; ?>';
-	}
-
-	/*dtd
-	<!ELEMENT tpl:else - O -- else: statement -->
-	*/
-	public function GenericElse($attr)
-	{
-		return '<?php else: ?>';
 	}
 }
Index: inc/public/default-templates/atom.xml
===================================================================
--- inc/public/default-templates/atom.xml	(revision 912)
+++ inc/public/default-templates/atom.xml	(revision 0)
@@ -25,10 +25,5 @@
     <id>{{tpl:EntryFeedID}}</id>
     <published>{{tpl:EntryDate iso8601="1"}}</published>
-    <tpl:EntryIf republished="1">
-      <updated>{{tpl:EntryDate iso8601="1" upddt="1"}}</updated>
-    </tpl:EntryIf>
-    <tpl:EntryIf republished="0">
-      <updated>{{tpl:EntryDate iso8601="1"}}</updated>
-    </tpl:EntryIf>
+    <updated>{{tpl:EntryDate iso8601="1" upddt="1"}}</updated>
     <author><name>{{tpl:EntryAuthorCommonName encode_xml="1"}}</name></author>
     <tpl:EntryIf has_category="1">
Index: inc/public/default-templates/post.html
===================================================================
--- inc/public/default-templates/post.html	(revision 932)
+++ inc/public/default-templates/post.html	(revision 725)
@@ -77,5 +77,5 @@
     <tpl:EntryTags>
     <tpl:TagsHeader><ul class="post-tags"></tpl:TagsHeader>
-    <li><a href="{{tpl:TagURL}}" rel="tag">{{tpl:TagID}}</a></li>
+    <li><a href="{{tpl:TagURL}}">{{tpl:TagID}}</a></li>
     <tpl:TagsFooter></ul></tpl:TagsFooter>
     </tpl:EntryTags>
Index: inc/public/lib.tpl.context.php
===================================================================
--- inc/public/lib.tpl.context.php	(revision 975)
+++ inc/public/lib.tpl.context.php	(revision 772)
@@ -127,9 +127,5 @@
 			$str = self::lower_case($str);
 		} elseif ($upper_case) {
-			if ($upper_case == 2) {
-				$str = self::capitalize($str);
-			} else {
-				$str = self::upper_case($str);
-			}
+			$str = self::upper_case($str);
 		}
 		
@@ -164,12 +160,4 @@
 	{
 		return mb_strtoupper($str);
-	}
-
-	public static function capitalize($str)
-	{
-		if ($str != '') {
-		   $str[0] = mb_strtoupper($str[0]);
-		}
-		return $str;
 	}
 	
@@ -348,69 +336,10 @@
 			return $str;
 		}
-
-		# Process part adapted from SmartyPants engine (J. Gruber et al.) :
-
-		$tokens = self::tokenizeHTML($str);
-		$result = '';
-		$in_pre = 0;  # Keep track of when we're inside <pre> or <code> tags.
-
-		foreach ($tokens as $cur_token) {
-			if ($cur_token[0] == "tag") {
-				# Don't mess with quotes inside tags.
-				$result .= $cur_token[1];
-				if (preg_match('@<(/?)(?:pre|code|kbd|script|math)[\s>]@', $cur_token[1], $matches)) {
-					$in_pre = isset($matches[1]) && $matches[1] == '/' ? 0 : 1;
-				}
-			} else {
-				$t = $cur_token[1];
-				if (!$in_pre) {
-					$t = preg_replace(array_keys($GLOBALS['__smilies']),array_values($GLOBALS['__smilies']),$t);
-				}
-				$result .= $t;
-			}
-		}
-
-		return $result;
-	}
-
-	private static function tokenizeHTML($str)
-	{
-		# Function from SmartyPants engine (J. Gruber et al.)
-		#
-		#   Parameter:  String containing HTML markup.
-		#   Returns:    An array of the tokens comprising the input
-		#               string. Each token is either a tag (possibly with nested,
-		#               tags contained therein, such as <a href="<MTFoo>">, or a
-		#               run of text between tags. Each element of the array is a
-		#               two-element array; the first is either 'tag' or 'text';
-		#               the second is the actual value.
-		#
-		#
-		#   Regular expression derived from the _tokenize() subroutine in 
-		#   Brad Choate's MTRegex plugin.
-		#   <http://www.bradchoate.com/past/mtregex.php>
-		#
-		$index = 0;
-		$tokens = array();
-
-		$match = '(?s:<!(?:--.*?--\s*)+>)|'.	# comment
-				 '(?s:<\?.*?\?>)|'.				# processing instruction
-												# regular tags
-				 '(?:<[/!$]?[-a-zA-Z0-9:]+\b(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*>)'; 
-
-		$parts = preg_split("{($match)}", $str, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-		foreach ($parts as $part) {
-			if (++$index % 2 && $part != '') 
-				$tokens[] = array('text', $part);
-			else
-				$tokens[] = array('tag', $part);
-		}
-		return $tokens;
-	}
-
-
+		
+		return preg_replace(array_keys($GLOBALS['__smilies']),array_values($GLOBALS['__smilies']),$str);
+	}
+	
 	# First post image helpers
-	public static function EntryFirstImageHelper($size,$with_category,$class="",$no_tag=false,$content_only=false,$cat_only=false)
+	public static function EntryFirstImageHelper($size,$with_category,$class="")
 	{
 		global $core, $_ctx;
@@ -426,5 +355,5 @@
 		
 		$pattern = '(?:'.preg_quote($p_site,'/').')?'.preg_quote($p_url,'/');
-		$pattern = sprintf('/<img.+?src="%s(.*?\.(?:jpg|jpeg|gif|png))"[^>]+/msui',$pattern);
+		$pattern = sprintf('/<img.+?src="%s(.*?\.(?:jpg|jpeg|gif|png))"[^>]+/msu',$pattern);
 		
 		$src = '';
@@ -432,13 +361,12 @@
 		
 		# We first look in post content
-		if (!$cat_only && $_ctx->posts)
-		{
-			$subject = ($content_only ? '' : $_ctx->posts->post_excerpt_xhtml).$_ctx->posts->post_content_xhtml;
+		if ($_ctx->posts)
+		{
+			$subject = $_ctx->posts->post_excerpt_xhtml.$_ctx->posts->post_content_xhtml.$_ctx->posts->cat_desc;
 			if (preg_match_all($pattern,$subject,$m) > 0)
 			{
 				foreach ($m[1] as $i => $img) {
 					if (($src = self::ContentFirstImageLookup($p_root,$img,$size)) !== false) {
-						$dirname = str_replace('\\', '/', dirname($img)); 
-						$src = $p_url.($dirname != '/' ? $dirname : '').'/'.$src;
+						$src = $p_url.(dirname($img) != '/' ? dirname($img) : '').'/'.$src;
 						if (preg_match('/alt="([^"]+)"/',$m[0][$i],$malt)) {
 							$alt = $malt[1];
@@ -457,6 +385,5 @@
 				foreach ($m[1] as $i => $img) {
 					if (($src = self::ContentFirstImageLookup($p_root,$img,$size)) !== false) {
-						$dirname = str_replace('\\', '/', dirname($img)); 
-						$src = $p_url.($dirname != '/' ? $dirname : '').'/'.$src;
+						$src = $p_url.(dirname($img) != '/' ? dirname($img) : '').'/'.$src;
 						if (preg_match('/alt="([^"]+)"/',$m[0][$i],$malt)) {
 							$alt = $malt[1];
@@ -469,9 +396,5 @@
 		
 		if ($src) {
-			if ($no_tag) {
-				return $src;
-			} else {
-				return '<img alt="'.$alt.'" src="'.$src.'" class="'.$class.'" />';
-			}
+			return '<img alt="'.$alt.'" src="'.$src.'" class="'.$class.'" />';
 		}
 	}
@@ -509,12 +432,4 @@
 			} elseif (file_exists($f.'.gif')) {
 				$res = $base.'.gif';
-			} elseif (file_exists($f.'.JPG')) {
-				$res = $base.'.JPG';
-			} elseif (file_exists($f.'.JPEG')) {
-				$res = $base.'.JPEG';
-			} elseif (file_exists($f.'.PNG')) {
-				$res = $base.'.PNG';
-			} elseif (file_exists($f.'.GIF')) {
-				$res = $base.'.GIF';
 			}
 		}
Index: inc/public/prepend.php
===================================================================
--- inc/public/prepend.php	(revision 921)
+++ inc/public/prepend.php	(revision 420)
@@ -33,5 +33,5 @@
 				__('The following error was encountered while trying to read the database:').'</p><ul><li>'.$e->getMessage().'</li></ul>' :
 				__('Something went wrong while trying to read the database.')
-			,620);
+			,20);
 	}
 }
@@ -40,5 +40,5 @@
 	__error(__('Blog is not defined.')
 		,__('Did you change your Blog ID?')
-		,630);
+		,30);
 }
 
@@ -47,5 +47,5 @@
 	__error(__('Blog is offline.')
 		,__('This blog is offline. Please try again later.')
-		,670);
+		,70);
 }
 
@@ -62,5 +62,5 @@
 	__error(__('Can\'t create template files.')
 		,$e->getMessage()
-		,640);
+		,40);
 }
 
@@ -107,5 +107,5 @@
 		'path in your blog configuration. Please check theme_path value in '.
 		'about:config module or reinstall default theme. ('.$__theme.')')
-		,650);
+		,50);
 }
 
@@ -152,5 +152,5 @@
 	__error($e->getMessage()
 		,__('Something went wrong while loading template file for your blog.')
-		,660);
+		,60);
 }
 ?>
Index: locales/_pot/main.pot
===================================================================
--- locales/_pot/main.pot	(revision 963)
+++ locales/_pot/main.pot	(revision 782)
@@ -8,5 +8,5 @@
 "Project-Id-Version: Dotclear 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-06 09:58+0100\n"
+"POT-Creation-Date: 2011-11-13 15:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -47,5 +47,5 @@
 msgstr ""
 
-#: admin/auth.php:113 admin/auth.php:388 admin/blog_pref.php:360
+#: admin/auth.php:113 admin/auth.php:388 admin/blog_pref.php:488
 #: admin/install/index.php:333 admin/install/index.php:373 admin/user.php:207
 msgid "Password:"
@@ -56,5 +56,5 @@
 msgstr ""
 
-#: admin/auth.php:165 admin/install/index.php:84 admin/preferences.php:115
+#: admin/auth.php:165 admin/install/index.php:84 admin/preferences.php:114
 #: admin/user.php:108
 msgid "Passwords don't match"
@@ -90,6 +90,6 @@
 
 #: admin/auth.php:339 admin/comment.php:202 admin/install/index.php:326
-#: admin/post.php:589 admin/preferences.php:391 admin/user.php:229
-#: inc/admin/lib.dc.page.php:419
+#: admin/post.php:550 admin/preferences.php:389 admin/user.php:229
+#: inc/admin/lib.dc.page.php:397
 msgid "Email:"
 msgstr ""
@@ -99,13 +99,13 @@
 msgstr ""
 
-#: admin/auth.php:352 admin/preferences.php:416
+#: admin/auth.php:352 admin/preferences.php:414
 msgid "Change your password"
 msgstr ""
 
-#: admin/auth.php:353 admin/preferences.php:418 admin/user.php:207
+#: admin/auth.php:353 admin/preferences.php:416 admin/user.php:207
 msgid "New password:"
 msgstr ""
 
-#: admin/auth.php:356 admin/install/index.php:335 admin/preferences.php:421
+#: admin/auth.php:356 admin/install/index.php:335 admin/preferences.php:419
 #: admin/user.php:213
 msgid "Confirm password:"
@@ -160,44 +160,44 @@
 msgstr ""
 
-#: admin/blog.php:72 admin/blog_pref.php:265 inc/admin/prepend.php:336
+#: admin/blog.php:72 admin/blog_pref.php:244 inc/admin/prepend.php:330
 msgid "Blogs"
 msgstr ""
 
-#: admin/blog.php:77 admin/blog_pref.php:289 admin/blog_pref.php:361
+#: admin/blog.php:77 admin/blog_pref.php:268 admin/blog_pref.php:489
 msgid "Blog ID:"
 msgstr ""
 
 #: admin/blog.php:77 admin/blog.php:82 admin/blog.php:85
-#: admin/blog_pref.php:289 admin/blog_pref.php:296 admin/blog_pref.php:302
-#: admin/blog_theme.php:295 admin/blog_theme.php:297 admin/blog_theme.php:309
-#: admin/blog_theme.php:311 admin/categories.php:126 admin/category.php:186
-#: admin/comment.php:198 admin/index.php:321 admin/index.php:325
+#: admin/blog_pref.php:268 admin/blog_pref.php:275 admin/blog_pref.php:281
+#: admin/blog_theme.php:297 admin/blog_theme.php:299 admin/blog_theme.php:311
+#: admin/blog_theme.php:313 admin/categories.php:126 admin/category.php:186
+#: admin/comment.php:198 admin/index.php:316 admin/index.php:320
 #: admin/install/index.php:331 admin/install/index.php:333
-#: admin/install/index.php:335 admin/install/wizard.php:180
-#: admin/install/wizard.php:190 admin/langs.php:229 admin/langs.php:245
-#: admin/langs.php:247 admin/plugins.php:353 admin/plugins.php:355
-#: admin/plugins.php:367 admin/plugins.php:369 admin/popup_link.php:42
-#: admin/post.php:390 admin/post.php:399 admin/post.php:585 admin/post.php:597
+#: admin/install/index.php:335 admin/install/wizard.php:171
+#: admin/install/wizard.php:181 admin/langs.php:231 admin/langs.php:247
+#: admin/langs.php:249 admin/plugins.php:328 admin/plugins.php:330
+#: admin/plugins.php:342 admin/plugins.php:344 admin/popup_link.php:42
+#: admin/post.php:362 admin/post.php:371 admin/post.php:546 admin/post.php:558
 #: admin/user.php:200 admin/user.php:206 admin/user.php:213 admin/user.php:280
 msgid "Required field"
 msgstr ""
 
-#: admin/blog.php:79 admin/blog_pref.php:291 admin/user.php:203
+#: admin/blog.php:79 admin/blog_pref.php:270 admin/user.php:203
 msgid "At least 2 characters using letters, numbers or symbols."
 msgstr ""
 
-#: admin/blog.php:80 admin/blog_pref.php:292
+#: admin/blog.php:80 admin/blog_pref.php:271
 msgid "Please note that changing your blog ID may require changes in your public index.php file."
 msgstr ""
 
-#: admin/blog.php:82 admin/blog_pref.php:296
+#: admin/blog.php:82 admin/blog_pref.php:275
 msgid "Blog name:"
 msgstr ""
 
-#: admin/blog.php:85 admin/blog_pref.php:302
+#: admin/blog.php:85 admin/blog_pref.php:281
 msgid "Blog URL:"
 msgstr ""
 
-#: admin/blog.php:88 admin/blog_pref.php:313
+#: admin/blog.php:88 admin/blog_pref.php:292
 msgid "Blog description:"
 msgstr ""
@@ -212,6 +212,6 @@
 
 #: admin/blog_del.php:40 admin/blog_theme.php:95 admin/langs.php:65
-#: admin/langs.php:103 admin/plugins.php:134 admin/user.php:82
-#: admin/users_actions.php:98
+#: admin/langs.php:103 admin/permissions.php:51 admin/plugins.php:119
+#: admin/user.php:82
 msgid "Password verification failed"
 msgstr ""
@@ -234,12 +234,12 @@
 msgstr ""
 
-#: admin/blog_del.php:65 admin/blog_theme.php:297 admin/blog_theme.php:311
-#: admin/langs.php:229 admin/langs.php:247 admin/plugins.php:355
-#: admin/plugins.php:369 admin/preferences.php:426 admin/user.php:280
-#: admin/users_actions.php:271
+#: admin/blog_del.php:65 admin/blog_theme.php:299 admin/blog_theme.php:313
+#: admin/langs.php:231 admin/langs.php:249 admin/permissions.php:146
+#: admin/plugins.php:330 admin/plugins.php:344 admin/preferences.php:424
+#: admin/user.php:280
 msgid "Your password:"
 msgstr ""
 
-#: admin/blog_del.php:67 admin/blog_pref.php:517
+#: admin/blog_del.php:67 admin/blog_pref.php:463
 msgid "Delete this blog"
 msgstr ""
@@ -269,323 +269,279 @@
 msgstr ""
 
-#: admin/blog_pref.php:85
-msgid "post id/title"
-msgstr ""
-
-#: admin/blog_pref.php:86
-msgid "post id"
-msgstr ""
-
-#: admin/blog_pref.php:94 admin/posts.php:96 inc/admin/lib.pager.php:47
+#: admin/blog_pref.php:92 admin/posts.php:96 inc/admin/lib.pager.php:47
 #: inc/admin/lib.pager.php:162 inc/admin/lib.pager.php:257
 msgid "Title"
 msgstr ""
 
+#: admin/blog_pref.php:93
+msgid "Title, Date"
+msgstr ""
+
+#: admin/blog_pref.php:94
+msgid "Title, Country, Date"
+msgstr ""
+
 #: admin/blog_pref.php:95
-msgid "Title, Date"
-msgstr ""
-
-#: admin/blog_pref.php:96
-msgid "Title, Country, Date"
-msgstr ""
-
-#: admin/blog_pref.php:97
 msgid "Title, City, Country, Date"
 msgstr ""
 
-#: admin/blog_pref.php:106 admin/media_item.php:234 admin/media_item.php:361
-msgid "original"
-msgstr ""
-
-#: admin/blog_pref.php:113 admin/media_item.php:240 admin/media_item.php:270
-#: admin/media_item.php:304 admin/posts.php:63 inc/admin/lib.pager.php:89
-msgid "None"
-msgstr ""
-
-#: admin/blog_pref.php:114 admin/media_item.php:241 admin/media_item.php:271
-#: admin/media_item.php:305
-msgid "Left"
-msgstr ""
-
-#: admin/blog_pref.php:115 admin/media_item.php:242 admin/media_item.php:272
-#: admin/media_item.php:306
-msgid "Right"
-msgstr ""
-
-#: admin/blog_pref.php:116 admin/media_item.php:243 admin/media_item.php:273
-#: admin/media_item.php:307
-msgid "Center"
-msgstr ""
-
-#: admin/blog_pref.php:121
+#: admin/blog_pref.php:103
 msgid "I would like search engines and archivers to index and archive my blog's content."
 msgstr ""
 
-#: admin/blog_pref.php:122
+#: admin/blog_pref.php:104
 msgid "I would like search engines and archivers to index but not archive my blog's content."
 msgstr ""
 
-#: admin/blog_pref.php:123
+#: admin/blog_pref.php:105
 msgid "I would like to prevent search engines and archivers from indexing or archiving my blog's content."
 msgstr ""
 
-#: admin/blog_pref.php:164
+#: admin/blog_pref.php:146
 msgid "That blog Id is already in use."
 msgstr ""
 
-#: admin/blog_pref.php:172
+#: admin/blog_pref.php:154
 msgid "Invalid language code"
 msgstr ""
 
-#: admin/blog_pref.php:244 admin/blog_pref.php:267 inc/admin/prepend.php:302
+#: admin/blog_pref.php:223 admin/blog_pref.php:246 inc/admin/prepend.php:296
 msgid "Blog settings"
 msgstr ""
 
-#: admin/blog_pref.php:248
+#: admin/blog_pref.php:227
 msgid "Warning: except for special configurations, it is generally advised to have a trailing \"/\" in your blog URL in PATH_INFO mode."
 msgstr ""
 
-#: admin/blog_pref.php:250
+#: admin/blog_pref.php:229
 msgid "Warning: except for special configurations, it is generally advised to have a trailing \"?\" in your blog URL in QUERY_STRING mode."
 msgstr ""
 
-#: admin/blog_pref.php:270
+#: admin/blog_pref.php:249
 msgid "Blog has been successfully created."
 msgstr ""
 
-#: admin/blog_pref.php:274
+#: admin/blog_pref.php:253
 msgid "Blog has been successfully updated."
 msgstr ""
 
-#: admin/blog_pref.php:278 admin/blog_pref.php:279
+#: admin/blog_pref.php:257 admin/blog_pref.php:258
 msgid "Parameters"
 msgstr ""
 
-#: admin/blog_pref.php:283
+#: admin/blog_pref.php:262
 msgid "Blog details"
 msgstr ""
 
+#: admin/blog_pref.php:284
+msgid "URL scan method:"
+msgstr ""
+
+#: admin/blog_pref.php:287
+msgid "Blog status:"
+msgstr ""
+
+#: admin/blog_pref.php:298
+msgid "Blog configuration"
+msgstr ""
+
+#: admin/blog_pref.php:301
+msgid "Blog editor name:"
+msgstr ""
+
 #: admin/blog_pref.php:305
-msgid "URL scan method:"
-msgstr ""
-
-#: admin/blog_pref.php:308
-msgid "Blog status:"
+msgid "Default language:"
+msgstr ""
+
+#: admin/blog_pref.php:309
+msgid "Blog timezone:"
+msgstr ""
+
+#: admin/blog_pref.php:315
+msgid "Copyright notice:"
 msgstr ""
 
 #: admin/blog_pref.php:319
-msgid "Blog configuration"
-msgstr ""
-
-#: admin/blog_pref.php:322
-msgid "Blog editor name:"
+msgid "New post URL format:"
+msgstr ""
+
+#: admin/blog_pref.php:325
+msgid "Enable XML/RPC interface"
 msgstr ""
 
 #: admin/blog_pref.php:326
-msgid "Default language:"
-msgstr ""
-
-#: admin/blog_pref.php:330
-msgid "Blog timezone:"
-msgstr ""
-
-#: admin/blog_pref.php:336
-msgid "Copyright notice:"
-msgstr ""
-
-#: admin/blog_pref.php:340
-msgid "New post URL format:"
-msgstr ""
-
-#: admin/blog_pref.php:346
-msgid "Enable XML/RPC interface"
-msgstr ""
-
-#: admin/blog_pref.php:349
+msgid "more information"
+msgstr ""
+
+#: admin/blog_pref.php:333 admin/comments.php:148 admin/comments.php:150
+msgid "Comments and trackbacks"
+msgstr ""
+
+#: admin/blog_pref.php:338 admin/post.php:425
+msgid "Accept comments"
+msgstr ""
+
+#: admin/blog_pref.php:342
+msgid "Moderate comments"
+msgstr ""
+
+#: admin/blog_pref.php:344
+#, php-format
+msgid "Leave comments open for %s days"
+msgstr ""
+
+#: admin/blog_pref.php:347 admin/blog_pref.php:365
+msgid "Leave blank to disable this feature."
+msgstr ""
+
+#: admin/blog_pref.php:351
+msgid "Wiki syntax for comments"
+msgstr ""
+
+#: admin/blog_pref.php:357 admin/post.php:427
+msgid "Accept trackbacks"
+msgstr ""
+
+#: admin/blog_pref.php:361
+msgid "Moderate trackbacks"
+msgstr ""
+
+#: admin/blog_pref.php:363
+#, php-format
+msgid "Leave trackbacks open for %s days"
+msgstr ""
+
+#: admin/blog_pref.php:369
+msgid "Add \"nofollow\" relation on comments and trackbacks links"
+msgstr ""
+
+#: admin/blog_pref.php:376
+msgid "Blog presentation"
+msgstr ""
+
+#: admin/blog_pref.php:379
+msgid "Date format:"
+msgstr ""
+
+#: admin/blog_pref.php:383
+msgid "Time format:"
+msgstr ""
+
+#: admin/blog_pref.php:389
+msgid "Display smilies on entries and comments"
+msgstr ""
+
+#: admin/blog_pref.php:393
+#, php-format
+msgid "Display %s entries per page"
+msgstr ""
+
+#: admin/blog_pref.php:397
+#, php-format
+msgid "Display %s entries per feed"
+msgstr ""
+
+#: admin/blog_pref.php:401
+#, php-format
+msgid "Display %s comments per feed"
+msgstr ""
+
+#: admin/blog_pref.php:407
+msgid "Truncate feeds"
+msgstr ""
+
+#: admin/blog_pref.php:414
+msgid "Media and images"
+msgstr ""
+
+#: admin/blog_pref.php:417
+msgid "Generated image sizes (in pixels)"
+msgstr ""
+
+#: admin/blog_pref.php:418
+msgid "Thumbnails:"
+msgstr ""
+
+#: admin/blog_pref.php:421
+msgid "Small:"
+msgstr ""
+
+#: admin/blog_pref.php:424
+msgid "Medium:"
+msgstr ""
+
+#: admin/blog_pref.php:429
+msgid "Inserted image title"
+msgstr ""
+
+#: admin/blog_pref.php:430
+msgid "This defines image tag title when you insert it in a post from the media manager. It is retrieved from the picture's metadata."
+msgstr ""
+
+#: admin/blog_pref.php:437
+msgid "Search engines robots policy"
+msgstr ""
+
+#: admin/blog_pref.php:454 admin/blog_theme.php:351 admin/category.php:216
+#: admin/category.php:234 admin/category.php:248 admin/comment.php:224
+#: admin/index.php:325 admin/install/index.php:339 admin/media_item.php:501
+#: admin/permissions.php:149 admin/post.php:385 admin/post.php:565
+#: admin/posts_actions.php:235 admin/posts_actions.php:252
+#: admin/preferences.php:431 admin/preferences.php:514 admin/user.php:282
+msgid "Save"
+msgstr ""
+
+#: admin/blog_pref.php:470
+msgid "XML/RPC interface"
+msgstr ""
+
+#: admin/blog_pref.php:472
 msgid "XML/RPC interface allows you to edit your blog with an external client."
 msgstr ""
 
-#: admin/blog_pref.php:353
+#: admin/blog_pref.php:476
+msgid "XML/RPC interface is not active. Change settings to enable it."
+msgstr ""
+
+#: admin/blog_pref.php:481
 msgid "XML/RPC interface is active. You should set the following parameters on your XML/RPC client:"
 msgstr ""
 
-#: admin/blog_pref.php:355
+#: admin/blog_pref.php:483
 msgid "Server URL:"
 msgstr ""
 
-#: admin/blog_pref.php:358
+#: admin/blog_pref.php:486
 msgid "Blogging system:"
 msgstr ""
 
-#: admin/blog_pref.php:359
+#: admin/blog_pref.php:487
 msgid "User name:"
 msgstr ""
 
-#: admin/blog_pref.php:360
+#: admin/blog_pref.php:488
 msgid "your password"
 msgstr ""
 
-#: admin/blog_pref.php:372 admin/comments.php:160 admin/comments.php:162
-msgid "Comments and trackbacks"
-msgstr ""
-
-#: admin/blog_pref.php:377 admin/post.php:452
-msgid "Accept comments"
-msgstr ""
-
-#: admin/blog_pref.php:381
-msgid "Moderate comments"
-msgstr ""
-
-#: admin/blog_pref.php:383
-#, php-format
-msgid "Leave comments open for %s days"
-msgstr ""
-
-#: admin/blog_pref.php:386 admin/blog_pref.php:404
-msgid "Leave blank to disable this feature."
-msgstr ""
-
-#: admin/blog_pref.php:390
-msgid "Wiki syntax for comments"
-msgstr ""
-
-#: admin/blog_pref.php:396 admin/post.php:460
-msgid "Accept trackbacks"
-msgstr ""
-
-#: admin/blog_pref.php:400
-msgid "Moderate trackbacks"
-msgstr ""
-
-#: admin/blog_pref.php:402
-#, php-format
-msgid "Leave trackbacks open for %s days"
-msgstr ""
-
-#: admin/blog_pref.php:408
-msgid "Add \"nofollow\" relation on comments and trackbacks links"
-msgstr ""
-
-#: admin/blog_pref.php:415
-msgid "Blog presentation"
-msgstr ""
-
-#: admin/blog_pref.php:418
-msgid "Date format:"
-msgstr ""
-
-#: admin/blog_pref.php:422
-msgid "Time format:"
-msgstr ""
-
-#: admin/blog_pref.php:428
-msgid "Display smilies on entries and comments"
-msgstr ""
-
-#: admin/blog_pref.php:432
-#, php-format
-msgid "Display %s entries per page"
-msgstr ""
-
-#: admin/blog_pref.php:436
-#, php-format
-msgid "Display %s entries per feed"
-msgstr ""
-
-#: admin/blog_pref.php:440
-#, php-format
-msgid "Display %s comments per feed"
-msgstr ""
-
-#: admin/blog_pref.php:446
-msgid "Truncate feeds"
-msgstr ""
-
-#: admin/blog_pref.php:453
-msgid "Media and images"
-msgstr ""
-
-#: admin/blog_pref.php:456
-msgid "Generated image sizes (in pixels)"
-msgstr ""
-
-#: admin/blog_pref.php:457
-msgid "Thumbnails:"
-msgstr ""
-
-#: admin/blog_pref.php:460
-msgid "Small:"
-msgstr ""
-
-#: admin/blog_pref.php:463
-msgid "Medium:"
-msgstr ""
-
-#: admin/blog_pref.php:468
-msgid "Inserted image title"
-msgstr ""
-
-#: admin/blog_pref.php:469
-msgid "This defines image tag title when you insert it in a post from the media manager. It is retrieved from the picture's metadata."
-msgstr ""
-
-#: admin/blog_pref.php:474
-msgid "Default image insertion attributes"
-msgstr ""
-
-#: admin/blog_pref.php:475 admin/media_item.php:222
-msgid "Image size:"
-msgstr ""
-
-#: admin/blog_pref.php:479 admin/media_item.php:238
-msgid "Image alignment"
-msgstr ""
-
-#: admin/blog_pref.php:484 admin/media_item.php:259
-msgid "As a link to original image"
-msgstr ""
-
-#: admin/blog_pref.php:491
-msgid "Search engines robots policy"
-msgstr ""
-
-#: admin/blog_pref.php:508 admin/blog_theme.php:349 admin/category.php:216
-#: admin/category.php:234 admin/category.php:248 admin/comment.php:224
-#: admin/index.php:330 admin/install/index.php:339 admin/media_item.php:533
-#: admin/post.php:413 admin/post.php:604 admin/posts_actions.php:235
-#: admin/posts_actions.php:252 admin/preferences.php:433
-#: admin/preferences.php:520 admin/user.php:282 admin/users_actions.php:274
-msgid "Save"
-msgstr ""
-
-#: admin/blog_pref.php:523
-msgid "The current blog cannot be deleted"
-msgstr ""
-
-#: admin/blog_pref.php:525
-msgid "Only superadmin can delete a blog"
-msgstr ""
-
-#: admin/blog_pref.php:538 admin/user.php:187 admin/users.php:96
-#: admin/users.php:108 admin/users_actions.php:134 admin/users_actions.php:180
-#: admin/users_actions.php:241 inc/admin/prepend.php:333
+#: admin/blog_pref.php:502 admin/permissions.php:100
+#: admin/permissions_blog.php:92 admin/user.php:187 admin/users.php:120
+#: inc/admin/prepend.php:327
 msgid "Users"
 msgstr ""
 
-#: admin/blog_pref.php:539
+#: admin/blog_pref.php:503
 msgid "Users on this blog"
 msgstr ""
 
-#: admin/blog_pref.php:543
+#: admin/blog_pref.php:507
 msgid "No users"
 msgstr ""
 
-#: admin/blog_pref.php:565 admin/user.php:270
+#: admin/blog_pref.php:530 admin/user.php:310
+msgid "Change permissions"
+msgstr ""
+
+#: admin/blog_pref.php:537 admin/user.php:270
 msgid "Super administrator"
-msgstr ""
-
-#: admin/blog_pref.php:576 admin/user.php:327
-msgid "Change permissions"
 msgstr ""
 
@@ -598,9 +554,9 @@
 msgstr ""
 
-#: admin/blog_theme.php:104 admin/langs.php:109 admin/plugins.php:143
+#: admin/blog_theme.php:104 admin/langs.php:109 admin/plugins.php:128
 msgid "Unable to move uploaded file."
 msgstr ""
 
-#: admin/blog_theme.php:123 admin/plugins.php:162
+#: admin/blog_theme.php:123 admin/plugins.php:147
 msgid "An error occurred while downloading the file."
 msgstr ""
@@ -634,6 +590,6 @@
 msgstr ""
 
-#: admin/blog_theme.php:209 admin/blog_theme.php:218 admin/blog_theme.php:334
-#: inc/admin/prepend.php:299
+#: admin/blog_theme.php:209 admin/blog_theme.php:218 admin/blog_theme.php:336
+#: inc/admin/prepend.php:293
 msgid "Blog appearance"
 msgstr ""
@@ -643,84 +599,84 @@
 msgstr ""
 
-#: admin/blog_theme.php:225
+#: admin/blog_theme.php:226
 msgid "Theme has been successfully installed."
 msgstr ""
 
-#: admin/blog_theme.php:225
+#: admin/blog_theme.php:226
 msgid "Theme has been successfully upgraded"
 msgstr ""
 
-#: admin/blog_theme.php:229
+#: admin/blog_theme.php:231
 msgid "Theme has been successfully deleted."
 msgstr ""
 
-#: admin/blog_theme.php:234
+#: admin/blog_theme.php:236
 #, php-format
 msgid "You can find additional themes for your blog on %s."
 msgstr ""
 
-#: admin/blog_theme.php:236
+#: admin/blog_theme.php:238
 msgid "To install or upgrade a theme you generally just need to upload it in \"Install or upgrade a theme\" section."
 msgstr ""
 
-#: admin/blog_theme.php:241
+#: admin/blog_theme.php:243
 msgid "Themes"
 msgstr ""
 
-#: admin/blog_theme.php:245
+#: admin/blog_theme.php:247
 #, php-format
 msgid "You are currently using \"%s\""
 msgstr ""
 
-#: admin/blog_theme.php:269
+#: admin/blog_theme.php:271
 msgid "Use selected theme"
 msgstr ""
 
-#: admin/blog_theme.php:272
+#: admin/blog_theme.php:274
 msgid "Delete selected theme"
 msgstr ""
 
-#: admin/blog_theme.php:284
+#: admin/blog_theme.php:286
 msgid "Install or upgrade a theme"
 msgstr ""
 
-#: admin/blog_theme.php:288
+#: admin/blog_theme.php:290
 msgid "You can install themes by uploading or downloading zip files."
 msgstr ""
 
-#: admin/blog_theme.php:294 admin/langs.php:243 admin/plugins.php:352
+#: admin/blog_theme.php:296 admin/langs.php:245 admin/plugins.php:327
 msgid "Upload a zip file"
 msgstr ""
 
-#: admin/blog_theme.php:295
+#: admin/blog_theme.php:297
 msgid "Theme zip file:"
 msgstr ""
 
-#: admin/blog_theme.php:299
+#: admin/blog_theme.php:301
 msgid "Upload theme"
 msgstr ""
 
-#: admin/blog_theme.php:308 admin/plugins.php:366
+#: admin/blog_theme.php:310 admin/plugins.php:341
 msgid "Download a zip file"
 msgstr ""
 
-#: admin/blog_theme.php:309
+#: admin/blog_theme.php:311
 msgid "Theme zip file URL:"
 msgstr ""
 
-#: admin/blog_theme.php:313
+#: admin/blog_theme.php:315
 msgid "Download theme"
 msgstr ""
 
-#: admin/blog_theme.php:322
+#: admin/blog_theme.php:324
 msgid "To enable this function, please give write access to your themes directory."
 msgstr ""
 
-#: admin/blog_theme.php:334
+#: admin/blog_theme.php:336
 msgid "Theme configuration"
 msgstr ""
 
-#: admin/blog_theme.php:335 admin/comments_actions.php:133
-#: admin/posts_actions.php:256 admin/users_actions.php:281
+#: admin/blog_theme.php:337 admin/comments_actions.php:133
+#: admin/posts_actions.php:256
 msgid "back"
 msgstr ""
@@ -730,19 +686,21 @@
 msgstr ""
 
-#: admin/blogs.php:20 admin/blogs.php:133 admin/users_actions.php:196
+#: admin/blogs.php:20 admin/blogs.php:133 admin/permissions_blog.php:20
+#: admin/permissions_blog.php:153
 msgid "Blog name"
 msgstr ""
 
-#: admin/blogs.php:21 admin/blogs.php:136 admin/users_actions.php:195
+#: admin/blogs.php:21 admin/blogs.php:136 admin/permissions_blog.php:19
+#: admin/permissions_blog.php:152
 msgid "Blog ID"
 msgstr ""
 
-#: admin/blogs.php:25 admin/comments.php:40 admin/posts.php:104
-#: admin/users.php:27
+#: admin/blogs.php:25 admin/comments.php:40 admin/permissions_blog.php:24
+#: admin/posts.php:104 admin/users.php:51
 msgid "Descending"
 msgstr ""
 
-#: admin/blogs.php:26 admin/comments.php:41 admin/posts.php:105
-#: admin/users.php:28
+#: admin/blogs.php:26 admin/comments.php:41 admin/permissions_blog.php:25
+#: admin/posts.php:105 admin/users.php:52
 msgid "Ascending"
 msgstr ""
@@ -760,21 +718,22 @@
 msgstr ""
 
-#: admin/blogs.php:90 admin/blogs.php:95 admin/comments.php:169
-#: admin/comments.php:174 admin/posts.php:255 admin/posts.php:260
-#: admin/users.php:112 admin/users.php:117
+#: admin/blogs.php:90 admin/blogs.php:95 admin/comments.php:157
+#: admin/comments.php:162 admin/permissions_blog.php:102
+#: admin/permissions_blog.php:107 admin/posts.php:238 admin/posts.php:243
+#: admin/users.php:124 admin/users.php:129
 msgid "Filters"
 msgstr ""
 
-#: admin/blogs.php:98 admin/comments.php:186 admin/posts.php:281
-#: admin/users.php:120
+#: admin/blogs.php:98 admin/comments.php:174 admin/permissions_blog.php:110
+#: admin/posts.php:264 admin/users.php:132
 msgid "Order by:"
 msgstr ""
 
-#: admin/blogs.php:101 admin/comments.php:189 admin/posts.php:283
-#: admin/users.php:123
+#: admin/blogs.php:101 admin/comments.php:177 admin/permissions_blog.php:113
+#: admin/posts.php:266 admin/users.php:135
 msgid "Sort:"
 msgstr ""
 
-#: admin/blogs.php:107 admin/users.php:129
+#: admin/blogs.php:107 admin/permissions_blog.php:119 admin/users.php:141
 msgid "Search:"
 msgstr ""
@@ -784,27 +743,32 @@
 msgstr ""
 
-#: admin/blogs.php:112 admin/comments.php:203 admin/posts.php:287
-#: admin/users.php:134
+#: admin/blogs.php:112 admin/comments.php:191 admin/permissions_blog.php:124
+#: admin/posts.php:270 admin/users.php:146
 msgid "Apply filters"
 msgstr ""
 
-#: admin/blogs.php:122 admin/users_actions.php:188
+#: admin/blogs.php:122 admin/permissions_blog.php:140
 msgid "No blog"
 msgstr ""
 
 #: admin/blogs.php:129 admin/blogs.php:147 admin/media.php:329
-#: admin/media.php:337 inc/admin/lib.pager.php:60 inc/admin/lib.pager.php:73
-#: inc/admin/lib.pager.php:172 inc/admin/lib.pager.php:185
-#: inc/admin/lib.pager.php:269 inc/admin/lib.pager.php:282
-#: inc/admin/lib.pager.php:376 inc/admin/lib.pager.php:389
+#: admin/media.php:337 admin/permissions_blog.php:147
+#: admin/permissions_blog.php:172 inc/admin/lib.pager.php:60
+#: inc/admin/lib.pager.php:73 inc/admin/lib.pager.php:172
+#: inc/admin/lib.pager.php:185 inc/admin/lib.pager.php:269
+#: inc/admin/lib.pager.php:282 inc/admin/lib.pager.php:376
+#: inc/admin/lib.pager.php:389
 msgid "Page(s)"
 msgstr ""
 
-#: admin/blogs.php:135
-msgid "Entries (all types)"
-msgstr ""
-
-#: admin/blogs.php:138 admin/comments.php:36 admin/post.php:640
-#: admin/posts.php:99 admin/posts.php:113 admin/users_actions.php:198
+#: admin/blogs.php:135 admin/permissions_blog.php:154 admin/post.php:281
+#: admin/post.php:322 admin/posts.php:228 admin/posts.php:233
+#: admin/posts_actions.php:165 inc/admin/lib.pager.php:369
+#: inc/admin/prepend.php:311
+msgid "Entries"
+msgstr ""
+
+#: admin/blogs.php:138 admin/comments.php:36 admin/permissions_blog.php:155
+#: admin/post.php:580 admin/posts.php:99 admin/posts.php:113
 #: inc/admin/lib.pager.php:53 inc/admin/lib.pager.php:165
 #: inc/admin/lib.pager.php:261
@@ -826,10 +790,10 @@
 msgstr ""
 
-#: admin/categories.php:24 inc/core/class.dc.xmlrpc.php:1130
+#: admin/categories.php:24 inc/core/class.dc.xmlrpc.php:1126
 msgid "This category does not exist."
 msgstr ""
 
 #: admin/categories.php:52 admin/categories.php:70 admin/category.php:171
-#: inc/admin/prepend.php:308
+#: inc/admin/prepend.php:302
 msgid "Categories"
 msgstr ""
@@ -873,5 +837,5 @@
 msgstr ""
 
-#: admin/categories.php:110 admin/category.php:206 admin/preferences.php:394
+#: admin/categories.php:110 admin/category.php:206 admin/preferences.php:392
 #: admin/user.php:236
 msgid "URL:"
@@ -882,6 +846,6 @@
 msgstr ""
 
-#: admin/categories.php:126 admin/category.php:186 admin/index.php:321
-#: admin/media.php:356 admin/post.php:390
+#: admin/categories.php:126 admin/category.php:186 admin/index.php:316
+#: admin/media.php:356 admin/post.php:362
 msgid "Title:"
 msgstr ""
@@ -903,9 +867,9 @@
 msgstr ""
 
-#: admin/categories.php:169 admin/comment.php:227 admin/comments.php:132
-#: admin/langs.php:195 admin/media.php:459 admin/plugins.php:282
-#: admin/plugins.php:325 admin/post.php:423 admin/post.php:528
+#: admin/categories.php:169 admin/comment.php:227 admin/comments.php:120
+#: admin/langs.php:197 admin/media.php:459 admin/plugins.php:257
+#: admin/plugins.php:300 admin/post.php:396 admin/post.php:489
 #: admin/posts.php:132 admin/search.php:107 admin/search.php:150
-#: admin/users.php:34
+#: admin/users.php:58
 msgid "Delete"
 msgstr ""
@@ -975,5 +939,5 @@
 msgstr ""
 
-#: admin/comment.php:93 admin/post.php:555 inc/admin/lib.pager.php:246
+#: admin/comment.php:93 admin/post.php:516 inc/admin/lib.pager.php:246
 msgid "No comment"
 msgstr ""
@@ -1011,5 +975,5 @@
 msgstr ""
 
-#: admin/comment.php:192 admin/comments.php:200 inc/admin/lib.dc.page.php:421
+#: admin/comment.php:192 admin/comments.php:188 inc/admin/lib.dc.page.php:399
 msgid "IP address:"
 msgstr ""
@@ -1019,17 +983,17 @@
 msgstr ""
 
-#: admin/comment.php:198 admin/posts.php:263
+#: admin/comment.php:198 admin/posts.php:246
 msgid "Author:"
 msgstr ""
 
-#: admin/comment.php:207 admin/post.php:593 inc/admin/lib.dc.page.php:417
+#: admin/comment.php:207 admin/post.php:554 inc/admin/lib.dc.page.php:395
 msgid "Web site:"
 msgstr ""
 
-#: admin/comment.php:211 admin/comments.php:180 admin/posts.php:267
+#: admin/comment.php:211 admin/comments.php:168 admin/posts.php:250
 msgid "Status:"
 msgstr ""
 
-#: admin/comment.php:218 admin/post.php:598
+#: admin/comment.php:218 admin/post.php:559
 msgid "Comment:"
 msgstr ""
@@ -1043,5 +1007,5 @@
 msgstr ""
 
-#: admin/comments.php:33 admin/post.php:638 admin/posts.php:95
+#: admin/comments.php:33 admin/post.php:578 admin/posts.php:95
 #: inc/admin/lib.pager.php:48 inc/admin/lib.pager.php:163
 #: inc/admin/lib.pager.php:258
@@ -1053,5 +1017,5 @@
 msgstr ""
 
-#: admin/comments.php:35 admin/post.php:637 admin/posts.php:98
+#: admin/comments.php:35 admin/post.php:577 admin/posts.php:98
 #: inc/admin/lib.pager.php:50 inc/admin/lib.pager.php:164
 #: inc/admin/lib.pager.php:259
@@ -1059,68 +1023,68 @@
 msgstr ""
 
-#: admin/comments.php:125 admin/post.php:520 admin/search.php:96
+#: admin/comments.php:113 admin/post.php:481 admin/search.php:96
 #: admin/search.php:143
 msgid "publish"
 msgstr ""
 
-#: admin/comments.php:126 admin/post.php:521 admin/search.php:97
+#: admin/comments.php:114 admin/post.php:482 admin/search.php:97
 #: admin/search.php:144
 msgid "unpublish"
 msgstr ""
 
-#: admin/comments.php:127 admin/post.php:522 admin/search.php:99
+#: admin/comments.php:115 admin/post.php:483 admin/search.php:99
 #: admin/search.php:145
 msgid "mark as pending"
 msgstr ""
 
-#: admin/comments.php:128 admin/post.php:523 admin/search.php:146
+#: admin/comments.php:116 admin/post.php:484 admin/search.php:146
 msgid "mark as junk"
 msgstr ""
 
-#: admin/comments.php:177
+#: admin/comments.php:165
 msgid "Type:"
 msgstr ""
 
-#: admin/comments.php:193
+#: admin/comments.php:181
 msgid "Comments per page"
 msgstr ""
 
-#: admin/comments.php:197
+#: admin/comments.php:185
 msgid "Comment author:"
 msgstr ""
 
-#: admin/comments.php:214
+#: admin/comments.php:202
 msgid "You have one spam comments."
 msgstr ""
 
-#: admin/comments.php:215
+#: admin/comments.php:203
 msgid "Show it."
 msgstr ""
 
-#: admin/comments.php:217
+#: admin/comments.php:205
 #, php-format
 msgid "You have %s spam comments."
 msgstr ""
 
-#: admin/comments.php:218
+#: admin/comments.php:206
 msgid "Show them."
 msgstr ""
 
-#: admin/comments.php:231 admin/post.php:563 admin/search.php:167
+#: admin/comments.php:219 admin/post.php:524 admin/search.php:167
 msgid "Selected comments action:"
 msgstr ""
 
-#: admin/comments.php:232
+#: admin/comments.php:220
 msgid "action: "
 msgstr ""
 
-#: admin/comments.php:234 admin/post.php:567 admin/posts.php:305
-#: admin/search.php:129 admin/search.php:169 admin/users.php:154
+#: admin/comments.php:222 admin/post.php:528 admin/posts.php:288
+#: admin/search.php:129 admin/search.php:169 admin/users.php:166
 #: inc/admin/lib.dc.page.php:79
 msgid "ok"
 msgstr ""
 
-#: admin/comments_actions.php:101 admin/post.php:537 admin/post.php:551
-#: inc/admin/lib.pager.php:51 inc/admin/prepend.php:314
+#: admin/comments_actions.php:101 admin/post.php:498 admin/post.php:512
+#: inc/admin/lib.pager.php:51 inc/admin/prepend.php:308
 msgid "Comments"
 msgstr ""
@@ -1136,89 +1100,85 @@
 msgstr ""
 
-#: admin/index.php:115 admin/index.php:320 admin/post.php:35
-#: admin/posts.php:251 inc/admin/prepend.php:320 inc/admin/prepend.php:371
+#: admin/index.php:111 admin/index.php:315 admin/post.php:35
+#: admin/posts.php:234 inc/admin/prepend.php:314 inc/admin/prepend.php:364
 msgid "New entry"
 msgstr ""
 
-#: admin/index.php:117 admin/media.php:360 admin/preferences.php:17
+#: admin/index.php:113 admin/media.php:360 admin/preferences.php:17
 #: inc/admin/lib.dc.page.php:139
 msgid "My preferences"
 msgstr ""
 
-#: admin/index.php:128
+#: admin/index.php:124
 msgid "Documentation and support"
 msgstr ""
 
-#: admin/index.php:131 admin/index.php:158
-msgid "(external link)"
-msgstr ""
-
-#: admin/index.php:154
+#: admin/index.php:150
 msgid "Latest news"
 msgstr ""
 
-#: admin/index.php:191 admin/index.php:198
+#: admin/index.php:186 admin/index.php:193
 msgid "Dashboard"
 msgstr ""
 
-#: admin/index.php:202
+#: admin/index.php:197
 msgid "Make this blog my default blog"
 msgstr ""
 
-#: admin/index.php:206
+#: admin/index.php:201
 msgid "This blog is offline"
 msgstr ""
 
-#: admin/index.php:208
+#: admin/index.php:203
 msgid "This blog is removed"
 msgstr ""
 
-#: admin/index.php:214 admin/index.php:221
+#: admin/index.php:209 admin/index.php:216
 msgid "is not defined, you should edit your configuration file."
 msgstr ""
 
-#: admin/index.php:228 admin/install/index.php:348 admin/plugins.php:209
+#: admin/index.php:223 admin/install/index.php:348 admin/plugins.php:190
 msgid "Following plugins have been installed:"
 msgstr ""
 
-#: admin/index.php:236 admin/install/index.php:356 admin/plugins.php:217
+#: admin/index.php:231 admin/install/index.php:356 admin/plugins.php:198
 msgid "Following plugins have not been installed:"
 msgstr ""
 
-#: admin/index.php:255
+#: admin/index.php:250
 #, php-format
 msgid "Dotclear %s is available!"
 msgstr ""
 
-#: admin/index.php:256
+#: admin/index.php:251
 msgid "Upgrade now"
 msgstr ""
 
-#: admin/index.php:257
+#: admin/index.php:252
 msgid "Remind me later"
 msgstr ""
 
-#: admin/index.php:258 admin/update.php:188
+#: admin/index.php:253 admin/update.php:172
 msgid "information about this version"
 msgstr ""
 
-#: admin/index.php:273
+#: admin/index.php:268
 msgid "Some plugins are installed twice:"
 msgstr ""
 
-#: admin/index.php:318
+#: admin/index.php:313
 msgid "Quick entry"
 msgstr ""
 
-#: admin/index.php:325 admin/post.php:399
+#: admin/index.php:320 admin/post.php:371
 msgid "Content:"
 msgstr ""
 
-#: admin/index.php:328 admin/post.php:433 admin/posts.php:265
+#: admin/index.php:323 admin/post.php:406 admin/posts.php:248
 #: admin/posts_actions.php:227
 msgid "Category:"
 msgstr ""
 
-#: admin/index.php:332
+#: admin/index.php:327
 msgid "Save and publish"
 msgstr ""
@@ -1275,9 +1235,9 @@
 msgstr ""
 
-#: admin/install/index.php:46 admin/install/wizard.php:85
+#: admin/install/index.php:46 admin/install/wizard.php:76
 msgid "Dotclear is already installed."
 msgstr ""
 
-#: admin/install/index.php:52 admin/install/wizard.php:79
+#: admin/install/index.php:52 admin/install/wizard.php:70
 msgid "Dotclear cannot be installed."
 msgstr ""
@@ -1348,6 +1308,6 @@
 
 #: admin/install/index.php:306 admin/install/index.php:392
-#: admin/install/wizard.php:161 inc/admin/lib.dc.page.php:161
-#: inc/admin/lib.dc.page.php:247
+#: admin/install/wizard.php:152 inc/admin/lib.dc.page.php:161
+#: inc/admin/lib.dc.page.php:242
 msgid "Errors:"
 msgstr ""
@@ -1365,9 +1325,9 @@
 msgstr ""
 
-#: admin/install/index.php:322 admin/preferences.php:385 admin/user.php:221
+#: admin/install/index.php:322 admin/preferences.php:383 admin/user.php:221
 msgid "First Name:"
 msgstr ""
 
-#: admin/install/index.php:324 admin/preferences.php:382 admin/user.php:217
+#: admin/install/index.php:324 admin/preferences.php:380 admin/user.php:217
 msgid "Last Name:"
 msgstr ""
@@ -1413,76 +1373,67 @@
 msgstr ""
 
-#: admin/install/wizard.php:49
-#, php-format
-msgid "Path <strong>%s</strong> is not writable."
-msgstr ""
-
-#: admin/install/wizard.php:50
-msgid "Dotclear installation wizard could not create configuration file for you. You must change folder right or create the <strong>config.php</strong> file manually, please refer to <a href=\"http://dotclear.org/documentation/2.0/admin/install\">the documentation</a> to learn how to do this."
-msgstr ""
-
-#: admin/install/wizard.php:91
+#: admin/install/wizard.php:82
 #, php-format
 msgid "File %s does not exist."
 msgstr ""
 
-#: admin/install/wizard.php:96 admin/install/wizard.php:116
+#: admin/install/wizard.php:87 admin/install/wizard.php:107
 #, php-format
 msgid "Cannot write %s file."
 msgstr ""
 
-#: admin/install/wizard.php:149 admin/install/wizard.php:157
+#: admin/install/wizard.php:140 admin/install/wizard.php:148
 msgid "Dotclear installation wizard"
 msgstr ""
 
-#: admin/install/wizard.php:163
+#: admin/install/wizard.php:154
 msgid "Welcome"
 msgstr ""
 
-#: admin/install/wizard.php:164
+#: admin/install/wizard.php:155
 msgid "To complete your Dotclear installation and start writing on your blog, we just need to know how to access your database and who you are. Just fill this two steps wizard with this information and we will be done."
 msgstr ""
 
-#: admin/install/wizard.php:167
+#: admin/install/wizard.php:158
 msgid "Attention:"
 msgstr ""
 
+#: admin/install/wizard.php:159
+msgid "this wizard may not function on every host. If it does not work for you, please refer to <a href=\"http://dotclear.org/documentation/2.0/admin/install\">the documentation</a> to learn how to create the <strong>config.php</strong> file manually."
+msgstr ""
+
+#: admin/install/wizard.php:166
+msgid "System information"
+msgstr ""
+
 #: admin/install/wizard.php:168
-msgid "this wizard may not function on every host. If it does not work for you, please refer to <a href=\"http://dotclear.org/documentation/2.0/admin/install\">the documentation</a> to learn how to create the <strong>config.php</strong> file manually."
+msgid "Please provide the following information needed to create your configuration file."
+msgstr ""
+
+#: admin/install/wizard.php:171
+msgid "Database type:"
+msgstr ""
+
+#: admin/install/wizard.php:173
+msgid "Database Host Name:"
 msgstr ""
 
 #: admin/install/wizard.php:175
-msgid "System information"
+msgid "Database Name:"
 msgstr ""
 
 #: admin/install/wizard.php:177
-msgid "Please provide the following information needed to create your configuration file."
-msgstr ""
-
-#: admin/install/wizard.php:180
-msgid "Database type:"
-msgstr ""
-
-#: admin/install/wizard.php:182
-msgid "Database Host Name:"
+msgid "Database User Name:"
+msgstr ""
+
+#: admin/install/wizard.php:179
+msgid "Database Password:"
+msgstr ""
+
+#: admin/install/wizard.php:181
+msgid "Database Tables Prefix:"
 msgstr ""
 
 #: admin/install/wizard.php:184
-msgid "Database Name:"
-msgstr ""
-
-#: admin/install/wizard.php:186
-msgid "Database User Name:"
-msgstr ""
-
-#: admin/install/wizard.php:188
-msgid "Database Password:"
-msgstr ""
-
-#: admin/install/wizard.php:190
-msgid "Database Tables Prefix:"
-msgstr ""
-
-#: admin/install/wizard.php:193
 msgid "Continue"
 msgstr ""
@@ -1512,89 +1463,89 @@
 msgstr ""
 
-#: admin/langs.php:142
+#: admin/langs.php:143
 msgid "Language has been successfully installed."
 msgstr ""
 
-#: admin/langs.php:142
+#: admin/langs.php:143
 msgid "Language has been successfully upgraded"
 msgstr ""
 
-#: admin/langs.php:146
+#: admin/langs.php:148
 msgid "Here you can install, upgrade or remove languages for your Dotclear installation."
 msgstr ""
 
-#: admin/langs.php:148
+#: admin/langs.php:150
 #, php-format
 msgid "You can change your user language in your <a href=\"%1$s\">preferences</a> or change your blog's main language in your <a href=\"%2$s\">blog settings</a>."
 msgstr ""
 
-#: admin/langs.php:153
+#: admin/langs.php:155
 msgid "Installed languages"
 msgstr ""
 
-#: admin/langs.php:168
+#: admin/langs.php:170
 msgid "No additional language is installed."
 msgstr ""
 
-#: admin/langs.php:174
+#: admin/langs.php:176
 msgid "Language"
 msgstr ""
 
-#: admin/langs.php:175 admin/plugins.php:252 admin/plugins.php:303
+#: admin/langs.php:177 admin/plugins.php:233 admin/plugins.php:278
 msgid "Action"
 msgstr ""
 
-#: admin/langs.php:205
+#: admin/langs.php:207
 msgid "Install or upgrade languages"
 msgstr ""
 
-#: admin/langs.php:208
+#: admin/langs.php:210
 #, php-format
 msgid "You can install or remove a language by adding or removing the relevant directory in your %s folder."
 msgstr ""
 
-#: admin/langs.php:224
+#: admin/langs.php:226
 msgid "Available languages"
 msgstr ""
 
-#: admin/langs.php:225
+#: admin/langs.php:227
 #, php-format
 msgid "You can download and install a additional language directly from Dotclear.net. Proposed languages are based on your version: %s."
 msgstr ""
 
-#: admin/langs.php:227
+#: admin/langs.php:229
 msgid "Language:"
 msgstr ""
 
-#: admin/langs.php:231
+#: admin/langs.php:233
 msgid "Install language"
 msgstr ""
 
-#: admin/langs.php:244
+#: admin/langs.php:246
 msgid "You can install languages by uploading zip files."
 msgstr ""
 
-#: admin/langs.php:245
+#: admin/langs.php:247
 msgid "Language zip file:"
 msgstr ""
 
-#: admin/langs.php:249
+#: admin/langs.php:251
 msgid "Upload language"
 msgstr ""
 
-#: admin/langs.php:265
+#: admin/langs.php:267
 msgid "Invalid language zip file."
 msgstr ""
 
-#: admin/langs.php:269
+#: admin/langs.php:271
 msgid "The zip file does not appear to be a valid Dotclear language pack."
 msgstr ""
 
-#: admin/langs.php:279
+#: admin/langs.php:281
 msgid "An error occurred during language upgrade."
 msgstr ""
 
-#: admin/media.php:48 inc/admin/lib.dc.page.php:423
-#: inc/admin/lib.dc.page.php:696
+#: admin/media.php:48 inc/admin/lib.dc.page.php:401
+#: inc/admin/lib.dc.page.php:674
 msgid "Error:"
 msgstr ""
@@ -1618,5 +1569,5 @@
 #: admin/media.php:222 admin/media.php:224 admin/media.php:246
 #: admin/media.php:282 admin/media.php:286 admin/media.php:288
-#: admin/media_item.php:172 admin/media_item.php:190 inc/admin/prepend.php:305
+#: admin/media_item.php:164 admin/media_item.php:182 inc/admin/prepend.php:299
 msgid "Media manager"
 msgstr ""
@@ -1631,6 +1582,6 @@
 msgstr ""
 
-#: admin/media.php:230 admin/media_item.php:328 admin/popup_link.php:52
-#: admin/post_media.php:68 inc/admin/lib.dc.page.php:699
+#: admin/media.php:230 admin/media_item.php:311 admin/popup_link.php:52
+#: admin/post_media.php:68 inc/admin/lib.dc.page.php:677
 msgid "Cancel"
 msgstr ""
@@ -1699,14 +1650,14 @@
 msgstr ""
 
-#: admin/media.php:352 admin/media_item.php:542
+#: admin/media.php:352 admin/media_item.php:510
 msgid "Choose a file:"
 msgstr ""
 
-#: admin/media.php:353 admin/media_item.php:543
+#: admin/media.php:353 admin/media_item.php:511
 #, php-format
 msgid "Maximum size %s"
 msgstr ""
 
-#: admin/media.php:358 admin/media_item.php:530
+#: admin/media.php:358 admin/media_item.php:498
 msgid "Private"
 msgstr ""
@@ -1716,5 +1667,5 @@
 msgstr ""
 
-#: admin/media.php:361 admin/media_item.php:546
+#: admin/media.php:361 admin/media_item.php:514
 msgid "Send"
 msgstr ""
@@ -1744,106 +1695,533 @@
 msgstr ""
 
-#: admin/media_item.php:54
+#: admin/media_item.php:52
 msgid "Not a valid file"
 msgstr ""
 
-#: admin/media_item.php:164
-msgid "Are you sure to delete this media?"
-msgstr ""
-
-#: admin/media_item.php:184
+#: admin/media_item.php:176
 msgid "File has been successfully updated."
 msgstr ""
 
-#: admin/media_item.php:187
+#: admin/media_item.php:179
 msgid "Thumbnails have been successfully updated."
 msgstr ""
 
-#: admin/media_item.php:200
+#: admin/media_item.php:192
 msgid "Insert media item"
 msgstr ""
 
-#: admin/media_item.php:254
+#: admin/media_item.php:204
+msgid "Image size:"
+msgstr ""
+
+#: admin/media_item.php:216 admin/media_item.php:344
+msgid "original"
+msgstr ""
+
+#: admin/media_item.php:220
+msgid "Image alignment"
+msgstr ""
+
+#: admin/media_item.php:222 admin/media_item.php:252 admin/media_item.php:287
+#: admin/posts.php:63 inc/admin/lib.pager.php:89
+msgid "None"
+msgstr ""
+
+#: admin/media_item.php:223 admin/media_item.php:253 admin/media_item.php:288
+msgid "Left"
+msgstr ""
+
+#: admin/media_item.php:224 admin/media_item.php:254 admin/media_item.php:289
+msgid "Right"
+msgstr ""
+
+#: admin/media_item.php:225 admin/media_item.php:255 admin/media_item.php:290
+msgid "Center"
+msgstr ""
+
+#: admin/media_item.php:236
 msgid "Image insertion"
 msgstr ""
 
-#: admin/media_item.php:257
+#: admin/media_item.php:239
 msgid "As a single image"
 msgstr ""
 
-#: admin/media_item.php:266
+#: admin/media_item.php:241
+msgid "As a link to original image"
+msgstr ""
+
+#: admin/media_item.php:248
 msgid "MP3 disposition"
 msgstr ""
 
-#: admin/media_item.php:267
+#: admin/media_item.php:249
 msgid "Please note that you cannot insert mp3 files with visual editor."
 msgstr ""
 
-#: admin/media_item.php:291
+#: admin/media_item.php:274
 msgid "Please note that you cannot insert video files with visual editor."
 msgstr ""
 
-#: admin/media_item.php:294
+#: admin/media_item.php:277
 msgid "Video size"
 msgstr ""
 
-#: admin/media_item.php:295
+#: admin/media_item.php:278
 msgid "Width:"
 msgstr ""
 
-#: admin/media_item.php:297
+#: admin/media_item.php:280
 msgid "Height:"
 msgstr ""
 
-#: admin/media_item.php:301
+#: admin/media_item.php:284
 msgid "Video disposition"
 msgstr ""
 
-#: admin/media_item.php:324
+#: admin/media_item.php:307
 msgid "Media item will be inserted as a link."
 msgstr ""
 
-#: admin/media_item.php:329 admin/popup_link.php:53
+#: admin/media_item.php:312 admin/popup_link.php:53
 msgid "Insert"
 msgstr ""
 
-#: admin/media_item.php:340 admin/media_item.php:385
+#: admin/media_item.php:323 admin/media_item.php:368
 msgid "Media details"
 msgstr ""
 
-#: admin/media_item.php:354
+#: admin/media_item.php:337
 msgid "Available sizes:"
 msgstr ""
 
-#: admin/media_item.php:387
+#: admin/media_item.php:370
 msgid "File owner:"
 msgstr ""
 
-#: admin/media_item.php:388
+#: admin/media_item.php:371
 msgid "File type:"
 msgstr ""
 
-#: admin/media_item.php:389
+#: admin/media_item.php:372
 msgid "File size:"
 msgstr ""
 
-#: admin/media_item.php:390
+#: admin/media_item.php:373
 msgid "File URL:"
 msgstr ""
 
-#: admin/media_item.php:397
+#: admin/media_item.php:380
 msgid "Show entries containing this media"
 msgstr ""
 
-#: admin/media_item.php:401
+#: admin/media_item.php:384
 msgid "Entries containing this media"
 msgstr ""
 
+#: admin/media_item.php:414
+msgid "No entry seems contain this media."
+msgstr ""
+
 #: admin/media_item.php:431
-msgid "No entry seems contain this media."
-msgstr ""
-
-#: admin/media_item.php:440 admin/post.php:339 admin/post.php:651
-#: inc/admin/lib.pager.php:95 inc/admin/lib.pager.php:194
+msgid "Image details"
+msgstr ""
+
+#: admin/media_item.php:435
+msgid "No detail"
+msgstr ""
+
+#: admin/media_item.php:456 admin/media_item.php:458
+msgid "Update thumbnails"
+msgstr ""
+
+#: admin/media_item.php:457
+msgid "This will create or update thumbnails for this image."
+msgstr ""
+
+#: admin/media_item.php:467 admin/media_item.php:475
+msgid "Extract in a new directory"
+msgstr ""
+
+#: admin/media_item.php:468 admin/media_item.php:477
+msgid "Extract in current directory"
+msgstr ""
+
+#: admin/media_item.php:473
+msgid "Extract archive"
+msgstr ""
+
+#: admin/media_item.php:476
+msgid "This will extract archive in a new directory that should not exist yet."
+msgstr ""
+
+#: admin/media_item.php:478
+msgid "This will extract archive in current directory and will overwrite existing files or directory."
+msgstr ""
+
+#: admin/media_item.php:480
+msgid "Extract mode:"
+msgstr ""
+
+#: admin/media_item.php:482
+msgid "Extract"
+msgstr ""
+
+#: admin/media_item.php:490
+msgid "Change media properties"
+msgstr ""
+
+#: admin/media_item.php:491
+msgid "File name:"
+msgstr ""
+
+#: admin/media_item.php:493
+msgid "File title:"
+msgstr ""
+
+#: admin/media_item.php:495
+msgid "File date:"
+msgstr ""
+
+#: admin/media_item.php:499
+msgid "New directory:"
+msgstr ""
+
+#: admin/media_item.php:508
+msgid "Change file"
+msgstr ""
+
+#: admin/permissions.php:90 admin/permissions_blog.php:46
+msgid "No blog or user given."
+msgstr ""
+
+#: admin/permissions.php:96
+msgid "permissions"
+msgstr ""
+
+#: admin/permissions.php:100 admin/user.php:292
+msgid "Permissions"
+msgstr ""
+
+#: admin/permissions.php:103
+msgid "The permissions have been successfully updated."
+msgstr ""
+
+#: admin/permissions.php:118
+#, php-format
+msgid "You are about to change permissions on the following blogs for users %s."
+msgstr ""
+
+#: admin/permissions.php:145
+msgid "Validate permissions"
+msgstr ""
+
+#: admin/permissions_blog.php:90
+msgid "choose a blog"
+msgstr ""
+
+#: admin/permissions_blog.php:92
+msgid "Choose a blog"
+msgstr ""
+
+#: admin/permissions_blog.php:123 admin/posts.php:269
+msgid "Entries per page"
+msgstr ""
+
+#: admin/permissions_blog.php:134
+#, php-format
+msgid "Choose one or more blogs to which you want to give permissions to users %s."
+msgstr ""
+
+#: admin/permissions_blog.php:167 admin/users.php:57
+msgid "Set permissions"
+msgstr ""
+
+#: admin/permissions_blog.php:189
+msgid "select"
+msgstr ""
+
+#: admin/plugin.php:42
+msgid "No content found on this plugin."
+msgstr ""
+
+#: admin/plugin.php:83 admin/plugin.php:85
+msgid "Plugin not found"
+msgstr ""
+
+#: admin/plugin.php:87
+msgid "The plugin you reached does not exist or does not have an admin page."
+msgstr ""
+
+#: admin/plugins.php:41 admin/plugins.php:77 admin/plugins.php:102
+msgid "No such plugin."
+msgstr ""
+
+#: admin/plugins.php:48
+msgid "You don't have permissions to delete this plugin."
+msgstr ""
+
+#: admin/plugins.php:84
+msgid "You don't have permissions to deactivate this plugin."
+msgstr ""
+
+#: admin/plugins.php:169 admin/plugins.php:175
+msgid "Plugins management"
+msgstr ""
+
+#: admin/plugins.php:179
+msgid "Plugin has been successfully deleted."
+msgstr ""
+
+#: admin/plugins.php:183
+msgid "Plugin has been successfully installed."
+msgstr ""
+
+#: admin/plugins.php:183
+msgid "Plugin has been successfully upgraded"
+msgstr ""
+
+#: admin/plugins.php:206
+msgid "Plugins add new functionalities to Dotclear. Here you can activate or deactivate installed plugins."
+msgstr ""
+
+#: admin/plugins.php:209
+#, php-format
+msgid "You can find additional plugins for your blog on %s."
+msgstr ""
+
+#: admin/plugins.php:213
+msgid "To install or upgrade a plugin you generally just need to upload it in \"Install or upgrade a plugin\" section."
+msgstr ""
+
+#: admin/plugins.php:216
+msgid "To install or upgrade a plugin you just need to extract it in your plugins directory."
+msgstr ""
+
+#: admin/plugins.php:221 inc/admin/prepend.php:283 inc/admin/prepend.php:324
+msgid "Plugins"
+msgstr ""
+
+#: admin/plugins.php:228
+msgid "Activated plugins"
+msgstr ""
+
+#: admin/plugins.php:230 admin/plugins.php:277
+msgid "Plugin"
+msgstr ""
+
+#: admin/plugins.php:231
+msgid "Version"
+msgstr ""
+
+#: admin/plugins.php:232
+msgid "Details"
+msgstr ""
+
+#: admin/plugins.php:256
+msgid "Deactivate"
+msgstr ""
+
+#: admin/plugins.php:275
+msgid "Deactivated plugins"
+msgstr ""
+
+#: admin/plugins.php:299
+msgid "Activate"
+msgstr ""
+
+#: admin/plugins.php:317
+msgid "Install or upgrade a plugin"
+msgstr ""
+
+#: admin/plugins.php:321
+msgid "You can install plugins by uploading or downloading zip files."
+msgstr ""
+
+#: admin/plugins.php:328
+msgid "Plugin zip file:"
+msgstr ""
+
+#: admin/plugins.php:332
+msgid "Upload plugin"
+msgstr ""
+
+#: admin/plugins.php:342
+msgid "Plugin zip file URL:"
+msgstr ""
+
+#: admin/plugins.php:346
+msgid "Download plugin"
+msgstr ""
+
+#: admin/plugins.php:355
+msgid "To enable this function, please give write access to your plugins directory."
+msgstr ""
+
+#: admin/popup_link.php:21 admin/popup_link.php:23
+msgid "Add a link"
+msgstr ""
+
+#: admin/popup_link.php:28 admin/popup_link.php:32 admin/post.php:77
+#: admin/post.php:81
+msgid "Available"
+msgstr ""
+
+#: admin/popup_link.php:28 admin/popup_link.php:31 admin/popup_link.php:34
+#: admin/post.php:77 admin/post.php:80 admin/post.php:83
+msgid "Most used"
+msgstr ""
+
+#: admin/popup_link.php:42
+msgid "Link URL:"
+msgstr ""
+
+#: admin/popup_link.php:44
+msgid "Link title:"
+msgstr ""
+
+#: admin/popup_link.php:46
+msgid "Link language:"
+msgstr ""
+
+#: admin/popup_posts.php:31 admin/popup_posts.php:35
+msgid "Add a link to an entry"
+msgstr ""
+
+#: admin/popup_posts.php:38
+msgid "Search entry:"
+msgstr ""
+
+#: admin/popup_posts.php:39 admin/search.php:72 admin/search.php:75
+#: admin/search.php:81 inc/admin/prepend.php:305
+msgid "Search"
+msgstr ""
+
+#: admin/popup_posts.php:54
+msgid "cancel"
+msgstr ""
+
+#: admin/post.php:99 admin/trackbacks.php:44
+msgid "This entry does not exist."
+msgstr ""
+
+#: admin/post.php:122 admin/post.php:356 inc/admin/lib.dc.page.php:405
+msgid "Edit entry"
+msgstr ""
+
+#: admin/post.php:132
+msgid "next entry"
+msgstr ""
+
+#: admin/post.php:139
+msgid "previous entry"
+msgstr ""
+
+#: admin/post.php:295
+msgid "Entry has been successfully updated."
+msgstr ""
+
+#: admin/post.php:298 inc/admin/lib.dc.page.php:403
+msgid "Entry has been successfully created."
+msgstr ""
+
+#: admin/post.php:301
+msgid "File has been successfully attached."
+msgstr ""
+
+#: admin/post.php:304
+msgid "Attachment has been successfully removed."
+msgstr ""
+
+#: admin/post.php:308
+msgid "Comment has been successfully created."
+msgstr ""
+
+#: admin/post.php:319
+msgid "Don't forget to validate your XHTML conversion by saving your post."
+msgstr ""
+
+#: admin/post.php:330
+msgid "Go to this entry on the site"
+msgstr ""
+
+#: admin/post.php:330 inc/admin/lib.dc.page.php:134
+msgid "new window"
+msgstr ""
+
+#: admin/post.php:366
+msgid "Excerpt:"
+msgstr ""
+
+#: admin/post.php:375
+msgid "Notes:"
+msgstr ""
+
+#: admin/post.php:393
+msgid "Preview"
+msgstr ""
+
+#: admin/post.php:410
+msgid "Entry status:"
+msgstr ""
+
+#: admin/post.php:414
+msgid "Published on:"
+msgstr ""
+
+#: admin/post.php:418
+msgid "Text formating:"
+msgstr ""
+
+#: admin/post.php:422
+msgid "Convert to XHTML"
+msgstr ""
+
+#: admin/post.php:429
+msgid "Selected entry"
+msgstr ""
+
+#: admin/post.php:431
+msgid "Entry lang:"
+msgstr ""
+
+#: admin/post.php:435
+msgid "Entry password:"
+msgstr ""
+
+#: admin/post.php:440
+msgid "Basename:"
+msgstr ""
+
+#: admin/post.php:444
+msgid "Warning: If you set the URL manually, it may conflict with another entry."
+msgstr ""
+
+#: admin/post.php:462 admin/trackbacks.php:81 admin/trackbacks.php:119
+#: admin/trackbacks.php:130
+msgid "Ping blogs"
+msgstr ""
+
+#: admin/post.php:504 inc/admin/lib.pager.php:52
+msgid "Trackbacks"
+msgstr ""
+
+#: admin/post.php:509
+msgid "No trackback"
+msgstr ""
+
+#: admin/post.php:541 admin/post.php:542
+msgid "Add a comment"
+msgstr ""
+
+#: admin/post.php:546
+msgid "Name:"
+msgstr ""
+
+#: admin/post.php:579
+msgid "IP address"
+msgstr ""
+
+#: admin/post.php:591 inc/admin/lib.pager.php:95 inc/admin/lib.pager.php:194
 #: inc/admin/lib.pager.php:308 inc/core/class.dc.blog.php:96
 #: inc/core/class.dc.blog.php:101
@@ -1851,6 +2229,5 @@
 msgstr ""
 
-#: admin/media_item.php:443 admin/post.php:342 admin/post.php:654
-#: inc/admin/lib.pager.php:98 inc/admin/lib.pager.php:197
+#: admin/post.php:594 inc/admin/lib.pager.php:98 inc/admin/lib.pager.php:197
 #: inc/admin/lib.pager.php:311 inc/core/class.dc.blog.php:95
 #: inc/core/class.dc.blog.php:100
@@ -1858,11 +2235,5 @@
 msgstr ""
 
-#: admin/media_item.php:446 admin/post.php:345 inc/admin/lib.pager.php:101
-#: inc/admin/lib.pager.php:200 inc/core/class.dc.blog.php:94
-msgid "scheduled"
-msgstr ""
-
-#: admin/media_item.php:449 admin/post.php:348 admin/post.php:657
-#: inc/admin/lib.pager.php:104 inc/admin/lib.pager.php:203
+#: admin/post.php:597 inc/admin/lib.pager.php:104 inc/admin/lib.pager.php:203
 #: inc/admin/lib.pager.php:314 inc/core/class.dc.blog.php:93
 #: inc/core/class.dc.blog.php:99
@@ -1870,401 +2241,18 @@
 msgstr ""
 
-#: admin/media_item.php:463
-msgid "Image details"
-msgstr ""
-
-#: admin/media_item.php:467
-msgid "No detail"
-msgstr ""
-
-#: admin/media_item.php:488 admin/media_item.php:490
-msgid "Update thumbnails"
-msgstr ""
-
-#: admin/media_item.php:489
-msgid "This will create or update thumbnails for this image."
-msgstr ""
-
-#: admin/media_item.php:499 admin/media_item.php:507
-msgid "Extract in a new directory"
-msgstr ""
-
-#: admin/media_item.php:500 admin/media_item.php:509
-msgid "Extract in current directory"
-msgstr ""
-
-#: admin/media_item.php:505
-msgid "Extract archive"
-msgstr ""
-
-#: admin/media_item.php:508
-msgid "This will extract archive in a new directory that should not exist yet."
-msgstr ""
-
-#: admin/media_item.php:510
-msgid "This will extract archive in current directory and will overwrite existing files or directory."
-msgstr ""
-
-#: admin/media_item.php:512
-msgid "Extract mode:"
-msgstr ""
-
-#: admin/media_item.php:514
-msgid "Extract"
-msgstr ""
-
-#: admin/media_item.php:522
-msgid "Change media properties"
-msgstr ""
-
-#: admin/media_item.php:523
-msgid "File name:"
-msgstr ""
-
-#: admin/media_item.php:525
-msgid "File title:"
-msgstr ""
-
-#: admin/media_item.php:527
-msgid "File date:"
-msgstr ""
-
-#: admin/media_item.php:531
-msgid "New directory:"
-msgstr ""
-
-#: admin/media_item.php:540
-msgid "Change file"
-msgstr ""
-
-#: admin/media_item.php:556
-msgid "Delete this media"
-msgstr ""
-
-#: admin/plugin.php:42
-msgid "No content found on this plugin."
-msgstr ""
-
-#: admin/plugin.php:83 admin/plugin.php:85
-msgid "Plugin not found"
-msgstr ""
-
-#: admin/plugin.php:87
-msgid "The plugin you reached does not exist or does not have an admin page."
-msgstr ""
-
-#: admin/plugins.php:41 admin/plugins.php:77 admin/plugins.php:109
-msgid "No such plugin."
-msgstr ""
-
-#: admin/plugins.php:48
-msgid "You don't have permissions to delete this plugin."
-msgstr ""
-
-#: admin/plugins.php:84
-msgid "You don't have permissions to deactivate this plugin."
-msgstr ""
-
-#: admin/plugins.php:191 admin/plugins.php:197
-msgid "Plugins management"
-msgstr ""
-
-#: admin/plugins.php:200
-msgid "Plugin has been successfully deleted."
-msgstr ""
-
-#: admin/plugins.php:203
-msgid "Plugin has been successfully installed."
-msgstr ""
-
-#: admin/plugins.php:203
-msgid "Plugin has been successfully upgraded"
-msgstr ""
-
-#: admin/plugins.php:225
-msgid "Plugins add new functionalities to Dotclear. Here you can activate or deactivate installed plugins."
-msgstr ""
-
-#: admin/plugins.php:228
-#, php-format
-msgid "You can find additional plugins for your blog on %s."
-msgstr ""
-
-#: admin/plugins.php:232
-msgid "To install or upgrade a plugin you generally just need to upload it in \"Install or upgrade a plugin\" section."
-msgstr ""
-
-#: admin/plugins.php:235
-msgid "To install or upgrade a plugin you just need to extract it in your plugins directory."
-msgstr ""
-
-#: admin/plugins.php:240 inc/admin/prepend.php:288 inc/admin/prepend.php:330
-msgid "Plugins"
-msgstr ""
-
-#: admin/plugins.php:247
-msgid "Activated plugins"
-msgstr ""
-
-#: admin/plugins.php:249 admin/plugins.php:302
-msgid "Plugin"
-msgstr ""
-
-#: admin/plugins.php:250
-msgid "Version"
-msgstr ""
-
-#: admin/plugins.php:251
-msgid "Details"
-msgstr ""
-
-#: admin/plugins.php:258
-msgid "Plugin from official distribution"
-msgstr ""
-
-#: admin/plugins.php:281
-msgid "Deactivate"
-msgstr ""
-
-#: admin/plugins.php:300
-msgid "Deactivated plugins"
-msgstr ""
-
-#: admin/plugins.php:324
-msgid "Activate"
-msgstr ""
-
-#: admin/plugins.php:342
-msgid "Install or upgrade a plugin"
-msgstr ""
-
-#: admin/plugins.php:346
-msgid "You can install plugins by uploading or downloading zip files."
-msgstr ""
-
-#: admin/plugins.php:353
-msgid "Plugin zip file:"
-msgstr ""
-
-#: admin/plugins.php:357
-msgid "Upload plugin"
-msgstr ""
-
-#: admin/plugins.php:367
-msgid "Plugin zip file URL:"
-msgstr ""
-
-#: admin/plugins.php:371
-msgid "Download plugin"
-msgstr ""
-
-#: admin/plugins.php:380
-msgid "To enable this function, please give write access to your plugins directory."
-msgstr ""
-
-#: admin/popup_link.php:21 admin/popup_link.php:23
-msgid "Add a link"
-msgstr ""
-
-#: admin/popup_link.php:28 admin/popup_link.php:32 admin/post.php:78
-#: admin/post.php:82
-msgid "Available"
-msgstr ""
-
-#: admin/popup_link.php:28 admin/popup_link.php:31 admin/popup_link.php:34
-#: admin/post.php:78 admin/post.php:81 admin/post.php:84
-msgid "Most used"
-msgstr ""
-
-#: admin/popup_link.php:42
-msgid "Link URL:"
-msgstr ""
-
-#: admin/popup_link.php:44
-msgid "Link title:"
-msgstr ""
-
-#: admin/popup_link.php:46
-msgid "Link language:"
-msgstr ""
-
-#: admin/popup_posts.php:31 admin/popup_posts.php:35
-msgid "Add a link to an entry"
-msgstr ""
-
-#: admin/popup_posts.php:38
-msgid "Search entry:"
-msgstr ""
-
-#: admin/popup_posts.php:39 admin/search.php:72 admin/search.php:75
-#: admin/search.php:81 inc/admin/prepend.php:311
-msgid "Search"
-msgstr ""
-
-#: admin/popup_posts.php:54
-msgid "cancel"
-msgstr ""
-
-#: admin/post.php:102 admin/trackbacks.php:44
-msgid "This entry does not exist."
-msgstr ""
-
-#: admin/post.php:125 admin/post.php:384 inc/admin/lib.dc.page.php:427
-msgid "Edit entry"
-msgstr ""
-
-#: admin/post.php:135
-msgid "next entry"
-msgstr ""
-
-#: admin/post.php:142
-msgid "previous entry"
-msgstr ""
-
-#: admin/post.php:176
-msgid "Invalid publication date"
-msgstr ""
-
-#: admin/post.php:295 admin/post.php:335 admin/posts.php:245
-#: admin/posts.php:250 admin/posts_actions.php:165 admin/users_actions.php:197
-#: inc/admin/lib.pager.php:369 inc/admin/prepend.php:317
-msgid "Entries"
-msgstr ""
-
-#: admin/post.php:309
-msgid "Entry has been successfully updated."
-msgstr ""
-
-#: admin/post.php:312 inc/admin/lib.dc.page.php:425
-msgid "Entry has been successfully created."
-msgstr ""
-
-#: admin/post.php:315
-msgid "File has been successfully attached."
-msgstr ""
-
-#: admin/post.php:318
-msgid "Attachment has been successfully removed."
-msgstr ""
-
-#: admin/post.php:322
-msgid "Comment has been successfully created."
-msgstr ""
-
-#: admin/post.php:332
-msgid "Don't forget to validate your XHTML conversion by saving your post."
-msgstr ""
-
-#: admin/post.php:358
-msgid "Go to this entry on the site"
-msgstr ""
-
-#: admin/post.php:358 inc/admin/lib.dc.page.php:134
-msgid "new window"
-msgstr ""
-
-#: admin/post.php:394
-msgid "Excerpt:"
-msgstr ""
-
-#: admin/post.php:403
-msgid "Notes:"
-msgstr ""
-
-#: admin/post.php:420
-msgid "Preview"
-msgstr ""
-
-#: admin/post.php:437
-msgid "Entry status:"
-msgstr ""
-
-#: admin/post.php:441
-msgid "Published on:"
-msgstr ""
-
-#: admin/post.php:445
-msgid "Text formating:"
-msgstr ""
-
-#: admin/post.php:449
-msgid "Convert to XHTML"
-msgstr ""
-
-#: admin/post.php:456
-msgid "Warning: Comments are not more accepted for this entry."
-msgstr ""
-
-#: admin/post.php:457
-msgid "Warning: Comments are not accepted on this blog."
-msgstr ""
-
-#: admin/post.php:464
-msgid "Warning: Trackbacks are not more accepted for this entry."
-msgstr ""
-
-#: admin/post.php:465
-msgid "Warning: Trackbacks are not accepted on this blog."
-msgstr ""
-
-#: admin/post.php:468
-msgid "Selected entry"
-msgstr ""
-
-#: admin/post.php:470
-msgid "Entry lang:"
-msgstr ""
-
-#: admin/post.php:474
-msgid "Entry password:"
-msgstr ""
-
-#: admin/post.php:479
-msgid "Basename:"
-msgstr ""
-
-#: admin/post.php:483
-msgid "Warning: If you set the URL manually, it may conflict with another entry."
-msgstr ""
-
-#: admin/post.php:501 admin/trackbacks.php:81 admin/trackbacks.php:119
-#: admin/trackbacks.php:130
-msgid "Ping blogs"
-msgstr ""
-
-#: admin/post.php:543 inc/admin/lib.pager.php:52
-msgid "Trackbacks"
-msgstr ""
-
-#: admin/post.php:548
-msgid "No trackback"
-msgstr ""
-
-#: admin/post.php:580 admin/post.php:581
-msgid "Add a comment"
-msgstr ""
-
-#: admin/post.php:585
-msgid "Name:"
-msgstr ""
-
-#: admin/post.php:639
-msgid "IP address"
-msgstr ""
-
-#: admin/post.php:660 inc/admin/lib.pager.php:317
+#: admin/post.php:600 inc/admin/lib.pager.php:317
 #: inc/core/class.dc.blog.php:98
 msgid "junk"
 msgstr ""
 
-#: admin/post.php:669
+#: admin/post.php:609
 msgid "select this comment"
 msgstr ""
 
-#: admin/post.php:669
+#: admin/post.php:609
 msgid "select this trackback"
 msgstr ""
 
-#: admin/post.php:675 inc/admin/lib.pager.php:340
+#: admin/post.php:615 inc/admin/lib.pager.php:340
 msgid "Edit this comment"
 msgstr ""
@@ -2342,21 +2330,17 @@
 msgstr ""
 
-#: admin/posts.php:272
+#: admin/posts.php:255
 msgid "Selected:"
 msgstr ""
 
-#: admin/posts.php:274
+#: admin/posts.php:257
 msgid "Month:"
 msgstr ""
 
-#: admin/posts.php:276
+#: admin/posts.php:259
 msgid "Lang:"
 msgstr ""
 
-#: admin/posts.php:286
-msgid "Entries per page"
-msgstr ""
-
-#: admin/posts.php:303 admin/search.php:127
+#: admin/posts.php:286 admin/search.php:127
 msgid "Selected entries action:"
 msgstr ""
@@ -2378,175 +2362,171 @@
 msgstr ""
 
-#: admin/preferences.php:66
+#: admin/preferences.php:65
 msgid "Default"
 msgstr ""
 
-#: admin/preferences.php:93 admin/preferences.php:111
+#: admin/preferences.php:92 admin/preferences.php:110
 msgid "If you want to change your email or password you must provide your current password."
 msgstr ""
 
-#: admin/preferences.php:199 admin/preferences.php:242
+#: admin/preferences.php:197 admin/preferences.php:240
 msgid "No favorite selected"
 msgstr ""
 
-#: admin/preferences.php:354
+#: admin/preferences.php:352
 msgid "Personal information has been successfully updated."
 msgstr ""
 
-#: admin/preferences.php:357
+#: admin/preferences.php:355
 msgid "Personal options has been successfully updated."
 msgstr ""
 
-#: admin/preferences.php:360
+#: admin/preferences.php:358
 msgid "Favorites have been successfully added."
 msgstr ""
 
-#: admin/preferences.php:363
+#: admin/preferences.php:361
 msgid "Favorites have been successfully updated."
 msgstr ""
 
-#: admin/preferences.php:366
+#: admin/preferences.php:364
 msgid "Favorites have been successfully removed."
 msgstr ""
 
-#: admin/preferences.php:369
+#: admin/preferences.php:367
 msgid "Default favorites have been successfully updated."
 msgstr ""
 
-#: admin/preferences.php:375 admin/preferences.php:379
+#: admin/preferences.php:373 admin/preferences.php:377
 msgid "My profile"
 msgstr ""
 
-#: admin/preferences.php:388 admin/user.php:225
+#: admin/preferences.php:386 admin/user.php:225
 msgid "Display name:"
 msgstr ""
 
-#: admin/preferences.php:401 admin/user.php:251
+#: admin/preferences.php:399 admin/user.php:251
 msgid "User language:"
 msgstr ""
 
-#: admin/preferences.php:404 admin/user.php:255
+#: admin/preferences.php:402 admin/user.php:255
 msgid "User timezone:"
 msgstr ""
 
-#: admin/preferences.php:425
+#: admin/preferences.php:423
 msgid "If you have changed this user email or password you must provide your current password to save these modifications."
 msgstr ""
 
-#: admin/preferences.php:439 admin/preferences.php:443
+#: admin/preferences.php:437 admin/preferences.php:441
 msgid "My options"
 msgstr ""
 
-#: admin/preferences.php:445 admin/user.php:239
+#: admin/preferences.php:443 admin/user.php:239
 msgid "Preferred format:"
 msgstr ""
 
-#: admin/preferences.php:448 admin/user.php:243
+#: admin/preferences.php:446 admin/user.php:243
 msgid "Default entry status:"
 msgstr ""
 
-#: admin/preferences.php:451 admin/user.php:247
+#: admin/preferences.php:449 admin/user.php:247
 msgid "Entry edit field height:"
 msgstr ""
 
-#: admin/preferences.php:456
+#: admin/preferences.php:454
 msgid "Enable WYSIWYG mode"
 msgstr ""
 
-#: admin/preferences.php:460
+#: admin/preferences.php:458
 msgid "Activate enhanced uploader in media manager"
 msgstr ""
 
-#: admin/preferences.php:464
-msgid "Hide My favorites menu"
-msgstr ""
-
-#: admin/preferences.php:468
+#: admin/preferences.php:462
 msgid "Iconset:"
 msgstr ""
 
-#: admin/preferences.php:478
+#: admin/preferences.php:472
 msgid "Do not use standard favicon"
 msgstr ""
 
-#: admin/preferences.php:479
+#: admin/preferences.php:473
 msgid "This will be applied for all users"
 msgstr ""
 
+#: admin/preferences.php:481
+msgid "Accessibility options"
+msgstr ""
+
+#: admin/preferences.php:485
+msgid "Disable javascript powered drag and drop for ordering items"
+msgstr ""
+
 #: admin/preferences.php:487
-msgid "Accessibility options"
+msgid "Numeric fields will allow to type the elements' ordering number."
 msgstr ""
 
 #: admin/preferences.php:491
-msgid "Disable javascript powered drag and drop for ordering items"
-msgstr ""
-
-#: admin/preferences.php:493
-msgid "Numeric fields will allow to type the elements' ordering number."
-msgstr ""
-
-#: admin/preferences.php:497
 msgid "Dashboard modules"
 msgstr ""
 
-#: admin/preferences.php:501
+#: admin/preferences.php:495
 msgid "Display documentation links"
 msgstr ""
 
-#: admin/preferences.php:505
+#: admin/preferences.php:499
 msgid "Display Dotclear news"
 msgstr ""
 
-#: admin/preferences.php:509
+#: admin/preferences.php:503
 msgid "Display quick entry form"
 msgstr ""
 
-#: admin/preferences.php:526 admin/preferences.php:531
-#: inc/admin/prepend.php:290
+#: admin/preferences.php:520 admin/preferences.php:525
+#: inc/admin/prepend.php:284
 msgid "My favorites"
 msgstr ""
 
-#: admin/preferences.php:543
+#: admin/preferences.php:537
 #, php-format
 msgid "position of %s"
 msgstr ""
 
-#: admin/preferences.php:556
+#: admin/preferences.php:550
 msgid "Save order"
 msgstr ""
 
+#: admin/preferences.php:553
+msgid "Delete selected favorites"
+msgstr ""
+
+#: admin/preferences.php:555
+msgid "Are you sure you want to remove selected favorites?"
+msgstr ""
+
 #: admin/preferences.php:559
-msgid "Delete selected favorites"
-msgstr ""
-
-#: admin/preferences.php:561
-msgid "Are you sure you want to remove selected favorites?"
-msgstr ""
-
-#: admin/preferences.php:565
 msgid "If you are a super administrator, you may define this set of favorites to be used by default on all blogs of this installation:"
 msgstr ""
 
+#: admin/preferences.php:560
+msgid "Define as default favorites"
+msgstr ""
+
 #: admin/preferences.php:566
-msgid "Define as default favorites"
+msgid "Currently no personal favorites."
+msgstr ""
+
+#: admin/preferences.php:571
+msgid "Default favorites"
 msgstr ""
 
 #: admin/preferences.php:572
-msgid "Currently no personal favorites."
-msgstr ""
-
-#: admin/preferences.php:577
-msgid "Default favorites"
-msgstr ""
-
-#: admin/preferences.php:578
 msgid "Those favorites are displayed when My Favorites list is empty."
 msgstr ""
 
-#: admin/preferences.php:597
+#: admin/preferences.php:591
 msgid "Available favorites"
 msgstr ""
 
-#: admin/preferences.php:622
+#: admin/preferences.php:616
 msgid "Add to my favorites"
 msgstr ""
@@ -2629,83 +2609,78 @@
 msgstr ""
 
-#: admin/update.php:22 admin/update.php:169 admin/update.php:174
+#: admin/update.php:22 admin/update.php:156 admin/update.php:159
+msgid "Dotclear update"
+msgstr ""
+
+#: admin/update.php:61
+#, php-format
+msgid "Unable to delete file %s"
+msgstr ""
+
+#: admin/update.php:97
+#, php-format
+msgid "Downloaded Dotclear archive seems to be corrupted. Try <a %s>download it</a> again."
+msgstr ""
+
+#: admin/update.php:125
+msgid "The following files of your Dotclear installation have been modified so we won't try to update your installation. Please try to <a href=\"http://dotclear.org/download\">update manually</a>."
+msgstr ""
+
+#: admin/update.php:132
+#, php-format
+msgid "The following files of your Dotclear installation are not readable. Please fix this or try to make a backup file named %s manually."
+msgstr ""
+
+#: admin/update.php:139
+msgid "The following files of your Dotclear installation cannot be written. Please fix this or try to <a href=\"http://dotclear.org/download\">update manually</a>."
+msgstr ""
+
+#: admin/update.php:166
+msgid "No newer Dotclear version available."
+msgstr ""
+
+#: admin/update.php:171
+#, php-format
+msgid "Dotclear %s is available."
+msgstr ""
+
+#: admin/update.php:175
+msgid "To upgrade your Dotclear installation simply click on the following button. A backup file of your current installation will be created in your root directory."
+msgstr ""
+
 #: admin/update.php:179
-msgid "Dotclear update"
-msgstr ""
-
-#: admin/update.php:71
-#, php-format
-msgid "Unable to delete file %s"
-msgstr ""
-
-#: admin/update.php:107
-#, php-format
-msgid "Downloaded Dotclear archive seems to be corrupted. Try <a %s>download it</a> again."
-msgstr ""
-
-#: admin/update.php:136
-msgid "The following files of your Dotclear installation have been modified so we won't try to update your installation. Please try to <a href=\"http://dotclear.org/download\">update manually</a>."
-msgstr ""
-
-#: admin/update.php:143
-#, php-format
-msgid "The following files of your Dotclear installation are not readable. Please fix this or try to make a backup file named %s manually."
-msgstr ""
-
-#: admin/update.php:150
-msgid "The following files of your Dotclear installation cannot be written. Please fix this or try to <a href=\"http://dotclear.org/download\">update manually</a>."
-msgstr ""
-
-#: admin/update.php:182
-msgid "No newer Dotclear version available."
+msgid "Update Dotclear"
+msgstr ""
+
+#: admin/update.php:186
+msgid "Update backup files"
 msgstr ""
 
 #: admin/update.php:187
-#, php-format
-msgid "Dotclear %s is available."
-msgstr ""
-
-#: admin/update.php:191
-msgid "To upgrade your Dotclear installation simply click on the following button. A backup file of your current installation will be created in your root directory."
-msgstr ""
-
-#: admin/update.php:195
-msgid "Update Dotclear"
-msgstr ""
-
-#: admin/update.php:202
-msgid "Manage backup files"
-msgstr ""
-
-#: admin/update.php:205
-msgid "Update backup files"
-msgstr ""
-
-#: admin/update.php:206
 msgid "The following files are backups of previously updates. You can revert your previous installation or delete theses files."
 msgstr ""
 
-#: admin/update.php:218
+#: admin/update.php:199
 msgid "Please note that reverting your Dotclear version may have some unwanted side-effects. Consider reverting only if you experience strong issues with this new version."
 msgstr ""
 
-#: admin/update.php:220
+#: admin/update.php:201
 #, php-format
 msgid "You should not revert to version prior to last one (%s)."
 msgstr ""
 
-#: admin/update.php:222
+#: admin/update.php:203
 msgid "Delete selected file"
 msgstr ""
 
-#: admin/update.php:223
+#: admin/update.php:204
 msgid "Revert to selected file"
 msgstr ""
 
-#: admin/update.php:234
+#: admin/update.php:213
 msgid "Congratulations, you're one click away from the end of the update."
 msgstr ""
 
-#: admin/update.php:235
+#: admin/update.php:214
 msgid "Finish the update."
 msgstr ""
@@ -2748,84 +2723,50 @@
 msgstr ""
 
-#: admin/user.php:292 admin/users_actions.php:180 admin/users_actions.php:241
-msgid "Permissions"
-msgstr ""
-
-#: admin/user.php:294
+#: admin/user.php:299
+msgid "No permissions."
+msgstr ""
+
+#: admin/user.php:325
 msgid "Add new permissions"
 msgstr ""
 
-#: admin/user.php:307
-msgid "No permissions."
-msgstr ""
-
-#: admin/users.php:19 inc/admin/lib.pager.php:365
+#: admin/users.php:43 inc/admin/lib.pager.php:365
 msgid "Username"
 msgstr ""
 
-#: admin/users.php:20 inc/admin/lib.pager.php:367
+#: admin/users.php:44 inc/admin/lib.pager.php:367
 msgid "Last Name"
 msgstr ""
 
-#: admin/users.php:21 inc/admin/lib.pager.php:366
+#: admin/users.php:45 inc/admin/lib.pager.php:366
 msgid "First Name"
 msgstr ""
 
-#: admin/users.php:22 inc/admin/lib.pager.php:368
+#: admin/users.php:46 inc/admin/lib.pager.php:368
 msgid "Display name"
 msgstr ""
 
-#: admin/users.php:23
+#: admin/users.php:47
 msgid "Number of entries"
 msgstr ""
 
-#: admin/users.php:33 admin/users_actions.php:221
-msgid "Set permissions"
-msgstr ""
-
-#: admin/users.php:101
+#: admin/users.php:111
+msgid "users"
+msgstr ""
+
+#: admin/users.php:116
 msgid "User has been successfully removed."
 msgstr ""
 
-#: admin/users.php:104
-msgid "The permissions have been successfully updated."
-msgstr ""
-
-#: admin/users.php:109
+#: admin/users.php:121
 msgid "Create a new user"
 msgstr ""
 
-#: admin/users.php:133
+#: admin/users.php:145
 msgid "Users per page"
 msgstr ""
 
-#: admin/users.php:151
+#: admin/users.php:163
 msgid "Selected users action:"
-msgstr ""
-
-#: admin/users_actions.php:60
-msgid "No blog or user given."
-msgstr ""
-
-#: admin/users_actions.php:74
-msgid "Not delete yourself."
-msgstr ""
-
-#: admin/users_actions.php:182
-#, php-format
-msgid "Choose one or more blogs to which you want to give permissions to users %s."
-msgstr ""
-
-#: admin/users_actions.php:210
-msgid "select"
-msgstr ""
-
-#: admin/users_actions.php:243
-#, php-format
-msgid "You are about to change permissions on the following blogs for users %s."
-msgstr ""
-
-#: admin/users_actions.php:270
-msgid "Validate permissions"
 msgstr ""
 
@@ -2842,12 +2783,4 @@
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:126
-msgid "Go to the content"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:126
-msgid "Go to the menu"
-msgstr ""
-
 #: inc/admin/lib.dc.page.php:134
 msgid "Go to site"
@@ -2871,332 +2804,328 @@
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:183
+#: inc/admin/lib.dc.page.php:184
 #, php-format
 msgid "Thank you for using %s."
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:270
-msgid "%H:%M:%S:"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:368
+#: inc/admin/lib.dc.page.php:347
 msgid "Help"
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:402
+#: inc/admin/lib.dc.page.php:380
 msgid "uncover"
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:404
+#: inc/admin/lib.dc.page.php:382
 msgid "hide"
 msgstr ""
 
+#: inc/admin/lib.dc.page.php:387
+msgid "help"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:389
+msgid "no selection"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:391
+msgid "select all"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:393
+msgid "invert selection"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:407
+msgid "view entry"
+msgstr ""
+
 #: inc/admin/lib.dc.page.php:409
-msgid "help"
+#, php-format
+msgid "Are you sure you want to delete selected entries (%s)?"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:411
-msgid "no selection"
+msgid "Are you sure you want to delete this entry?"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:413
-msgid "select all"
+#, php-format
+msgid "Are you sure you want to delete selected comments (%s)?"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:415
-msgid "invert selection"
+msgid "Are you sure you want to delete this comment?"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:417
+msgid "Users with posts cannot be deleted."
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:419
+#, php-format
+msgid "Are you sure you want to delete selected users (%s)?"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:421
+#, php-format
+msgid "Are you sure you want to delete category \"%s\"?"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:423
+msgid "Are you sure you want to reorder all categories?"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:425
+#, php-format
+msgid "Are you sure you want to remove media \"%s\"?"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:427
+msgid "Are you sure you want to extract archive in current directory?"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:429
-msgid "view entry"
+#, php-format
+msgid "Are you sure you want to remove attachment \"%s\"?"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:431
 #, php-format
-msgid "Are you sure you want to delete selected entries (%s)?"
+msgid "Are you sure you want to delete \"%s\" language?"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:433
-msgid "Are you sure you want to delete this entry?"
+#, php-format
+msgid "Are you sure you want to delete \"%s\" plugin?"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:435
-#, php-format
-msgid "Are you sure you want to delete selected comments (%s)?"
+msgid "Use this theme"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:437
-msgid "Are you sure you want to delete this comment?"
+msgid "Remove this theme"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:439
-msgid "Users with posts cannot be deleted."
+#, php-format
+msgid "Are you sure you want to delete \"%s\" theme?"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:441
-#, php-format
-msgid "Are you sure you want to delete selected users (%s)?"
+msgid "Zip file content"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:443
-#, php-format
-msgid "Are you sure you want to delete category \"%s\"?"
+msgid "XHTML markup validator"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:445
-msgid "Are you sure you want to reorder all categories?"
+msgid "XHTML content is valid."
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:447
-#, php-format
-msgid "Are you sure you want to remove media \"%s\"?"
+msgid "There are XHTML markup errors."
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:449
-msgid "Are you sure you want to extract archive in current directory?"
+msgid "You have unsaved changes. Switch post format will loose these changes. Proceed anyway?"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:451
-#, php-format
-msgid "Are you sure you want to remove attachment \"%s\"?"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:453
-#, php-format
-msgid "Are you sure you want to delete \"%s\" language?"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:455
-#, php-format
-msgid "Are you sure you want to delete \"%s\" plugin?"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:457
-msgid "Use this theme"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:459
-msgid "Remove this theme"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:461
-#, php-format
-msgid "Are you sure you want to delete \"%s\" theme?"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:463
-msgid "Zip file content"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:465
-msgid "XHTML markup validator"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:467
-msgid "XHTML content is valid."
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:469
-msgid "There are XHTML markup errors."
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:471
-msgid "You have unsaved changes. Switch post format will loose these changes. Proceed anyway?"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:473
 msgid "Loading enhanced uploader, please wait."
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:504
+#: inc/admin/lib.dc.page.php:482
 msgid "You have unsaved changes."
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:578
+#: inc/admin/lib.dc.page.php:556
 msgid "close"
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:579
+#: inc/admin/lib.dc.page.php:557
 msgid "now"
 msgstr ""
 
+#: inc/admin/lib.dc.page.php:601
+msgid "visual"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:602
+msgid "source"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:604
+msgid "You can use the following shortcuts to format your text."
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:605
+msgid "-- none --"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:606
+msgid "-- block format --"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:607
+msgid "Paragraph"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:608
+msgid "Level 1 header"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:609
+msgid "Level 2 header"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:610
+msgid "Level 3 header"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:611
+msgid "Level 4 header"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:612
+msgid "Level 5 header"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:613
+msgid "Level 6 header"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:614
+msgid "Strong emphasis"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:615
+msgid "Emphasis"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:616
+msgid "Inserted"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:617
+msgid "Deleted"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:618
+msgid "Inline quote"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:619
+msgid "Code"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:620
+msgid "Line break"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:621
+msgid "Blockquote"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:622
+msgid "Preformated text"
+msgstr ""
+
 #: inc/admin/lib.dc.page.php:623
-msgid "visual"
+msgid "Unordered list"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:624
-msgid "source"
+msgid "Ordered list"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:626
-msgid "You can use the following shortcuts to format your text."
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:627
-msgid "-- none --"
+msgid "Link"
+msgstr ""
+
+#: inc/admin/lib.dc.page.php:627 inc/admin/lib.dc.page.php:631
+msgid "URL?"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:628
-msgid "-- block format --"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:629
-msgid "Paragraph"
+msgid "Language?"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:630
-msgid "Level 1 header"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:631
-msgid "Level 2 header"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:632
-msgid "Level 3 header"
+msgid "External image"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:633
-msgid "Level 4 header"
+msgid "Media chooser"
 msgstr ""
 
 #: inc/admin/lib.dc.page.php:634
-msgid "Level 5 header"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:635
-msgid "Level 6 header"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:636
-msgid "Strong emphasis"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:637
-msgid "Emphasis"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:638
-msgid "Inserted"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:639
-msgid "Deleted"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:640
-msgid "Inline quote"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:641
-msgid "Code"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:642
-msgid "Line break"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:643
-msgid "Blockquote"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:644
-msgid "Preformated text"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:645
-msgid "Unordered list"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:646
-msgid "Ordered list"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:648
-msgid "Link"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:649 inc/admin/lib.dc.page.php:653
-msgid "URL?"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:650
-msgid "Language?"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:652
-msgid "External image"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:655
-msgid "Media chooser"
-msgstr ""
-
-#: inc/admin/lib.dc.page.php:656
 msgid "Link to an entry"
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:688
+#: inc/admin/lib.dc.page.php:666
 msgid "Activate enhanced uploader"
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:689
+#: inc/admin/lib.dc.page.php:667
 msgid "Disable enhanced uploader"
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:690
+#: inc/admin/lib.dc.page.php:668
 msgid "File successfully uploaded."
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:691
+#: inc/admin/lib.dc.page.php:669
 msgid "Maximum file size allowed:"
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:692
+#: inc/admin/lib.dc.page.php:670
 msgid "Limit exceeded."
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:693
+#: inc/admin/lib.dc.page.php:671
 msgid "File size exceeds allowed limit."
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:694
+#: inc/admin/lib.dc.page.php:672
 msgid "Canceled."
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:695
+#: inc/admin/lib.dc.page.php:673
 msgid "HTTP Error:"
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:697
+#: inc/admin/lib.dc.page.php:675
 msgid "Choose file"
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:698
+#: inc/admin/lib.dc.page.php:676
 msgid "Choose files"
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:700
+#: inc/admin/lib.dc.page.php:678
 msgid "Clean"
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:701
+#: inc/admin/lib.dc.page.php:679
 msgid "Upload"
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:702
+#: inc/admin/lib.dc.page.php:680
 msgid "No file in queue."
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:703
+#: inc/admin/lib.dc.page.php:681
 msgid "1 file in queue."
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:704
+#: inc/admin/lib.dc.page.php:682
 #, php-format
 msgid "%d files in queue."
 msgstr ""
 
-#: inc/admin/lib.dc.page.php:705
+#: inc/admin/lib.dc.page.php:683
 msgid "Queue error:"
 msgstr ""
@@ -3214,4 +3143,9 @@
 msgstr ""
 
+#: inc/admin/lib.pager.php:101 inc/admin/lib.pager.php:200
+#: inc/core/class.dc.blog.php:94
+msgid "scheduled"
+msgstr ""
+
 #: inc/admin/lib.pager.php:110 inc/admin/lib.pager.php:209
 msgid "protected"
@@ -3244,25 +3178,25 @@
 msgstr ""
 
+#: inc/admin/prepend.php:127
+msgid "Database error"
+msgstr ""
+
 #: inc/admin/prepend.php:128
-msgid "Database error"
-msgstr ""
-
-#: inc/admin/prepend.php:129
 msgid "There seems to be no Session table in your database. Is Dotclear completly installed?"
 msgstr ""
 
-#: inc/admin/prepend.php:286
+#: inc/admin/prepend.php:281
 msgid "System"
 msgstr ""
 
-#: inc/admin/prepend.php:287
+#: inc/admin/prepend.php:282
 msgid "Blog"
 msgstr ""
 
-#: inc/admin/prepend.php:324
+#: inc/admin/prepend.php:318
 msgid "Updates"
 msgstr ""
 
-#: inc/admin/prepend.php:327
+#: inc/admin/prepend.php:321
 msgid "Languages"
 msgstr ""
@@ -3308,120 +3242,116 @@
 msgstr ""
 
-#: inc/core/class.dc.blog.php:434
+#: inc/core/class.dc.blog.php:433
 msgid "You are not allowed to add categories"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:480
+#: inc/core/class.dc.blog.php:479
 msgid "You are not allowed to update categories"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:558
+#: inc/core/class.dc.blog.php:557 inc/core/class.dc.blog.php:581
 msgid "You are not allowed to delete categories"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:569
+#: inc/core/class.dc.blog.php:568
 msgid "This category is not empty."
 msgstr ""
 
-#: inc/core/class.dc.blog.php:582
-msgid "You are not allowed to reset categories order"
-msgstr ""
-
-#: inc/core/class.dc.blog.php:603
+#: inc/core/class.dc.blog.php:602
 msgid "Category URL must be unique."
 msgstr ""
 
-#: inc/core/class.dc.blog.php:610
+#: inc/core/class.dc.blog.php:609
 msgid "You must provide a category title"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:620
+#: inc/core/class.dc.blog.php:619
 msgid "You must provide a category URL"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1109
+#: inc/core/class.dc.blog.php:1103
 msgid "You are not allowed to create an entry"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1167
+#: inc/core/class.dc.blog.php:1161
 msgid "You are not allowed to update entries"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1173 inc/core/class.dc.blog.php:1354
+#: inc/core/class.dc.blog.php:1167 inc/core/class.dc.blog.php:1348
 msgid "No such entry ID"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1202
+#: inc/core/class.dc.blog.php:1196
 msgid "You are not allowed to edit this entry"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1226 inc/core/class.dc.blog.php:1244
+#: inc/core/class.dc.blog.php:1220 inc/core/class.dc.blog.php:1238
 #: inc/core/class.dc.meta.php:168 inc/core/class.dc.meta.php:182
 msgid "You are not allowed to change this entry status"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1263 inc/core/class.dc.blog.php:1306
-#: inc/core/class.dc.blog.php:1324
+#: inc/core/class.dc.blog.php:1257 inc/core/class.dc.blog.php:1300
+#: inc/core/class.dc.blog.php:1318
 msgid "You are not allowed to change this entry category"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1281
+#: inc/core/class.dc.blog.php:1275
 msgid "You are not allowed to mark this entry as selected"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1348
+#: inc/core/class.dc.blog.php:1342
 msgid "You are not allowed to delete entries"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1369
+#: inc/core/class.dc.blog.php:1363
 msgid "You are not allowed to delete this entry"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1528
+#: inc/core/class.dc.blog.php:1517
 msgid "No entry title"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1532 inc/core/class.dc.blog.php:1548
+#: inc/core/class.dc.blog.php:1521 inc/core/class.dc.blog.php:1537
 msgid "No entry content"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1710
+#: inc/core/class.dc.blog.php:1699
 msgid "Empty entry URL"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1955
+#: inc/core/class.dc.blog.php:1935
 msgid "You are not allowed to update comments"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1961 inc/core/class.dc.blog.php:1967
-#: inc/core/class.dc.blog.php:2029
+#: inc/core/class.dc.blog.php:1941 inc/core/class.dc.blog.php:1947
+#: inc/core/class.dc.blog.php:2009
 msgid "No such comment ID"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:1974
+#: inc/core/class.dc.blog.php:1954
 msgid "You are not allowed to update this comment"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:2007
+#: inc/core/class.dc.blog.php:1987
 msgid "You are not allowed to change this comment's status"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:2023
+#: inc/core/class.dc.blog.php:2003
 msgid "You are not allowed to delete comments"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:2045
+#: inc/core/class.dc.blog.php:2025
 msgid "You are not allowed to delete this comment"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:2060
+#: inc/core/class.dc.blog.php:2040
 msgid "You must provide a comment"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:2064
+#: inc/core/class.dc.blog.php:2044
 msgid "You must provide an author name"
 msgstr ""
 
-#: inc/core/class.dc.blog.php:2068
+#: inc/core/class.dc.blog.php:2048
 msgid "Email address is not valid."
 msgstr ""
@@ -3510,9 +3440,9 @@
 msgstr ""
 
-#: inc/core/class.dc.media.php:1044
+#: inc/core/class.dc.media.php:1043
 msgid "Embedded Audio Player"
 msgstr ""
 
-#: inc/core/class.dc.media.php:1090
+#: inc/core/class.dc.media.php:1089
 msgid "Embedded Video Player"
 msgstr ""
@@ -3575,7 +3505,6 @@
 msgstr ""
 
-#: inc/core/class.dc.namespace.php:272 inc/core/class.dc.namespace.php:300
-#: inc/core/class.dc.namespace.php:325 inc/core/class.dc.settings.php:221
-#: inc/core/class.dc.settings.php:278
+#: inc/core/class.dc.namespace.php:270 inc/core/class.dc.settings.php:174
+#: inc/core/class.dc.settings.php:231
 msgid "No namespace specified"
 msgstr ""
@@ -3589,5 +3518,5 @@
 msgstr ""
 
-#: inc/core/class.dc.settings.php:250
+#: inc/core/class.dc.settings.php:203
 #, php-format
 msgid "Invalid setting namespace: %s"
@@ -3667,6 +3596,5 @@
 msgstr ""
 
-#: inc/core/class.dc.workspace.php:276 inc/core/class.dc.workspace.php:305
-#: inc/core/class.dc.workspace.php:342
+#: inc/core/class.dc.workspace.php:275 inc/core/class.dc.workspace.php:312
 msgid "No workspace specified"
 msgstr ""
Index: locales/_pot/plugins.pot
===================================================================
--- locales/_pot/plugins.pot	(revision 963)
+++ locales/_pot/plugins.pot	(revision 782)
@@ -8,5 +8,5 @@
 "Project-Id-Version: Dotclear 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-06 09:58+0100\n"
+"POT-Creation-Date: 2011-11-13 15:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -17,12 +17,4 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/aboutConfig/_define.php:15
-msgid "about:config"
-msgstr ""
-
-#: plugins/aboutConfig/_define.php:16
-msgid "Manage every blog configuration directive"
-msgstr ""
-
 #: plugins/aboutConfig/index.php:78 plugins/userPref/index.php:74
 msgid "no"
@@ -51,5 +43,5 @@
 #: plugins/aboutConfig/index.php:141 plugins/antispam/index.php:176
 #: plugins/blogroll/index.php:247 plugins/blogroll/index.php:372
-#: plugins/simpleMenu/index.php:159 plugins/simpleMenu/index.php:524
+#: plugins/simpleMenu/index.php:159 plugins/simpleMenu/index.php:527
 #: plugins/userPref/index.php:137
 msgid "Description"
@@ -70,12 +62,4 @@
 msgstr ""
 
-#: plugins/akismet/_define.php:15
-msgid "Akismet"
-msgstr ""
-
-#: plugins/akismet/_define.php:16
-msgid "Akismet interface for Dotclear"
-msgstr ""
-
 #: plugins/akismet/class.dc.filter.akismet.php:31
 msgid "Akismet spam filter"
@@ -103,6 +87,5 @@
 msgstr ""
 
-#: plugins/antispam/_admin.php:18 plugins/antispam/_define.php:15
-#: plugins/antispam/index.php:18
+#: plugins/antispam/_admin.php:18 plugins/antispam/index.php:18
 msgid "Antispam"
 msgstr ""
@@ -116,8 +99,4 @@
 msgstr ""
 
-#: plugins/antispam/_define.php:16
-msgid "Generic antispam plugin for Dotclear"
-msgstr ""
-
 #: plugins/antispam/filters/class.dc.filter.ip.php:35
 msgid "IP Blacklist / Whitelist Filter"
@@ -150,5 +129,5 @@
 
 #: plugins/antispam/filters/class.dc.filter.ip.php:132
-msgid "Global IP (used for all blogs)"
+msgid "Global IP"
 msgstr ""
 
@@ -166,12 +145,4 @@
 msgstr ""
 
-#: plugins/antispam/filters/class.dc.filter.ip.php:179
-msgid "Local IPs (used only for this blog)"
-msgstr ""
-
-#: plugins/antispam/filters/class.dc.filter.ip.php:185
-msgid "Global IPs (used for all blogs)"
-msgstr ""
-
 #: plugins/antispam/filters/class.dc.filter.iplookup.php:32
 msgid "Checks sender IP address against DNSBL servers"
@@ -218,9 +189,9 @@
 
 #: plugins/antispam/filters/class.dc.filter.words.php:122
-msgid "Add a word "
+msgid "Add a word"
 msgstr ""
 
 #: plugins/antispam/filters/class.dc.filter.words.php:126
-msgid "Global word (used for all blogs)"
+msgid "Global word"
 msgstr ""
 
@@ -233,21 +204,13 @@
 msgstr ""
 
-#: plugins/antispam/filters/class.dc.filter.words.php:166
-msgid "Local words (used only for this blog)"
-msgstr ""
-
-#: plugins/antispam/filters/class.dc.filter.words.php:172
-msgid "Global words (used for all blogs)"
-msgstr ""
-
-#: plugins/antispam/filters/class.dc.filter.words.php:183
+#: plugins/antispam/filters/class.dc.filter.words.php:167
 msgid "Delete selected words"
 msgstr ""
 
-#: plugins/antispam/filters/class.dc.filter.words.php:191
+#: plugins/antispam/filters/class.dc.filter.words.php:175
 msgid "Create default wordlist"
 msgstr ""
 
-#: plugins/antispam/filters/class.dc.filter.words.php:221
+#: plugins/antispam/filters/class.dc.filter.words.php:205
 msgid "This word exists"
 msgstr ""
@@ -302,5 +265,5 @@
 msgstr ""
 
-#: plugins/antispam/index.php:101 plugins/antispam/index.php:116
+#: plugins/antispam/index.php:116
 #, php-format
 msgid "%s configuration"
@@ -372,26 +335,25 @@
 msgstr ""
 
-#: plugins/antispam/index.php:223
+#: plugins/antispam/index.php:217
 msgid "Syndication"
 msgstr ""
 
-#: plugins/antispam/index.php:225
+#: plugins/antispam/index.php:219
 msgid "Junk comments RSS feed"
 msgstr ""
 
-#: plugins/antispam/index.php:226
+#: plugins/antispam/index.php:220
 msgid "Published comments RSS feed"
 msgstr ""
 
-#: plugins/attachments/_admin.php:26 plugins/attachments/_define.php:15
-#: plugins/pages/page.php:486
+#: plugins/attachments/_admin.php:26 plugins/pages/page.php:452
 msgid "Attachments"
 msgstr ""
 
-#: plugins/attachments/_admin.php:46 plugins/pages/page.php:506
+#: plugins/attachments/_admin.php:46 plugins/pages/page.php:472
 msgid "remove"
 msgstr ""
 
-#: plugins/attachments/_admin.php:55 plugins/pages/page.php:515
+#: plugins/attachments/_admin.php:55 plugins/pages/page.php:481
 msgid "No attachment."
 msgstr ""
@@ -401,12 +363,7 @@
 msgstr ""
 
-#: plugins/attachments/_define.php:16
-msgid "Manage post attachments"
-msgstr ""
-
 #: plugins/blogroll/_admin.php:18 plugins/blogroll/_admin.php:27
-#: plugins/blogroll/_define.php:15 plugins/blogroll/_widgets.php:21
-#: plugins/blogroll/index.php:165 plugins/blogroll/index.php:217
-#: plugins/blogroll/index.php:241
+#: plugins/blogroll/_widgets.php:21 plugins/blogroll/index.php:165
+#: plugins/blogroll/index.php:217 plugins/blogroll/index.php:241
 msgid "Blogroll"
 msgstr ""
@@ -416,9 +373,5 @@
 msgstr ""
 
-#: plugins/blogroll/_define.php:16
-msgid "Manage your blogroll"
-msgstr ""
-
-#: plugins/blogroll/_widgets.php:22 plugins/blowupConfig/index.php:265
+#: plugins/blogroll/_widgets.php:22 plugins/blowupConfig/index.php:266
 msgid "Links"
 msgstr ""
@@ -429,76 +382,12 @@
 
 #: plugins/blogroll/_widgets.php:36 plugins/pages/_widgets.php:23
-#: plugins/simpleMenu/_widgets.php:22 plugins/tags/_widgets.php:31
-#: plugins/widgets/_default_widgets.php:22
-#: plugins/widgets/_default_widgets.php:28
-#: plugins/widgets/_default_widgets.php:35
-#: plugins/widgets/_default_widgets.php:41
+#: plugins/simpleMenu/_widgets.php:22 plugins/widgets/_default_widgets.php:29
+#: plugins/widgets/_default_widgets.php:33
+#: plugins/widgets/_default_widgets.php:42
 #: plugins/widgets/_default_widgets.php:48
-#: plugins/widgets/_default_widgets.php:55
-#: plugins/widgets/_default_widgets.php:63
-#: plugins/widgets/_default_widgets.php:70
-#: plugins/widgets/_default_widgets.php:87
-#: plugins/widgets/_default_widgets.php:94
-msgid "Display on:"
-msgstr ""
-
-#: plugins/blogroll/_widgets.php:38 plugins/pages/_widgets.php:25
-#: plugins/simpleMenu/_widgets.php:24 plugins/tags/_widgets.php:33
-#: plugins/widgets/_default_widgets.php:23
-#: plugins/widgets/_default_widgets.php:29
-#: plugins/widgets/_default_widgets.php:36
-#: plugins/widgets/_default_widgets.php:42
-#: plugins/widgets/_default_widgets.php:49
-#: plugins/widgets/_default_widgets.php:56
-#: plugins/widgets/_default_widgets.php:64
-#: plugins/widgets/_default_widgets.php:71
-#: plugins/widgets/_default_widgets.php:88
-#: plugins/widgets/_default_widgets.php:95
-msgid "All pages"
-msgstr ""
-
-#: plugins/blogroll/_widgets.php:39 plugins/pages/_widgets.php:26
-#: plugins/simpleMenu/_widgets.php:25 plugins/tags/_widgets.php:34
-#: plugins/widgets/_default_widgets.php:23
-#: plugins/widgets/_default_widgets.php:29
-#: plugins/widgets/_default_widgets.php:36
-#: plugins/widgets/_default_widgets.php:42
-#: plugins/widgets/_default_widgets.php:49
-#: plugins/widgets/_default_widgets.php:56
-#: plugins/widgets/_default_widgets.php:64
-#: plugins/widgets/_default_widgets.php:71
-#: plugins/widgets/_default_widgets.php:88
-#: plugins/widgets/_default_widgets.php:95
+#: plugins/widgets/_default_widgets.php:53
+#: plugins/widgets/_default_widgets.php:68
+#: plugins/widgets/_default_widgets.php:74
 msgid "Home page only"
-msgstr ""
-
-#: plugins/blogroll/_widgets.php:40 plugins/pages/_widgets.php:27
-#: plugins/simpleMenu/_widgets.php:26 plugins/tags/_widgets.php:35
-#: plugins/widgets/_default_widgets.php:23
-#: plugins/widgets/_default_widgets.php:29
-#: plugins/widgets/_default_widgets.php:36
-#: plugins/widgets/_default_widgets.php:42
-#: plugins/widgets/_default_widgets.php:49
-#: plugins/widgets/_default_widgets.php:56
-#: plugins/widgets/_default_widgets.php:64
-#: plugins/widgets/_default_widgets.php:71
-#: plugins/widgets/_default_widgets.php:88
-#: plugins/widgets/_default_widgets.php:95
-msgid "Except on home page"
-msgstr ""
-
-#: plugins/blogroll/_widgets.php:43 plugins/pages/_widgets.php:40
-#: plugins/simpleMenu/_widgets.php:29 plugins/tags/_widgets.php:38
-#: plugins/widgets/_default_widgets.php:24
-#: plugins/widgets/_default_widgets.php:30
-#: plugins/widgets/_default_widgets.php:37
-#: plugins/widgets/_default_widgets.php:43
-#: plugins/widgets/_default_widgets.php:50
-#: plugins/widgets/_default_widgets.php:57
-#: plugins/widgets/_default_widgets.php:65
-#: plugins/widgets/_default_widgets.php:72
-#: plugins/widgets/_default_widgets.php:89
-#: plugins/widgets/_default_widgets.php:96
-msgid "CSS class:"
 msgstr ""
 
@@ -678,5 +567,5 @@
 msgstr ""
 
-#: plugins/blogroll/index.php:248 plugins/simpleMenu/index.php:525
+#: plugins/blogroll/index.php:248 plugins/simpleMenu/index.php:528
 msgid "URL"
 msgstr ""
@@ -721,16 +610,8 @@
 #: plugins/blogroll/index.php:357 plugins/blogroll/index.php:401
 #: plugins/importExport/inc/class.dc.import.feed.php:93
-#: plugins/importExport/inc/class.dc.import.flat.php:203
-#: plugins/importExport/inc/class.dc.import.flat.php:235
-#: plugins/importExport/index.php:88
+#: plugins/importExport/inc/class.dc.import.flat.php:180
+#: plugins/importExport/inc/class.dc.import.flat.php:210
+#: plugins/importExport/index.php:108
 msgid "Import"
-msgstr ""
-
-#: plugins/blowupConfig/_define.php:15
-msgid "Blowup Config"
-msgstr ""
-
-#: plugins/blowupConfig/_define.php:16
-msgid "Configure your Blowup Theme"
 msgstr ""
 
@@ -771,250 +652,250 @@
 msgstr ""
 
-#: plugins/blowupConfig/index.php:230
+#: plugins/blowupConfig/index.php:231
 msgid "For the following reasons, images cannot be created. You won't be able to change some background properties."
 msgstr ""
 
-#: plugins/blowupConfig/index.php:235
+#: plugins/blowupConfig/index.php:236
 msgid "Theme configuration has been successfully updated."
 msgstr ""
 
-#: plugins/blowupConfig/index.php:240
+#: plugins/blowupConfig/index.php:241
 msgid "General"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:244
+#: plugins/blowupConfig/index.php:245
 msgid "Background color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:247
+#: plugins/blowupConfig/index.php:248
 msgid "Background color fill:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:252
+#: plugins/blowupConfig/index.php:253
 msgid "Main text font:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:255
+#: plugins/blowupConfig/index.php:256
 msgid "Main text font size:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:258
+#: plugins/blowupConfig/index.php:259
 msgid "Main text color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:261
+#: plugins/blowupConfig/index.php:262
 msgid "Text line height:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:266
+#: plugins/blowupConfig/index.php:267
 msgid "Links color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:269
+#: plugins/blowupConfig/index.php:270
 msgid "Visited links color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:272
+#: plugins/blowupConfig/index.php:273
 msgid "Focus links color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:276
+#: plugins/blowupConfig/index.php:277
 msgid "Page top"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:280
+#: plugins/blowupConfig/index.php:281
 msgid "Prelude color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:285
+#: plugins/blowupConfig/index.php:286
 msgid "Hide main title"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:288
+#: plugins/blowupConfig/index.php:289
 msgid "Main title font:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:291
+#: plugins/blowupConfig/index.php:292
 msgid "Main title font size:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:294
+#: plugins/blowupConfig/index.php:295
 msgid "Main title color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:297
+#: plugins/blowupConfig/index.php:298
 msgid "Main title alignment:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:298
+#: plugins/blowupConfig/index.php:299
 msgid "center"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:298 plugins/blowupConfig/index.php:332
+#: plugins/blowupConfig/index.php:299 plugins/blowupConfig/index.php:333
 msgid "left"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:298 plugins/blowupConfig/index.php:332
+#: plugins/blowupConfig/index.php:299 plugins/blowupConfig/index.php:333
 msgid "right"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:300
+#: plugins/blowupConfig/index.php:301
 msgid "Main title position (x:y)"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:312 plugins/blowupConfig/index.php:313
+#: plugins/blowupConfig/index.php:313 plugins/blowupConfig/index.php:314
 msgid "Top image"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:315
+#: plugins/blowupConfig/index.php:316
 msgid "Choose \"Custom...\" to upload your own image."
 msgstr ""
 
-#: plugins/blowupConfig/index.php:317
+#: plugins/blowupConfig/index.php:318
 msgid "Add your image:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:318
+#: plugins/blowupConfig/index.php:319
 #, php-format
 msgid "JPEG or PNG file, 800 pixels wide, maximum size %s"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:330
+#: plugins/blowupConfig/index.php:331
 msgid "Sidebar"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:331
+#: plugins/blowupConfig/index.php:332
 msgid "Sidebar position:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:334
+#: plugins/blowupConfig/index.php:335
 msgid "Sidebar text font:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:337
+#: plugins/blowupConfig/index.php:338
 msgid "Sidebar text font size:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:340
+#: plugins/blowupConfig/index.php:341
 msgid "Sidebar text color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:343
+#: plugins/blowupConfig/index.php:344
 msgid "Sidebar titles font:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:346
+#: plugins/blowupConfig/index.php:347
 msgid "Sidebar titles font size:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:349
+#: plugins/blowupConfig/index.php:350
 msgid "Sidebar titles color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:352
+#: plugins/blowupConfig/index.php:353
 msgid "Sidebar 2nd level titles font:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:355
+#: plugins/blowupConfig/index.php:356
 msgid "Sidebar 2nd level titles font size:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:358
+#: plugins/blowupConfig/index.php:359
 msgid "Sidebar 2nd level titles color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:361
+#: plugins/blowupConfig/index.php:362
 msgid "Sidebar lines color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:364
+#: plugins/blowupConfig/index.php:365
 msgid "Sidebar links color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:367
+#: plugins/blowupConfig/index.php:368
 msgid "Sidebar visited links color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:370
+#: plugins/blowupConfig/index.php:371
 msgid "Sidebar focus links color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:375
+#: plugins/blowupConfig/index.php:376
 msgid "Date title font:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:378
+#: plugins/blowupConfig/index.php:379
 msgid "Date title font size:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:381
+#: plugins/blowupConfig/index.php:382
 msgid "Date title color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:384
+#: plugins/blowupConfig/index.php:385
 msgid "Entry title font:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:387
+#: plugins/blowupConfig/index.php:388
 msgid "Entry title font size:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:390
+#: plugins/blowupConfig/index.php:391
 msgid "Entry title color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:395
+#: plugins/blowupConfig/index.php:396
 msgid "Comment background color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:400
+#: plugins/blowupConfig/index.php:401
 msgid "Comment text color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:405
+#: plugins/blowupConfig/index.php:406
 msgid "My comment background color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:410
+#: plugins/blowupConfig/index.php:411
 msgid "My comment text color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:414
+#: plugins/blowupConfig/index.php:415
 msgid "Footer"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:415
+#: plugins/blowupConfig/index.php:416
 msgid "Footer font:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:418
+#: plugins/blowupConfig/index.php:419
 msgid "Footer font size:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:421
+#: plugins/blowupConfig/index.php:422
 msgid "Footer color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:424
+#: plugins/blowupConfig/index.php:425
 msgid "Footer links color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:427
+#: plugins/blowupConfig/index.php:428
 msgid "Footer background color:"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:432 plugins/blowupConfig/index.php:433
+#: plugins/blowupConfig/index.php:433 plugins/blowupConfig/index.php:434
 msgid "Additional CSS"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:450
+#: plugins/blowupConfig/index.php:451
 msgid "Configuration import / export"
 msgstr ""
 
-#: plugins/blowupConfig/index.php:451
+#: plugins/blowupConfig/index.php:452
 msgid "You can share your configuration using the following code. To apply a configuration, paste the code, click on \"Apply code\" and save."
 msgstr ""
 
-#: plugins/blowupConfig/index.php:452
+#: plugins/blowupConfig/index.php:453
 msgid "Copy this code:"
 msgstr ""
@@ -1055,27 +936,11 @@
 msgstr ""
 
-#: plugins/fairTrackbacks/_define.php:15
-msgid "Fair Trackbacks"
-msgstr ""
-
-#: plugins/fairTrackbacks/_define.php:16
-msgid "Trackback validity check"
-msgstr ""
-
 #: plugins/fairTrackbacks/class.dc.filter.fairtrackbacks.php:28
 msgid "Checks trackback source for a link to the post"
 msgstr ""
 
-#: plugins/importExport/_admin.php:15 plugins/importExport/_admin.php:28
-#: plugins/importExport/index.php:59
+#: plugins/importExport/_admin.php:14 plugins/importExport/index.php:58
+#: plugins/importExport/index.php:98 plugins/importExport/index.php:107
 msgid "Import/Export"
-msgstr ""
-
-#: plugins/importExport/_define.php:15
-msgid "Import / Export"
-msgstr ""
-
-#: plugins/importExport/_define.php:16
-msgid "Import and Export your blog"
 msgstr ""
 
@@ -1088,65 +953,48 @@
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.export.flat.php:140
+#: plugins/importExport/inc/class.dc.export.flat.php:138
 msgid "Export file not found."
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.export.flat.php:184
-msgid "Failed to compress export file."
-msgstr ""
-
-#: plugins/importExport/inc/class.dc.export.flat.php:194
-#: plugins/importExport/inc/class.dc.import.feed.php:84
-#: plugins/importExport/inc/class.dc.import.flat.php:183
-msgid "Single blog"
-msgstr ""
-
-#: plugins/importExport/inc/class.dc.export.flat.php:195
+#: plugins/importExport/inc/class.dc.export.flat.php:156
+msgid "Export a blog"
+msgstr ""
+
+#: plugins/importExport/inc/class.dc.export.flat.php:157
 #, php-format
 msgid "This will create an export of your current blog: %s"
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.export.flat.php:203
-#: plugins/importExport/inc/class.dc.export.flat.php:229
-msgid "Compress file"
-msgstr ""
-
-#: plugins/importExport/inc/class.dc.export.flat.php:207
+#: plugins/importExport/inc/class.dc.export.flat.php:161
+#: plugins/importExport/index.php:124
+msgid "Export"
+msgstr ""
+
+#: plugins/importExport/inc/class.dc.export.flat.php:165
 msgid "You may also want to download your media directory as a zip file"
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.export.flat.php:209
-#: plugins/importExport/inc/class.dc.export.flat.php:232
-#: plugins/importExport/index.php:89
-msgid "Export"
-msgstr ""
-
-#: plugins/importExport/inc/class.dc.export.flat.php:220
-#: plugins/importExport/inc/class.dc.import.flat.php:212
-msgid "Multiple blogs"
-msgstr ""
-
-#: plugins/importExport/inc/class.dc.export.flat.php:221
-msgid "This will create an export of all the content of your database."
-msgstr ""
-
-#: plugins/importExport/inc/class.dc.ieModule.php:74
+#: plugins/importExport/inc/class.dc.export.flat.php:172
+#: plugins/importExport/inc/class.dc.export.flat.php:175
+msgid "Export all content"
+msgstr ""
+
+#: plugins/importExport/inc/class.dc.ieModule.php:83
 msgid "Congratulation!"
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.ieModule.php:75
+#: plugins/importExport/inc/class.dc.ieModule.php:84
 msgid "Your blog has been successfully imported. Welcome on Dotclear 2!"
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.ieModule.php:76
+#: plugins/importExport/inc/class.dc.ieModule.php:85
 msgid "Why don't you blog this now?"
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.ieModule.php:77
-#: plugins/widgets/index.php:285
+#: plugins/importExport/inc/class.dc.ieModule.php:86
 msgid "or"
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.ieModule.php:77
+#: plugins/importExport/inc/class.dc.ieModule.php:86
 msgid "visit your dashboard"
 msgstr ""
@@ -1260,15 +1108,19 @@
 
 #: plugins/importExport/inc/class.dc.import.feed.php:79
-#: plugins/importExport/inc/class.dc.import.flat.php:149
+#: plugins/importExport/inc/class.dc.import.flat.php:127
 msgid "Content successfully imported."
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.import.feed.php:85
+#: plugins/importExport/inc/class.dc.import.feed.php:83
+msgid "Import from a feed"
+msgstr ""
+
+#: plugins/importExport/inc/class.dc.import.feed.php:84
 #, php-format
 msgid "This will import a feed (RSS or Atom) a as new content in the current blog: %s."
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.import.feed.php:87
-#: plugins/widgets/_default_widgets.php:61
+#: plugins/importExport/inc/class.dc.import.feed.php:91
+#: plugins/widgets/_default_widgets.php:46
 msgid "Feed URL:"
 msgstr ""
@@ -1282,41 +1134,37 @@
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.import.flat.php:144
+#: plugins/importExport/inc/class.dc.import.flat.php:122
 msgid "Single blog successfully imported."
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.import.flat.php:160
+#: plugins/importExport/inc/class.dc.import.flat.php:135
 msgid "Are you sure you want to import a full backup file?"
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.import.flat.php:184
+#: plugins/importExport/inc/class.dc.import.flat.php:157
+msgid "Import a single blog"
+msgstr ""
+
+#: plugins/importExport/inc/class.dc.import.flat.php:158
 #, php-format
 msgid "This will import a single blog backup as new content in the current blog: %s."
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.import.flat.php:186
-#: plugins/importExport/inc/class.dc.import.flat.php:215
+#: plugins/importExport/inc/class.dc.import.flat.php:166
+#: plugins/importExport/inc/class.dc.import.flat.php:195
 msgid "Upload a backup file"
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.import.flat.php:193
-#: plugins/importExport/inc/class.dc.import.flat.php:222
+#: plugins/importExport/inc/class.dc.import.flat.php:175
+#: plugins/importExport/inc/class.dc.import.flat.php:200
 msgid "or pick up a local file in your public directory"
 msgstr ""
 
-#: plugins/importExport/inc/class.dc.import.flat.php:213
-msgid "This will reset all the content of your database, except users."
-msgstr ""
-
-#: plugins/importExport/inc/class.dc.import.flat.php:306
-msgid "Another file with same name exists."
-msgstr ""
-
-#: plugins/importExport/inc/class.dc.import.flat.php:313
-msgid "Failed to extract backup file."
-msgstr ""
-
-#: plugins/importExport/inc/class.dc.import.flat.php:324
-msgid "No backup in compressed file."
+#: plugins/importExport/inc/class.dc.import.flat.php:187
+msgid "Import a full backup file"
+msgstr ""
+
+#: plugins/importExport/inc/class.dc.import.flat.php:205
+msgid "Warning: This will reset all the content of your database, except users."
 msgstr ""
 
@@ -1382,36 +1230,35 @@
 msgstr ""
 
-#: plugins/importExport/inc/flat/class.flat.backup.php:34
+#: plugins/importExport/inc/flat/class.backupFile.php:32
 msgid "No file to read."
 msgstr ""
 
-#: plugins/importExport/inc/flat/class.flat.import.php:54
+#: plugins/importExport/inc/flat/class.dc.import.php:54
 msgid "File is not a DotClear backup."
 msgstr ""
 
-#: plugins/importExport/inc/flat/class.flat.import.php:105
+#: plugins/importExport/inc/flat/class.dc.import.php:105
 msgid "File is not a single blog export."
 msgstr ""
 
-#: plugins/importExport/inc/flat/class.flat.import.php:222
+#: plugins/importExport/inc/flat/class.dc.import.php:222
 msgid "File is not a full export."
 msgstr ""
 
-#: plugins/importExport/inc/flat/class.flat.import.php:704
-#, php-format
-msgid "ID of \"%3$s\" does not match on record \"%1$s\" at line %2$s of backup file."
-msgstr ""
-
-#: plugins/importExport/index.php:69
+#: plugins/importExport/inc/flat/class.dc.import.php:632
+#: plugins/importExport/inc/flat/class.dc.import.php:642
+#: plugins/importExport/inc/flat/class.dc.import.php:669
+#: plugins/importExport/inc/flat/class.dc.import.php:680
+#: plugins/importExport/inc/flat/class.dc.import.php:695
+msgid "The backup file does not appear to be well formed."
+msgstr ""
+
+#: plugins/importExport/index.php:89
 msgid "Please wait..."
 msgstr ""
 
-#: plugins/maintenance/_admin.php:14 plugins/maintenance/_define.php:15
-#: plugins/maintenance/index.php:67 plugins/maintenance/index.php:71
+#: plugins/maintenance/_admin.php:14 plugins/maintenance/index.php:67
+#: plugins/maintenance/index.php:71
 msgid "Maintenance"
-msgstr ""
-
-#: plugins/maintenance/_define.php:16
-msgid "Maintain your installation"
 msgstr ""
 
@@ -1507,8 +1354,7 @@
 
 #: plugins/pages/_admin.php:19 plugins/pages/_admin.php:44
-#: plugins/pages/_define.php:15 plugins/pages/_widgets.php:21
-#: plugins/pages/_widgets.php:22 plugins/pages/list.php:168
-#: plugins/pages/list.php:179 plugins/pages/page.php:292
-#: plugins/pages/page.php:339
+#: plugins/pages/_widgets.php:21 plugins/pages/_widgets.php:22
+#: plugins/pages/list.php:168 plugins/pages/list.php:179
+#: plugins/pages/page.php:275 plugins/pages/page.php:322
 msgid "Pages"
 msgstr ""
@@ -1528,8 +1374,4 @@
 msgstr ""
 
-#: plugins/pages/_define.php:16
-msgid "Serve entries as simple web pages"
-msgstr ""
-
 #: plugins/pages/_public.php:15
 msgid "Published on"
@@ -1544,13 +1386,13 @@
 msgstr ""
 
-#: plugins/pages/_widgets.php:32
+#: plugins/pages/_widgets.php:26
 msgid "Page title"
 msgstr ""
 
-#: plugins/pages/_widgets.php:33
+#: plugins/pages/_widgets.php:27
 msgid "Page position"
 msgstr ""
 
-#: plugins/pages/_widgets.php:34
+#: plugins/pages/_widgets.php:28
 msgid "Publication date"
 msgstr ""
@@ -1560,8 +1402,4 @@
 msgstr ""
 
-#: plugins/pages/list.php:88
-msgid "hidden"
-msgstr ""
-
 #: plugins/pages/list.php:103
 msgid "select this page"
@@ -1572,5 +1410,5 @@
 msgstr ""
 
-#: plugins/pages/list.php:180 plugins/pages/page.php:37
+#: plugins/pages/list.php:180 plugins/pages/page.php:36
 msgid "New page"
 msgstr ""
@@ -1580,83 +1418,62 @@
 msgstr ""
 
-#: plugins/pages/page.php:92
+#: plugins/pages/page.php:89
 msgid "This page does not exist."
 msgstr ""
 
-#: plugins/pages/page.php:115 plugins/pages/page.php:375
+#: plugins/pages/page.php:111 plugins/pages/page.php:358
 msgid "Edit page"
 msgstr ""
 
-#: plugins/pages/page.php:125
+#: plugins/pages/page.php:121
 msgid "next page"
 msgstr ""
 
-#: plugins/pages/page.php:132
+#: plugins/pages/page.php:128
 msgid "previous page"
 msgstr ""
 
-#: plugins/pages/page.php:295
+#: plugins/pages/page.php:278
 msgid "Are you sure you want to delete this page?"
 msgstr ""
 
-#: plugins/pages/page.php:316
+#: plugins/pages/page.php:299
 msgid "Page has been successfully updated."
 msgstr ""
 
-#: plugins/pages/page.php:319
+#: plugins/pages/page.php:302
 msgid "Page has been successfully created."
 msgstr ""
 
-#: plugins/pages/page.php:346
+#: plugins/pages/page.php:329
 msgid "Go to this page on the site"
 msgstr ""
 
+#: plugins/pages/page.php:412
+msgid "Page status:"
+msgstr ""
+
 #: plugins/pages/page.php:429
-msgid "Page status:"
-msgstr ""
-
-#: plugins/pages/page.php:446
-msgid "Warning: Comments are not more accepted for this page."
-msgstr ""
-
-#: plugins/pages/page.php:454
-msgid "Warning: Trackbacks are not more accepted for this page."
-msgstr ""
-
-#: plugins/pages/page.php:458
-msgid "Hidden"
-msgstr ""
-
-#: plugins/pages/page.php:460
-msgid "If checked this page will be active but not listed in widget Pages."
-msgstr ""
-
-#: plugins/pages/page.php:463
 msgid "Page position:"
 msgstr ""
 
-#: plugins/pages/page.php:467
+#: plugins/pages/page.php:433
 msgid "Page lang:"
 msgstr ""
 
-#: plugins/pages/page.php:470
+#: plugins/pages/page.php:436
 msgid "Page password:"
 msgstr ""
 
-#: plugins/pages/page.php:479
+#: plugins/pages/page.php:445
 msgid "Warning: If you set the URL manually, it may conflict with another page."
 msgstr ""
 
-#: plugins/pages/page.php:517
+#: plugins/pages/page.php:483
 msgid "Add files to this page"
 msgstr ""
 
-#: plugins/pings/_admin.php:14 plugins/pings/_define.php:15
-#: plugins/pings/index.php:48
+#: plugins/pings/_admin.php:14 plugins/pings/index.php:48
 msgid "Pings"
-msgstr ""
-
-#: plugins/pings/_define.php:16
-msgid "Ping services"
 msgstr ""
 
@@ -1702,12 +1519,4 @@
 msgstr ""
 
-#: plugins/simpleMenu/_define.php:15
-msgid "Simple Menu"
-msgstr ""
-
-#: plugins/simpleMenu/_define.php:16
-msgid "Simple menu for Dotclear"
-msgstr ""
-
 #: plugins/simpleMenu/_widgets.php:21
 msgid "Menu"
@@ -1724,5 +1533,5 @@
 
 #: plugins/simpleMenu/index.php:91 plugins/simpleMenu/index.php:163
-#: plugins/widgets/_widgets_functions.php:56
+#: plugins/widgets/_widgets_functions.php:46
 msgid "Home"
 msgstr ""
@@ -1737,9 +1546,8 @@
 
 #: plugins/simpleMenu/index.php:108 plugins/tags/_admin.php:14
-#: plugins/tags/_admin.php:163 plugins/tags/_admin.php:166
-#: plugins/tags/_admin.php:315 plugins/tags/_define.php:15
-#: plugins/tags/_widgets.php:21 plugins/tags/_widgets.php:22
-#: plugins/tags/tag_posts.php:95 plugins/tags/tags.php:17
-#: plugins/tags/tags.php:23
+#: plugins/tags/_admin.php:160 plugins/tags/_admin.php:163
+#: plugins/tags/_admin.php:312 plugins/tags/_widgets.php:21
+#: plugins/tags/_widgets.php:22 plugins/tags/tag_posts.php:95
+#: plugins/tags/tags.php:17 plugins/tags/tags.php:23
 msgid "Tags"
 msgstr ""
@@ -1749,5 +1557,5 @@
 msgstr ""
 
-#: plugins/simpleMenu/index.php:158 plugins/simpleMenu/index.php:523
+#: plugins/simpleMenu/index.php:158 plugins/simpleMenu/index.php:526
 msgid "Label"
 msgstr ""
@@ -1766,5 +1574,5 @@
 msgstr ""
 
-#: plugins/simpleMenu/index.php:181 plugins/widgets/_widgets_functions.php:63
+#: plugins/simpleMenu/index.php:181 plugins/widgets/_widgets_functions.php:53
 msgid "Archives"
 msgstr ""
@@ -1796,97 +1604,97 @@
 msgstr ""
 
-#: plugins/simpleMenu/index.php:414
+#: plugins/simpleMenu/index.php:417
 msgid "Menu item has been successfully added."
 msgstr ""
 
-#: plugins/simpleMenu/index.php:417
+#: plugins/simpleMenu/index.php:420
 msgid "Menu items have been successfully removed."
 msgstr ""
 
-#: plugins/simpleMenu/index.php:420 plugins/simpleMenu/index.php:423
+#: plugins/simpleMenu/index.php:423 plugins/simpleMenu/index.php:426
 msgid "Menu items have been successfully updated."
 msgstr ""
 
-#: plugins/simpleMenu/index.php:429
+#: plugins/simpleMenu/index.php:432
 msgid "Add item"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:435
+#: plugins/simpleMenu/index.php:438
 msgid "Select type"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:436
+#: plugins/simpleMenu/index.php:439
 msgid "Type of item menu:"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:437 plugins/simpleMenu/index.php:474
+#: plugins/simpleMenu/index.php:440 plugins/simpleMenu/index.php:477
 msgid "Continue..."
 msgstr ""
 
-#: plugins/simpleMenu/index.php:448
+#: plugins/simpleMenu/index.php:451
 msgid "Select language:"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:452
+#: plugins/simpleMenu/index.php:455
 msgid "Select category:"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:456
+#: plugins/simpleMenu/index.php:459
 msgid "Select month (if necessary):"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:460
+#: plugins/simpleMenu/index.php:463
 msgid "Select page:"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:464
+#: plugins/simpleMenu/index.php:467
 msgid "Select tag (if necessary):"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:484
+#: plugins/simpleMenu/index.php:487
 msgid "Label of item menu:"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:486
+#: plugins/simpleMenu/index.php:489
 msgid "Description of item menu:"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:488
+#: plugins/simpleMenu/index.php:491
 msgid "URL of item menu:"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:490
+#: plugins/simpleMenu/index.php:493
 msgid "Add this item"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:504
+#: plugins/simpleMenu/index.php:507
 msgid "Add an item"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:515
+#: plugins/simpleMenu/index.php:518
 msgid "Menu items list"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:552
+#: plugins/simpleMenu/index.php:555
 msgid "Update menu"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:554
+#: plugins/simpleMenu/index.php:557
 msgid "Delete selected menu items"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:555
+#: plugins/simpleMenu/index.php:558
 msgid "Are you sure you want to remove selected menu items?"
 msgstr ""
 
-#: plugins/simpleMenu/index.php:562
+#: plugins/simpleMenu/index.php:565
 msgid "Currently no menu items"
 msgstr ""
 
-#: plugins/tags/_admin.php:84
+#: plugins/tags/_admin.php:83
 msgid "Tags:"
 msgstr ""
 
-#: plugins/tags/_admin.php:117 plugins/tags/_admin.php:147
+#: plugins/tags/_admin.php:116 plugins/tags/_admin.php:145
 #: plugins/tags/tag_posts.php:100
 #, php-format
@@ -1894,81 +1702,77 @@
 msgstr ""
 
-#: plugins/tags/_admin.php:118 plugins/tags/_admin.php:148
+#: plugins/tags/_admin.php:117 plugins/tags/_admin.php:146
 #, php-format
 msgid "Add a %s to this entry"
 msgstr ""
 
-#: plugins/tags/_admin.php:119 plugins/tags/_admin.php:149
+#: plugins/tags/_admin.php:118 plugins/tags/_admin.php:147
 msgid "Choose from list"
 msgstr ""
 
-#: plugins/tags/_admin.php:120 plugins/tags/_admin.php:150
+#: plugins/tags/_admin.php:119 plugins/tags/_admin.php:148
 msgid "all"
 msgstr ""
 
-#: plugins/tags/_admin.php:122 plugins/tags/_public.php:367
+#: plugins/tags/_admin.php:121 plugins/tags/_public.php:351
 msgid "Tag"
 msgstr ""
 
-#: plugins/tags/_admin.php:124 plugins/tags/_admin.php:152
+#: plugins/tags/_admin.php:123 plugins/tags/_admin.php:150
 msgid "used in %e - frequency %p%"
 msgstr ""
 
-#: plugins/tags/_admin.php:125 plugins/tags/_admin.php:153
+#: plugins/tags/_admin.php:124 plugins/tags/_admin.php:151
 #: plugins/tags/tags.php:53
 msgid "entry"
 msgstr ""
 
-#: plugins/tags/_admin.php:126 plugins/tags/_admin.php:154
+#: plugins/tags/_admin.php:125 plugins/tags/_admin.php:152
 #: plugins/tags/tags.php:53
 msgid "entries"
 msgstr ""
 
-#: plugins/tags/_admin.php:151
+#: plugins/tags/_admin.php:149
 msgid "Enter tags separated by coma"
 msgstr ""
 
-#: plugins/tags/_admin.php:163
+#: plugins/tags/_admin.php:160
 msgid "Add tags"
 msgstr ""
 
-#: plugins/tags/_admin.php:167
+#: plugins/tags/_admin.php:164
 msgid "Remove tags"
 msgstr ""
 
-#: plugins/tags/_admin.php:233
+#: plugins/tags/_admin.php:230
 msgid "Add tags to entries"
 msgstr ""
 
-#: plugins/tags/_admin.php:235
+#: plugins/tags/_admin.php:232
 msgid "Tags to add:"
 msgstr ""
 
+#: plugins/tags/_admin.php:260
+msgid "Remove selected tags from entries"
+msgstr ""
+
 #: plugins/tags/_admin.php:263
-msgid "Remove selected tags from entries"
-msgstr ""
-
-#: plugins/tags/_admin.php:266
 msgid "No tags for selected entries"
 msgstr ""
 
-#: plugins/tags/_admin.php:274
+#: plugins/tags/_admin.php:271
 msgid "Following tags have been found in selected entries:"
 msgstr ""
 
-#: plugins/tags/_admin.php:309
+#: plugins/tags/_admin.php:306
 msgid "short"
 msgstr ""
 
-#: plugins/tags/_admin.php:310
+#: plugins/tags/_admin.php:307
 msgid "extended"
 msgstr ""
 
-#: plugins/tags/_admin.php:316
+#: plugins/tags/_admin.php:313
 msgid "Tags list format:"
-msgstr ""
-
-#: plugins/tags/_define.php:16
-msgid "Tags for posts"
 msgstr ""
 
@@ -2037,12 +1841,7 @@
 msgstr ""
 
-#: plugins/themeEditor/_admin.php:28 plugins/themeEditor/_admin.php:53
-#: plugins/themeEditor/_define.php:15 plugins/themeEditor/_define.php:16
-#: plugins/themeEditor/index.php:61 plugins/themeEditor/index.php:86
+#: plugins/themeEditor/_admin.php:23 plugins/themeEditor/index.php:57
+#: plugins/themeEditor/index.php:71
 msgid "Theme Editor"
-msgstr ""
-
-#: plugins/themeEditor/_admin.php:57
-msgid "Syntax color"
 msgstr ""
 
@@ -2066,60 +1865,52 @@
 msgstr ""
 
-#: plugins/themeEditor/index.php:65
+#: plugins/themeEditor/index.php:61
 msgid "Saving document..."
 msgstr ""
 
-#: plugins/themeEditor/index.php:66
+#: plugins/themeEditor/index.php:62
 msgid "Document saved"
 msgstr ""
 
-#: plugins/themeEditor/index.php:67
+#: plugins/themeEditor/index.php:63
 msgid "An error occurred:"
 msgstr ""
 
-#: plugins/themeEditor/index.php:88
+#: plugins/themeEditor/index.php:73
 #, php-format
 msgid "Your current theme on this blog is \"%s\"."
 msgstr ""
 
+#: plugins/themeEditor/index.php:76
+msgid "You can't edit default theme."
+msgstr ""
+
+#: plugins/themeEditor/index.php:85
+msgid "Please select a file to edit."
+msgstr ""
+
 #: plugins/themeEditor/index.php:91
-msgid "You can't edit default theme."
-msgstr ""
-
-#: plugins/themeEditor/index.php:100
-msgid "Please select a file to edit."
-msgstr ""
-
-#: plugins/themeEditor/index.php:106
 msgid "File editor"
 msgstr ""
 
-#: plugins/themeEditor/index.php:107
+#: plugins/themeEditor/index.php:92
 #, php-format
 msgid "Editing file %s"
 msgstr ""
 
-#: plugins/themeEditor/index.php:120
+#: plugins/themeEditor/index.php:105
 msgid "This file is not writable. Please check your theme files permissions."
 msgstr ""
 
-#: plugins/themeEditor/index.php:145
+#: plugins/themeEditor/index.php:116
 msgid "Templates files"
 msgstr ""
 
-#: plugins/themeEditor/index.php:148
+#: plugins/themeEditor/index.php:119
 msgid "CSS files"
 msgstr ""
 
-#: plugins/themeEditor/index.php:151
+#: plugins/themeEditor/index.php:122
 msgid "JavaScript files"
-msgstr ""
-
-#: plugins/userPref/_define.php:15
-msgid "user:preferences"
-msgstr ""
-
-#: plugins/userPref/_define.php:16
-msgid "Manage every user preference directive"
 msgstr ""
 
@@ -2148,103 +1939,94 @@
 msgstr ""
 
+#: plugins/widgets/_default_widgets.php:23
+msgid "Navigation links"
+msgstr ""
+
 #: plugins/widgets/_default_widgets.php:26
-msgid "Navigation links"
-msgstr ""
-
-#: plugins/widgets/_default_widgets.php:32
 msgid "Selected entries"
 msgstr ""
 
-#: plugins/widgets/_default_widgets.php:33
+#: plugins/widgets/_default_widgets.php:27
 msgid "Best of me"
 msgstr ""
 
+#: plugins/widgets/_default_widgets.php:31
+msgid "Blog languages"
+msgstr ""
+
+#: plugins/widgets/_default_widgets.php:37
+msgid "With entries counts"
+msgstr ""
+
 #: plugins/widgets/_default_widgets.php:39
-msgid "Blog languages"
+msgid "Subscribe links"
+msgstr ""
+
+#: plugins/widgets/_default_widgets.php:40
+msgid "Subscribe"
+msgstr ""
+
+#: plugins/widgets/_default_widgets.php:41
+msgid "Feeds type:"
+msgstr ""
+
+#: plugins/widgets/_default_widgets.php:44
+msgid "Feed reader"
+msgstr ""
+
+#: plugins/widgets/_default_widgets.php:45
+msgid "Somewhere else"
 msgstr ""
 
 #: plugins/widgets/_default_widgets.php:47
-msgid "With entries counts"
+#: plugins/widgets/_default_widgets.php:67
+msgid "Entries limit:"
+msgstr ""
+
+#: plugins/widgets/_default_widgets.php:50
+msgid "Text"
 msgstr ""
 
 #: plugins/widgets/_default_widgets.php:52
-msgid "Subscribe links"
-msgstr ""
-
-#: plugins/widgets/_default_widgets.php:53
-msgid "Subscribe"
-msgstr ""
-
-#: plugins/widgets/_default_widgets.php:54
-msgid "Feeds type:"
-msgstr ""
-
-#: plugins/widgets/_default_widgets.php:59
-msgid "Feed reader"
-msgstr ""
-
-#: plugins/widgets/_default_widgets.php:60
-msgid "Somewhere else"
-msgstr ""
-
-#: plugins/widgets/_default_widgets.php:62
-#: plugins/widgets/_default_widgets.php:86
-msgid "Entries limit:"
-msgstr ""
-
-#: plugins/widgets/_default_widgets.php:67
-msgid "Text"
-msgstr ""
-
-#: plugins/widgets/_default_widgets.php:69
 msgid "Text:"
 msgstr ""
 
-#: plugins/widgets/_default_widgets.php:74
-#: plugins/widgets/_default_widgets.php:75
+#: plugins/widgets/_default_widgets.php:55
+#: plugins/widgets/_default_widgets.php:56
 msgid "Last entries"
 msgstr ""
 
-#: plugins/widgets/_default_widgets.php:77
+#: plugins/widgets/_default_widgets.php:58
 msgid "Uncategorized"
 msgstr ""
 
-#: plugins/widgets/_default_widgets.php:84
+#: plugins/widgets/_default_widgets.php:65
 msgid "Tag:"
 msgstr ""
 
-#: plugins/widgets/_default_widgets.php:91
-#: plugins/widgets/_default_widgets.php:92
+#: plugins/widgets/_default_widgets.php:71
+#: plugins/widgets/_default_widgets.php:72
 msgid "Last comments"
 msgstr ""
 
-#: plugins/widgets/_default_widgets.php:93
+#: plugins/widgets/_default_widgets.php:73
 msgid "Comments limit:"
 msgstr ""
 
-#: plugins/widgets/_define.php:15 plugins/widgets/index.php:163
-#: plugins/widgets/index.php:190
-msgid "Widgets"
-msgstr ""
-
-#: plugins/widgets/_define.php:16
-msgid "Widgets for your blog sidebars"
-msgstr ""
-
-#: plugins/widgets/_widgets_functions.php:212
+#: plugins/widgets/_widgets_functions.php:195
 #, php-format
 msgid "This blog's entries %s feed"
 msgstr ""
 
-#: plugins/widgets/_widgets_functions.php:213
+#: plugins/widgets/_widgets_functions.php:196
 #, php-format
 msgid "This blog's comments %s feed"
 msgstr ""
 
-#: plugins/widgets/_widgets_functions.php:224
+#: plugins/widgets/_widgets_functions.php:207
 msgid "Entries feed"
 msgstr ""
 
-#: plugins/widgets/_widgets_functions.php:232
+#: plugins/widgets/_widgets_functions.php:215
 msgid "Comments feed"
 msgstr ""
@@ -2262,125 +2044,109 @@
 msgstr ""
 
-#: plugins/widgets/index.php:40
-msgid "empty string"
-msgstr ""
-
-#: plugins/widgets/index.php:183
+#: plugins/widgets/index.php:155 plugins/widgets/index.php:182
+msgid "Widgets"
+msgstr ""
+
+#: plugins/widgets/index.php:175
 msgid "Are you sure you want to reset sidebars?"
 msgstr ""
 
-#: plugins/widgets/index.php:195
+#: plugins/widgets/index.php:187
 msgid "Available widgets"
 msgstr ""
 
-#: plugins/widgets/index.php:204
+#: plugins/widgets/index.php:196
 msgid "Append to:"
 msgstr ""
 
+#: plugins/widgets/index.php:206
+msgid "Add widgets to sidebars"
+msgstr ""
+
 #: plugins/widgets/index.php:214
-msgid "Add widgets to sidebars"
-msgstr ""
-
-#: plugins/widgets/index.php:222
 msgid "Navigation sidebar"
 msgstr ""
 
-#: plugins/widgets/index.php:228
+#: plugins/widgets/index.php:220
 msgid "Extra sidebar"
 msgstr ""
 
-#: plugins/widgets/index.php:234
+#: plugins/widgets/index.php:226
 msgid "Custom sidebar"
 msgstr ""
 
-#: plugins/widgets/index.php:240
+#: plugins/widgets/index.php:232
 msgid "Update sidebars"
 msgstr ""
 
-#: plugins/widgets/index.php:241
+#: plugins/widgets/index.php:233
 msgid "Reset sidebars"
 msgstr ""
 
-#: plugins/widgets/index.php:246
+#: plugins/widgets/index.php:238
 msgid "Use of widgets"
 msgstr ""
 
+#: plugins/widgets/index.php:239
+msgid "Widgets may be used to add various blocks of content to be displayed on your public pages. To add a widget, drag it from the Available widgets list on the left to one of the sidebars on the right of this page. You can order your widgets in a sidebar by dragging them up or down. You must update sidebars to apply your changes."
+msgstr ""
+
+#: plugins/widgets/index.php:242
+msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name."
+msgstr ""
+
+#: plugins/widgets/index.php:244
+msgid "Reset sidebars to get back to default widgets installation."
+msgstr ""
+
+#: plugins/widgets/index.php:245
+msgid "Widget templates tags"
+msgstr ""
+
 #: plugins/widgets/index.php:247
-msgid "Widgets may be used to add various blocks of content to be displayed on your public pages. To add a widget, drag it from the Available widgets list on the left to one of the sidebars on the right of this page. You can order your widgets in a sidebar by dragging them up or down. You must update sidebars to apply your changes."
+msgid "If you are allowed to edit your theme templates, you can directly add widgets as templates tags, with their own configuration."
+msgstr ""
+
+#: plugins/widgets/index.php:249
+msgid "To add a widget in your template, you need to write code like this:"
 msgstr ""
 
 #: plugins/widgets/index.php:250
-msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name."
-msgstr ""
-
-#: plugins/widgets/index.php:252
-msgid "Reset sidebars to get back to default widgets installation."
-msgstr ""
-
-#: plugins/widgets/index.php:253
-msgid "Widget templates tags"
-msgstr ""
-
-#: plugins/widgets/index.php:255
-msgid "If you are allowed to edit your theme templates, you can directly add widgets as templates tags, with their own configuration."
-msgstr ""
-
-#: plugins/widgets/index.php:257
-msgid "To add a widget in your template, you need to write code like this:"
-msgstr ""
-
-#: plugins/widgets/index.php:258
 msgid "Widget ID"
 msgstr ""
 
-#: plugins/widgets/index.php:259
+#: plugins/widgets/index.php:251
 msgid "Setting name"
 msgstr ""
 
-#: plugins/widgets/index.php:259
+#: plugins/widgets/index.php:251
 msgid "Setting value"
 msgstr ""
 
-#: plugins/widgets/index.php:262
+#: plugins/widgets/index.php:254
 msgid "Here are the following available widgets for your blog:"
 msgstr ""
 
-#: plugins/widgets/index.php:269
+#: plugins/widgets/index.php:261
 msgid "Widget ID:"
 msgstr ""
 
-#: plugins/widgets/index.php:276
+#: plugins/widgets/index.php:267
 msgid "No setting for this widget"
 msgstr ""
 
-#: plugins/widgets/index.php:285
-msgid "boolean"
-msgstr ""
-
-#: plugins/widgets/index.php:285 plugins/widgets/index.php:289
-msgid "possible values:"
-msgstr ""
-
-#: plugins/widgets/index.php:289
-msgid "listitem"
-msgstr ""
-
-#: plugins/widgets/index.php:294
-msgid "string"
-msgstr ""
-
-#: plugins/widgets/index.php:300
+#: plugins/widgets/index.php:290
 msgid "Setting name:"
 msgstr ""
 
+#: plugins/widgets/index.php:312
+msgid "No widget."
+msgstr ""
+
 #: plugins/widgets/index.php:322
-msgid "No widget."
-msgstr ""
-
-#: plugins/widgets/index.php:332
 msgid "order"
 msgstr ""
 
-#: plugins/widgets/index.php:335
+#: plugins/widgets/index.php:325
 msgid "Remove widget"
 msgstr ""
Index: locales/en/help/blog_pref.html
===================================================================
--- locales/en/help/blog_pref.html	(revision 940)
+++ locales/en/help/blog_pref.html	(revision 175)
@@ -48,8 +48,4 @@
   <dt>Blog timezone</dt>
   <dd>Defines the timezone that will be used for comments and trackbacks.</dd>
-
-  <dt>XML/RPC interface</dt>
-  <dd>Allows external client to interact with your blog via XML/RPC 
-  protocol. When activated the needed parameters to be set in your external client are displayed.</dd>
   
   <dt>Date formats</dt>
Index: locales/en/main.po
===================================================================
--- locales/en/main.po	(revision 901)
+++ locales/en/main.po	(revision 759)
@@ -546,7 +546,4 @@
 msgstr ""
 
-msgid "Entries (all types)"
-msgstr "Entries & pages"
-
 msgid "Status"
 msgstr ""
Index: locales/en/plugins.po
===================================================================
--- locales/en/plugins.po	(revision 893)
+++ locales/en/plugins.po	(revision 759)
@@ -99,7 +99,4 @@
 msgstr ""
 
-msgid "Global IP (used for all blogs)"
-msgstr ""
-
 msgid "Add"
 msgstr ""
@@ -111,10 +108,4 @@
 msgstr ""
 
-msgid "Local IPs (used only for this blog)"
-msgstr ""
-
-msgid "Global IPs (used only for this blog)"
-msgstr ""
-
 msgid "Checks sender IP address against DNSBL servers"
 msgstr ""
@@ -155,17 +146,8 @@
 msgstr ""
 
-msgid "Global word (used for all blogs)"
-msgstr ""
-
 msgid "No word in list."
 msgstr ""
 
 msgid "List of bad words"
-msgstr ""
-
-msgid "Local words (used only for this blog)"
-msgstr ""
-
-msgid "Global words (used for all blogs)"
 msgstr ""
 
Index: locales/fr/date.po
===================================================================
--- locales/fr/date.po	(revision 907)
+++ locales/fr/date.po	(revision 438)
@@ -10,8 +10,8 @@
 "Last-Translator: Olivier Meunier <olivier@dotclear.net>\n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Poedit-Language: French\n"
 
@@ -133,7 +133,4 @@
 msgstr "dimanche"
 
-msgid "%H:%M:%S:"
-msgstr "%H:%M:%S :"
-
 #~ msgid "%A, %B %e %Y"
 #~ msgstr "%A %e %B %Y"
Index: locales/fr/help/core_blog_pref.html
===================================================================
--- locales/fr/help/core_blog_pref.html	(revision 940)
+++ locales/fr/help/core_blog_pref.html	(revision 352)
@@ -58,9 +58,5 @@
   <dd>Définit le fuseau horaire qui sera utilisé pour dater les commentaires et
   trackbacks entrant sur le blog.</dd>
-
-  <dt>Interface XML/RPC</dt>
-  <dd>Permet à un client externe d'interagir avec votre blog via le protocole XML/RPC. À l'activation, 
-  les paramètres nécessaires au réglage du client externe sont affichés.</dd>
-    
+  
   <dt>Format des dates</dt>
   <dd>Indique le format de la date d'un billet sur le blog. Voir la section
Index: locales/fr/main.po
===================================================================
--- locales/fr/main.po	(revision 976)
+++ locales/fr/main.po	(revision 782)
@@ -2,22 +2,17 @@
 # Copyright (C) 2006.
 # Olivier Meunier <olivier@dotclear.net>, 2006.
-#
-# Translators:
-# Franck  <carnet.franck.paul@gmail.com>, 2011.
-# Stéphane Aulery <lkppo@free.fr>, 2012.
-# xave <xave@dotclear.net>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: Dotclear\n"
+"Project-Id-Version: Dotclear 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 09:59+0200\n"
-"PO-Revision-Date: 2012-08-13 07:13+0000\n"
+"POT-Creation-Date: 2011-11-06 18:11+0100\n"
+"PO-Revision-Date: 2011-10-13 19:26+0100\n"
 "Last-Translator: xave <xave@dotclear.net>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/dotclear/language/fr/)\n"
+"Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"X-Poedit-Language: French\n"
 
 msgid "Dotclear has been upgraded."
@@ -38,5 +33,5 @@
 #, php-format
 msgid "The e-mail was sent successfully to %s."
-msgstr "Message envoyé avec succès à %s."
+msgstr "Le message a été envoyé avec succès à %s."
 
 msgid "Your new password"
@@ -95,5 +90,5 @@
 
 msgid "This mode allows you to login without activating any of your plugins. This may be useful to solve compatibility problems"
-msgstr "\"Ce mode vous permet de vous connecter sans activer de plugins. Il peut être utile pour résoudre un problème de compatibilité"
+msgstr "Ce mode vous permet de vous connecter sans activer de plugins. Il peut être utile pour résoudre un problème de compatibilité"
 
 msgid "Disable or delete any plugin suspected to cause trouble, then log out and log back in normally."
@@ -137,5 +132,5 @@
 
 msgid "Please note that changing your blog ID may require changes in your public index.php file."
-msgstr "Veuillez noter que changer l'identifiant de votre blog peut nécessiter des modifications de votre fichier index.php public."
+msgstr "Veuillez noter que changer l'identifiant de votre blog peut nécessiter des modifications dans votre fichier index.php public."
 
 msgid "Blog name:"
@@ -194,13 +189,4 @@
 msgstr "titre"
 
-msgid "post id/title"
-msgstr "identificateur du billet/titre"
-
-msgid "post id"
-msgstr "identificateur du billet"
-
-msgid "(none)"
-msgstr "(aucun)"
-
 msgid "Title"
 msgstr "Titre"
@@ -225,5 +211,5 @@
 
 msgid "That blog Id is already in use."
-msgstr "Cet identifiant est déjà utilisé."
+msgstr "Cet identifiant est déjà utilisé"
 
 msgid "Invalid language code"
@@ -234,8 +220,8 @@
 
 msgid "Warning: except for special configurations, it is generally advised to have a trailing \"/\" in your blog URL in PATH_INFO mode."
-msgstr "Attention : sauf cas particulier, il est généralement conseillé de terminer l'URL de votre blog par \"/\" en mode PATH_INFO."
+msgstr "Attention: sauf cas particulier, il est généralement conseillé de terminer l'URL de votre blog par \"/\" en mode PATH_INFO."
 
 msgid "Warning: except for special configurations, it is generally advised to have a trailing \"?\" in your blog URL in QUERY_STRING mode."
-msgstr "Attention: sauf cas particulier, il est généralement conseillé de terminer l'URL de votre blog par \\\"?\\\" en mode QUERY_STRING."
+msgstr "Attention: sauf cas particulier, il est généralement conseillé de terminer l'URL de votre blog par \"?\" en mode QUERY_STRING."
 
 msgid "Blog has been successfully created."
@@ -261,5 +247,5 @@
 
 msgid "Blog editor name:"
-msgstr "Nom de l'auteur du blog :"
+msgstr "Nom de l'éditeur du blog :"
 
 msgid "Default language:"
@@ -275,13 +261,4 @@
 msgstr "Format d'URL des nouveaux billets :"
 
-msgid "Note title HTML tag:"
-msgstr "Balise HTML pour le titre des notes :"
-
-msgid "Note"
-msgstr "Note"
-
-msgid "Notes"
-msgstr "Notes"
-
 msgid "Enable XML/RPC interface"
 msgstr "Activer l'interface XML/RPC"
@@ -332,5 +309,5 @@
 
 msgid "Display smilies on entries and comments"
-msgstr "Afficher des émoticônes dans les billets et commentaires"
+msgstr "Afficher des émoticones dans les billets et commentaires"
 
 #, php-format
@@ -409,10 +386,10 @@
 msgstr "Aucun utilisateur"
 
+msgid "Change permissions"
+msgstr "Changer les permissions"
+
 msgid "Super administrator"
 msgstr "Super administrateur"
 
-msgid "Change permissions"
-msgstr "Changer les permissions"
-
 msgid "You can't remove default theme."
 msgstr "Vous ne pouvez pas supprimer le thème par défaut."
@@ -425,5 +402,5 @@
 
 msgid "An error occurred while downloading the file."
-msgstr "Une erreur est survenue pendant le téléchargement du fichier."
+msgstr "Une erreur est survenue lors du téléchargement du fichier."
 
 #, php-format
@@ -456,15 +433,15 @@
 
 msgid "Theme has been successfully installed."
-msgstr "Thème installé avec succès."
+msgstr "Le thème a été installé avec succès."
 
 msgid "Theme has been successfully upgraded"
-msgstr "Thème mis à jour avec succès."
+msgstr "Le thème a été mis à jour avec succès."
 
 msgid "Theme has been successfully deleted."
-msgstr "Thème supprimé avec succès."
+msgstr "Le thème a été supprimé avec succès."
 
 #, php-format
 msgid "You can find additional themes for your blog on %s."
-msgstr "Vous pouvez trouver d'autres thèmes pour votre blog sur %s."
+msgstr "Vous pouvez trouver de nouveaux thèmes pour votre blog sur %s."
 
 msgid "To install or upgrade a theme you generally just need to upload it in \"Install or upgrade a theme\" section."
@@ -512,5 +489,5 @@
 
 msgid "Theme configuration"
-msgstr "Configuration du thème"
+msgstr "Configurer le thème"
 
 msgid "back"
@@ -567,7 +544,4 @@
 msgid "Entries"
 msgstr "Billets"
-
-msgid "Entries (all types)"
-msgstr "Billets & pages"
 
 msgid "Status"
@@ -719,5 +693,5 @@
 "Bonjour,\n"
 "\n"
-"Vous avez déposé un commentaire sur :\n"
+"Vous avez déposé un commentaire sur&nbsp;\n"
 "%s\n"
 "\n"
@@ -764,11 +738,11 @@
 
 msgid "unpublish"
-msgstr "mettre hors ligne"
+msgstr "hors ligne"
 
 msgid "mark as pending"
-msgstr "mettre en attente"
+msgstr "en attente"
 
 msgid "mark as junk"
-msgstr "mettre en indésirable"
+msgstr "indésirable"
 
 msgid "Type:"
@@ -826,7 +800,4 @@
 msgstr "Actualités"
 
-msgid "(external link)"
-msgstr "(lien externe)"
-
 msgid "Dashboard"
 msgstr "Tableau de bord"
@@ -839,5 +810,5 @@
 
 msgid "This blog is removed"
-msgstr "Ce blog est retiré de la publication"
+msgstr "Ce blog est supprimé"
 
 msgid "is not defined, you should edit your configuration file."
@@ -880,5 +851,5 @@
 #, php-format
 msgid "PHP version is %s (5.0 or earlier needed)."
-msgstr "La version de PHP est %s (5.0 ou plus récente nécessaire.)"
+msgstr "La version de PHP est %s (5.0 ou plus récent nécessaire.)"
 
 msgid "Multibyte string module (mbstring) is not available."
@@ -898,5 +869,5 @@
 
 msgid "PCRE engine does not support UTF-8 strings."
-msgstr "Le moteur d'expressions rationnelles PCRE n'accepte pas les chaînes UTF-8."
+msgstr "Le moteur d'expressions rationnelles PCRE ne gère pas les chaînes UTF-8."
 
 msgid "SPL module is not available."
@@ -905,5 +876,5 @@
 #, php-format
 msgid "MySQL version is %s (4.1 or earlier needed)."
-msgstr "La version de MySQL est %s (4.1 ou plus récente nécessaire)."
+msgstr "La version de MySQL est %s (4.1 ou plus récent nécessaire)."
 
 msgid "MySQL InnoDB engine is not available."
@@ -912,5 +883,5 @@
 #, php-format
 msgid "PostgreSQL version is %s (8.0 or earlier needed)."
-msgstr "La version de PostgreSQL est %s (8.0 ou plus récente nécessaire)."
+msgstr "La version de PostgreSQL est %s (8.0 ou plus récent nécessaire)."
 
 msgid "Please set a master key (DC_MASTER_KEY) in configuration file."
@@ -956,7 +927,5 @@
 "<p>This is a comment.</p>\n"
 "<p>To delete it, log in and view your blog's comments. Then you might remove or edit it.</p>"
-msgstr ""
-"<p>Ceci est un commentaire</p>\n"
-"<p>Pour le supprimer, connectez-vous et affichez les commentaires de votre blog. Vous pourrez alors le supprimer ou le modifier.</p>"
+msgstr "<p>Ceci est un commentaire</p><p>Pour le supprimer, connectez-vous et affichez les commentaires de votre blog. Vous pourrez alors le supprimer ou le modifier.</p>"
 
 msgid "Dotclear Install"
@@ -995,5 +964,5 @@
 
 msgid "All done!"
-msgstr "C'est terminé !"
+msgstr "Terminé !"
 
 msgid "Dotclear has been successfully installed. Here is some useful information you should keep."
@@ -1016,17 +985,9 @@
 
 msgid "Installation can not be completed"
-msgstr "L'installation ne peut pas être terminée"
+msgstr "L'installation ne peut pas être menée à bien"
 
 msgid "For the said reasons, Dotclear can not be installed. Please refer to <a href=\"http://dotclear.org/documentation/2.0/admin/install\">the documentation</a> to learn how to correct the problem."
 msgstr "Pour les raisons ci-dessus, Dotclear ne peut pas être installé. Référez-vous à <a href=\"http://fr.dotclear.org/documentation/2.0/admin/install\">la documentation</a> pour savoir comment corriger le problème."
 
-#, fuzzy, php-format
-msgid "Path <strong>%s</strong> is not writable."
-msgstr "Le répertoire de cache %s n'est pas accessible en écriture."
-
-#, fuzzy
-msgid "Dotclear installation wizard could not create configuration file for you. You must change folder right or create the <strong>config.php</strong> file manually, please refer to <a href=\"http://dotclear.org/documentation/2.0/admin/install\">the documentation</a> to learn how to do this."
-msgstr "Pour les raisons ci-dessus, Dotclear ne peut pas être installé. Référez-vous à <a href=\"http://fr.dotclear.org/documentation/2.0/admin/install\">la documentation</a> pour savoir comment corriger le problème."
-
 #, php-format
 msgid "File %s does not exist."
@@ -1056,5 +1017,5 @@
 
 msgid "Please provide the following information needed to create your configuration file."
-msgstr "Merci de fournir les informations suivantes qui sont nécessaires pour créer votre fichier de configuration."
+msgstr "Merci de fournir les informations suivantes :"
 
 msgid "Database type:"
@@ -1095,11 +1056,11 @@
 
 msgid "Language has been successfully deleted."
-msgstr "Langue supprimée avec succès."
+msgstr "La langue a été supprimée avec succès."
 
 msgid "Language has been successfully installed."
-msgstr "Langue installée avec succès."
+msgstr "La langue a été installée avec succès."
 
 msgid "Language has been successfully upgraded"
-msgstr "Langue mise à jour avec succès."
+msgstr "La langue a été mise à jour avec succès."
 
 msgid "Here you can install, upgrade or remove languages for your Dotclear installation."
@@ -1155,5 +1116,5 @@
 
 msgid "The zip file does not appear to be a valid Dotclear language pack."
-msgstr "Le fichier zip ne semble pas être un fichier de langue Dotclear valide."
+msgstr "Le fichier zip ne semble pas être un fichier valide de langue Dotclear."
 
 msgid "An error occurred during language upgrade."
@@ -1164,14 +1125,14 @@
 
 msgid "By names, in ascending order"
-msgstr "Par noms croissants"
+msgstr "Par noms, croissants"
 
 msgid "By names, in descending order"
-msgstr "Par noms décroissants"
+msgstr "Par noms, décroissants"
 
 msgid "By dates, in ascending order"
-msgstr "Par dates croissantes"
+msgstr "Par dates, croissantes"
 
 msgid "By dates, in descending order"
-msgstr "Par dates décroissantes"
+msgstr "Par dates, décroissantes"
 
 msgid "Media manager"
@@ -1233,8 +1194,8 @@
 
 msgid "Please take care to publish media that you own and that are not protected by copyright."
-msgstr "Veuillez prendre garde à ne publier que des médias que vous possédez ou qui ne sont pas protégés par le droit d'auteur."
+msgstr "Veuillez prendre garde à ne publier que des médias que vous possédez ou qui ne sont pas protégés contre la copie."
 
 msgid "Choose a file:"
-msgstr "Choisir un fichier :"
+msgstr "Choisissez un fichier :"
 
 #, php-format
@@ -1276,5 +1237,5 @@
 
 msgid "Thumbnails have been successfully updated."
-msgstr "Les miniatures mises à jour avec succès."
+msgstr "Les miniatures ont été mises à jour avec succès."
 
 msgid "Insert media item"
@@ -1390,5 +1351,5 @@
 
 msgid "This will extract archive in current directory and will overwrite existing files or directory."
-msgstr "Ceci va extraire l'archive dans le répertoire actuel et écrasera les fichiers ou répertoires existants."
+msgstr "Ceci va extraire l'archive dans le répertoire actuel et va écraser les fichiers ou répertoires existants."
 
 msgid "Extract mode:"
@@ -1413,13 +1374,45 @@
 msgstr "Nouveau répertoire :"
 
-msgid "Delete this media"
-msgstr "Supprimer ce média"
-
-msgid "Are you sure to delete this media?"
-msgstr "Êtes-vous sûr de vouloir supprimer ce média ?"
-
 msgid "Change file"
 msgstr "Changer le fichier"
 
+msgid "No blog or user given."
+msgstr "Vous n'avez pas indiqué de blog ou d'utilisateur"
+
+msgid "permissions"
+msgstr "permissions"
+
+msgid "Permissions"
+msgstr "Permissions"
+
+msgid "The permissions have been successfully updated."
+msgstr "Permissions mises à jour avec succès."
+
+#, php-format
+msgid "You are about to change permissions on the following blogs for users %s."
+msgstr "Vous allez changer les permissions des utilisateurs %s pour ces blogs."
+
+msgid "Validate permissions"
+msgstr "Valider les permissions"
+
+msgid "choose a blog"
+msgstr "choisissez un blog"
+
+msgid "Choose a blog"
+msgstr "Choisissez un blog"
+
+msgid "Entries per page"
+msgstr "Billets par page"
+
+#, php-format
+msgid "Choose one or more blogs to which you want to give permissions to users %s."
+msgstr "Choisissez un ou plusieurs blogs pour lesquels les utilisateurs suivants auront des permissions : %s."
+
+msgid "Set permissions"
+msgstr "définir les permissions"
+
+msgid "select"
+msgstr "sélectionner"
+
 msgid "No content found on this plugin."
 msgstr "Aucun contenu pour cette extension."
@@ -1435,5 +1428,5 @@
 
 msgid "You don't have permissions to delete this plugin."
-msgstr "Vous n'avez pas les permissions pour effacer cette extension."
+msgstr "Vous n'avez pas les permissions pour effacer cette extension"
 
 msgid "You don't have permissions to deactivate this plugin."
@@ -1444,11 +1437,11 @@
 
 msgid "Plugin has been successfully deleted."
-msgstr "Extension supprimée avec succès."
+msgstr "L'extension a été supprimée avec succès."
 
 msgid "Plugin has been successfully installed."
-msgstr "Extension installée avec succès."
+msgstr "L'extension a été installée avec succès."
 
 msgid "Plugin has been successfully upgraded"
-msgstr "Extension mise à jour avec succès."
+msgstr "L'extension a été mise à jour avec succès."
 
 msgid "Plugins add new functionalities to Dotclear. Here you can activate or deactivate installed plugins."
@@ -1510,7 +1503,4 @@
 msgstr "Pour activer cette fonction, donnez un accès en écriture à votre répertoire d'extensions."
 
-msgid "Plugin from official distribution"
-msgstr "Extension de la distribution officielle"
-
 msgid "Add a link"
 msgstr "Ajouter un lien"
@@ -1538,8 +1528,8 @@
 
 msgid "Search"
-msgstr "Recherche"
+msgstr "Rechercher"
 
 msgid "cancel"
-msgstr "annuler"
+msgstr "Annuler"
 
 msgid "This entry does not exist."
@@ -1565,5 +1555,5 @@
 
 msgid "Attachment has been successfully removed."
-msgstr "Annexe retirée avec succès."
+msgstr "Pièce jointe retirée avec succès."
 
 msgid "Comment has been successfully created."
@@ -1600,16 +1590,4 @@
 msgstr "Convertir en XHTML"
 
-msgid "Warning: Comments are not more accepted for this entry."
-msgstr "Attention : les commentaires ne sont plus acceptés pour ce billet."
-
-msgid "Warning: Comments are not accepted on this blog."
-msgstr "Attention : les commentaires ne sont pas acceptés sur ce blog."
-
-msgid "Warning: Trackbacks are not more accepted for this entry."
-msgstr "Attention : les rétroliens ne sont plus acceptés pour ce billet."
-
-msgid "Warning: Trackbacks are not accepted on this blog."
-msgstr "Attention : les rétroliens ne sont pas acceptés sur ce blog."
-
 msgid "Selected entry"
 msgstr "Billet sélectionné"
@@ -1667,14 +1645,14 @@
 
 msgid "This attachment does not exist"
-msgstr "Cette annexe n'existe pas"
+msgstr "Cette pièce jointe n'existe pas"
 
 msgid "Remove attachment"
-msgstr "Supprimer l'annexe"
+msgstr "Supprimer la pièce jointe"
 
 msgid "Attachment"
-msgstr "Annexe"
+msgstr "Pièce jointe"
 
 msgid "Are you sure you want to remove this attachment?"
-msgstr "Êtes-vous certain de vouloir supprimer cette annexe ?"
+msgstr "Êtes-vous certain de vouloir supprimer cette pièce jointe ?"
 
 msgid "selected"
@@ -1729,7 +1707,4 @@
 msgstr "Langue :"
 
-msgid "Entries per page"
-msgstr "Billets par page"
-
 msgid "Selected entries action:"
 msgstr "Action sur les billets sélectionnés :"
@@ -1739,5 +1714,5 @@
 
 msgid "Change category for entries"
-msgstr "Changer la catégorie des billets"
+msgstr "Changer de catégorie pour les billets"
 
 msgid "Change author for entries"
@@ -1751,5 +1726,5 @@
 
 msgid "If you want to change your email or password you must provide your current password."
-msgstr "Si vous voulez changer votre adresse email ou votre mot de passe, vous devez indiquer votre mot de passe."
+msgstr "Si vous voulez changer votre adresse email ou votre mot de passe, vous devez indiquer votre mot de passe actuel."
 
 msgid "No favorite selected"
@@ -1807,8 +1782,4 @@
 msgstr "Activer l'interface avancée du gestionnaire de médias"
 
-#, fuzzy
-msgid "Hide My favorites menu"
-msgstr "Mes favoris"
-
 msgid "Iconset:"
 msgstr "Jeu d'icônes :"
@@ -1833,5 +1804,5 @@
 
 msgid "Display documentation links"
-msgstr "Display documentation links"
+msgstr "Afficher les liens de documentation"
 
 msgid "Display Dotclear news"
@@ -1940,7 +1911,4 @@
 msgstr "Mise à jour de Dotclear"
 
-msgid "Manage backup files"
-msgstr "Gestion des fichiers de sauvegarde"
-
 #, php-format
 msgid "Unable to delete file %s"
@@ -1949,5 +1917,5 @@
 #, php-format
 msgid "Downloaded Dotclear archive seems to be corrupted. Try <a %s>download it</a> again."
-msgstr "L'archive de Dotclear téléchargée semble être corrompue. Essayer de la <a %s>télécharger</a> à nouveau."
+msgstr "L'archive téléchargée de Dotclear semble être corrompue. Essayer de la <a %s>télécharger</a> à nouveau."
 
 msgid "The following files of your Dotclear installation have been modified so we won't try to update your installation. Please try to <a href=\"http://dotclear.org/download\">update manually</a>."
@@ -1959,5 +1927,5 @@
 
 msgid "The following files of your Dotclear installation cannot be written. Please fix this or try to <a href=\"http://dotclear.org/download\">update manually</a>."
-msgstr "Les fichiers suivants de votre installation de Dotclear ne peuvent pas être écrits. Veuillez corriger la situation ou <a href=\"http://fr.dotclear.org/download\">mettre à jour manuellement</a>."
+msgstr "Les fichiers suivants de votre installation de Dotclear ne peuvent pas être écrits. Veuillez corriger ceci ou <a href=\"http://fr.dotclear.org/download\">mettre à jour manuellement</a>."
 
 msgid "No newer Dotclear version available."
@@ -1981,5 +1949,5 @@
 
 msgid "Please note that reverting your Dotclear version may have some unwanted side-effects. Consider reverting only if you experience strong issues with this new version."
-msgstr "Merci de noter que rétablir votre version de Dotclear peut avoir des effets indésirables. N'envisagez ceci que si vous rencontrez d'importantes difficultés avec cette nouvelle version."
+msgstr "Merci de noter que rétablir votre version de Dotclear peut avoir des effets non désirés. N'envisagez ceci que si vous rencontrez d'importantes difficultés avec cette nouvelle version."
 
 #, php-format
@@ -2027,13 +1995,10 @@
 msgstr "Enregistrer et créer un nouveau"
 
-msgid "Permissions"
-msgstr "Permissions"
+msgid "No permissions."
+msgstr "Aucune permission."
 
 msgid "Add new permissions"
 msgstr "Ajouter de nouvelles permissions"
 
-msgid "No permissions."
-msgstr "Aucune permission."
-
 msgid "Username"
 msgstr "Identifiant"
@@ -2051,13 +2016,10 @@
 msgstr "Nombre de billets"
 
-msgid "Set permissions"
-msgstr "Définir les permissions"
+msgid "users"
+msgstr "utilisateurs"
 
 msgid "User has been successfully removed."
 msgstr "Utilisateur supprimé avec succès."
 
-msgid "The permissions have been successfully updated."
-msgstr "Permissions mises à jour avec succès."
-
 msgid "Create a new user"
 msgstr "Créer un nouvel utilisateur"
@@ -2069,24 +2031,4 @@
 msgstr "Action sur les utilisateurs sélectionnés :"
 
-msgid "No blog or user given."
-msgstr "Vous n'avez pas indiqué de blog ou d'utilisateur"
-
-msgid "Not delete yourself."
-msgstr ""
-
-#, php-format
-msgid "Choose one or more blogs to which you want to give permissions to users %s."
-msgstr "Choisissez un ou plusieurs blogs pour lesquels les utilisateurs suivants auront des permissions : %s."
-
-msgid "select"
-msgstr "sélectionner"
-
-#, php-format
-msgid "You are about to change permissions on the following blogs for users %s."
-msgstr "Vous allez changer les permissions des utilisateurs %s pour ces blogs."
-
-msgid "Validate permissions"
-msgstr "Valider les permissions"
-
 msgid "Blog:"
 msgstr "Blog :"
@@ -2098,12 +2040,4 @@
 msgstr "Blogs :"
 
-#, fuzzy
-msgid "Go to the content"
-msgstr "Voir ce billet sur le site"
-
-#, fuzzy
-msgid "Go to the menu"
-msgstr "Aller sur le site"
-
 msgid "Go to site"
 msgstr "Aller sur le site"
@@ -2187,5 +2121,5 @@
 #, php-format
 msgid "Are you sure you want to remove attachment \"%s\"?"
-msgstr "Êtes-vous certain de vouloir supprimer l'annexe \"%s\" ?"
+msgstr "Êtes-vous certain de vouloir supprimer la pièce jointe \"%s\" ?"
 
 #, php-format
@@ -2397,5 +2331,5 @@
 
 msgid "No user"
-msgstr "Aucun utilisateur"
+msgstr "Pas d'utilisateur"
 
 msgid "admin"
@@ -2406,5 +2340,5 @@
 
 msgid "Database error"
-msgstr "Erreur de base de données"
+msgstr "Erreur de base de données :"
 
 msgid "There seems to be no Session table in your database. Is Dotclear completly installed?"
@@ -2465,8 +2399,4 @@
 msgstr "Cette catégorie n'est pas vide."
 
-#, fuzzy
-msgid "You are not allowed to reset categories order"
-msgstr "Vous n'êtes pas autorisé à supprimer des catégories"
-
 msgid "Category URL must be unique."
 msgstr "L'URL de chaque catégorie doit être unique."
@@ -2485,5 +2415,5 @@
 
 msgid "No such entry ID"
-msgstr "Identifiant de billet inconnu"
+msgstr "Identifiant du billet inconnu"
 
 msgid "You are not allowed to edit this entry"
@@ -2518,5 +2448,5 @@
 
 msgid "No such comment ID"
-msgstr "Identifiant de commentaire inconnu"
+msgstr "Identifiant du commentaire inconnu"
 
 msgid "You are not allowed to update this comment"
@@ -2533,8 +2463,8 @@
 
 msgid "You must provide a comment"
-msgstr "Vous devez écrire un commentaire"
+msgstr "Vous devez indiquer un commentaire"
 
 msgid "You must provide an author name"
-msgstr "Vous devez indiquer un nom"
+msgstr "Vous devez indiquer un nom d'auteur"
 
 msgid "Email address is not valid."
@@ -2548,5 +2478,5 @@
 
 msgid "removed"
-msgstr "retiré"
+msgstr "supprimé"
 
 msgid "You are not an administrator"
@@ -2601,12 +2531,12 @@
 
 msgid "Embedded Audio Player"
-msgstr "Lecteur audio intégré"
+msgstr "Fichier audio intégré"
 
 msgid "Embedded Video Player"
-msgstr "Lecteur vidéo intégré"
+msgstr "Fichier vidéo intégré"
 
 #, php-format
 msgid "%s: in [%s] and [%s]"
-msgstr "%s : dans [%s] et [%s]"
+msgstr "%s: dans [%s] et [%s]"
 
 msgid "Empty module zip file."
@@ -2614,5 +2544,5 @@
 
 msgid "The zip file does not appear to be a valid Dotclear module."
-msgstr "Le fichier zip ne semble pas être un fichier de module Dotclear valide."
+msgstr "Le fichier zip ne semble pas être un fichier valide de module Dotclear."
 
 msgid "An error occurred during module deletion."
@@ -2640,5 +2570,5 @@
 #, php-format
 msgid "Invalid setting dcNamespace: %s"
-msgstr "Espace de nom du paramètre invalide : %s"
+msgstr "Espace de nommage du paramètre invalide : %s"
 
 msgid "Unable to retrieve settings:"
@@ -2650,15 +2580,15 @@
 
 msgid "No namespace specified"
-msgstr "Aucun espace de nom spécifié"
+msgstr "Aucun espace de nommage spécifié"
 
 msgid "Unable to retrieve workspaces:"
-msgstr "Impossible d'obtenir les espaces de travail :"
+msgstr "Impossible d'obtenir les espaces de travail :"
 
 msgid "Unable to retrieve namespaces:"
-msgstr "Impossible d'obtenir les espaces de nom :"
+msgstr "Impossible d'obtenir les espaces de nommage :"
 
 #, php-format
 msgid "Invalid setting namespace: %s"
-msgstr "Espace de nom du paramètre invalide : %s"
+msgstr "Espace de nommage du paramètre invalide : %s"
 
 #, php-format
@@ -2681,5 +2611,5 @@
 
 msgid "No file to download"
-msgstr "Aucun fichier à télécharger"
+msgstr "Aucun fichier à télécharger."
 
 msgid "Root directory is not writable."
@@ -2690,5 +2620,5 @@
 
 msgid "Archive not found."
-msgstr "Archive introuvable."
+msgstr "L'archive n'a pas été trouvée."
 
 msgid "Unable to read current digests file."
@@ -2709,8 +2639,8 @@
 #, php-format
 msgid "Invalid dcWorkspace: %s"
-msgstr "Espace de travail de la préférence invalide : %s"
+msgstr "Espace de travail de la préférence invalide : %s"
 
 msgid "Unable to retrieve prefs:"
-msgstr "Impossible d'obtenir les préférences :"
+msgstr "Impossible d'obtenir les préférences :"
 
 #, php-format
@@ -2739,6 +2669,7 @@
 msgstr "Impossible d'ouvrir le fichier."
 
+# pas compris
 msgid "Not an uploaded file."
-msgstr "N'est pas un fichier déposé."
+msgstr "Pas un fichier déposé."
 
 msgid "The uploaded file exceeds the maximum file size allowed."
@@ -2785,4 +2716,5 @@
 msgstr "L'envoi de ce fichier n'est pas autorisé."
 
+# "en jail" ? c'est du geek ?
 msgid "Destination directory is not in jail."
 msgstr "Le répertoire cible n'est pas en jail."
@@ -2798,6 +2730,7 @@
 
 msgid "Source file does not exist."
-msgstr "Le fichier source n'existe pas."
-
+msgstr "Le fichier source n'existe pas"
+
+# geek ?
 msgid "File is not in jail."
 msgstr "Le fichier n'est pas en jail."
@@ -2812,4 +2745,5 @@
 msgstr "Ce fichier ne peut pas être supprimé."
 
+# décidément ! mais que veut dire "jail" ?
 msgid "Directory is not in jail."
 msgstr "Le répertoire n'est pas en jail."
@@ -2855,30 +2789,96 @@
 #, php-format
 msgid "<p>This either means that the username and password information in your <strong>config.php</strong> file is incorrect or we can't contact the database server at \"<em>%s</em>\". This could mean your host's database server is down.</p> <ul><li>Are you sure you have the correct username and password?</li><li>Are you sure that you have typed the correct hostname?</li><li>Are you sure that the database server is running?</li></ul><p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href=\"http://forum.dotclear.net/\">Dotclear Support Forums</a>.</p>"
-msgstr "<p>Cela signifie soit que les informations d'identifiant ou de mot de passe de votre fichier <strong>config.php</strong> sont incorrects, soit que nous ne pouvons pas contacter le serveur de base de données à l'adresse \"<em>%s</em>\". Cela peut vouloir dire que le serveur en question est éteint.</p> <ul><li>Êtes-vous sûr que l'identifiant et le mot de passe sont corrects ?</li><li>Êtes-vous sûr d'avoir entré le bon nom de serveur ?</li><li> Êtes-vous sûr que le serveur fonctionne ?</li></ul><p>Si vous n'êtes pas sûr de la signification de ces termes, vous devriez probablement contacter votre hébergeur. Si vous avez besoin d'une aide supplémentaire, vous pouvez vous rendre sur <a href=\"http://forum.dotclear.net/\">le forum d'entraide Dotclear</a>.</p>"
+msgstr "<p>Cela signifie soit que les informations d'identifiant ou de mot de passe de votre fichier <strong>config.php</strong> sont incorrects, soit que nous ne pouvons pas contacter le serveur de base de données à l'adresse \"<em>%s</em>\". Cela peut vouloir dire que le serveur en question est éteint.</p> <ul><li>Êtes-vous sûr que l'identifiant et le mot de passe sont corrects ?</li><li>Êtes-vous sûr d'avoir entré le bon nom de serveur ?</li><li> Êtes-vous sûr que le serveur fonctionne ?</li></ul><p>S vous n'êtes pas sûr de la signification de ces termes, vous devriez probablement contacter votre hébergeur. Si vous avez besoin d'une aide supplémentaire, vous pouvez vous rendre sur <a href=\"http://forum.dotclear.net/\">le forum d'entraide Dotclear</a>.</p>"
 
 msgid "The following error was encountered while trying to read the database:"
 msgstr "L'erreur suivante a été rencontrée lors de la tentative d'accès à la base de données :"
 
-#~ msgid "permissions"
-#~ msgstr "permissions"
-
-#~ msgid "choose a blog"
-#~ msgstr "choisissez un blog"
-
-#~ msgid "Choose a blog"
-#~ msgstr "Choisissez un blog"
-
-#~ msgid "users"
-#~ msgstr "utilisateurs"
-
-msgid "Default image insertion attributes"
-msgstr "Attributs par défaut pour l'insertion d'image"
-
-msgid "The current blog cannot be deleted"
-msgstr "Le blog courant ne peut être détruit"
-
-msgid "Only superadmin can delete a blog"
-msgstr "Seul un superadministrateur peut supprimer un blog"
-
-msgid "Invalid publication date"
-msgstr "Date de publication invalide"
+#~ msgid "Blog themes"
+#~ msgstr "Thèmes du blog"
+
+#~ msgid "Pages"
+#~ msgstr "Pages"
+
+#~ msgid "Blogroll"
+#~ msgstr "Liens / Blogroll"
+
+#~ msgid "update thumbnails"
+#~ msgstr "mettre à jour les miniatures"
+
+#~ msgid "insert"
+#~ msgstr "insérer"
+
+#~ msgid "View entry"
+#~ msgstr "Voir le billet"
+
+#~ msgid "Go to this page on the site"
+#~ msgstr "Voir cette page sur le site"
+
+#~ msgid "Attachments"
+#~ msgstr "Pièces jointes"
+
+#~ msgid "remove"
+#~ msgstr "supprimer"
+
+#~ msgid "Remove"
+#~ msgstr "Supprimer"
+
+#~ msgid "No attachment."
+#~ msgstr "Aucune pièce jointe"
+
+#~ msgid "Add files to this entry"
+#~ msgstr "Ajouter un fichier au billet"
+
+#~ msgid "User:"
+#~ msgstr "Utilisateur :"
+
+#~ msgid "Logout"
+#~ msgstr "Déconnexion"
+
+#~ msgid "login"
+#~ msgstr "login"
+
+#~ msgid "filter"
+#~ msgstr "filtre"
+
+#~ msgid "User preferences"
+#~ msgstr "Préférences utilisateur"
+
+#~ msgid "Documentation"
+#~ msgstr "Documentation"
+
+#~ msgid "View site"
+#~ msgstr "Voir le site"
+
+#~ msgid "medium"
+#~ msgstr "moyenne"
+
+#~ msgid "small"
+#~ msgstr "petite"
+
+#~ msgid "thumbnail"
+#~ msgstr "miniature"
+
+#~ msgid "square"
+#~ msgstr "carrée"
+
+#~ msgid "The file <strong>%s</strong> already exists. If you need to reset any of the configuration items in this file, please delete it first or you may <a href=\"%s\">continue to install</a>."
+#~ msgstr "Le fichier <strong>%s</strong> existe déjà. Pour réinitialiser votre configuration, supprimez d'abord ce fichier ou bien <a href=\"%s\">continuez l'installation</a>."
+
+#~ msgid "Login:"
+#~ msgstr "Login :"
+
+#~ msgid "Login and password"
+#~ msgstr "Identifiant et mot de passe"
+
+#~ msgid "User ID"
+#~ msgstr "Identifiant utilisateur"
+
+#~ msgid "Name"
+#~ msgstr "Nom"
+
+#~ msgid "Add this page to my favorites"
+#~ msgstr "Ajouter cette page à mes favoris"
+
+#~ msgid "Modify numbers in fields to change favorites order."
+#~ msgstr "Modifiez les nombres dans les champs pour changer l'ordre des favoris."
Index: locales/fr/plugins.po
===================================================================
--- locales/fr/plugins.po	(revision 974)
+++ locales/fr/plugins.po	(revision 782)
@@ -2,30 +2,17 @@
 # Copyright (C) 2006.
 # Olivier Meunier <olivier@dotclear.net>, 2006.
-#
-# Translators:
-# Franck  <carnet.franck.paul@gmail.com>, 2011.
-# Stéphane Aulery <lkppo@free.fr>, 2012.
-# xave <xave@dotclear.net>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: Dotclear\n"
+"Project-Id-Version: Dotclear 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-13 09:59+0200\n"
-"PO-Revision-Date: 2012-11-06 10:04+0100\n"
+"POT-Creation-Date: 2011-11-06 18:11+0100\n"
+"PO-Revision-Date: \n"
 "Last-Translator: Franck Paul <carnet.franck.paul@gmail.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/dotclear/language/"
-"fr/)\n"
+"Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-
-msgid "about:config"
-msgstr "about:config"
-
-msgid "Manage every blog configuration directive"
-msgstr "Gestion des directives de configuration des blogs"
+"X-Poedit-Language: French\n"
 
 msgid "no"
@@ -36,11 +23,11 @@
 
 msgid "Configuration successfully updated"
-msgstr "La configuration a été mise à jour avec succès"
+msgstr "Configuration mise à jour avec succès"
 
 msgid "Settings definition successfully updated"
-msgstr "Les réglages ont été enregistrés avec succès"
+msgstr "Définition des paramètres mise à jour avec succès"
 
 msgid "blog settings"
-msgstr "Réglages du blog"
+msgstr "paramètres du blog"
 
 msgid "Value"
@@ -51,33 +38,30 @@
 
 msgid "Goto:"
-msgstr "Aller à : "
+msgstr "Aller à :"
 
 msgid "Ok"
-msgstr "Ok"
+msgstr "Valider"
 
 msgid "global settings"
-msgstr "Réglages généraux"
-
-msgid "Akismet"
-msgstr "Akismet"
+msgstr "paramètres globaux"
 
 msgid "Akismet spam filter"
-msgstr "Filtre d'indésirable Akismet"
+msgstr "Filtre de spam Akismet"
 
 #, php-format
 msgid "Filtered by %s."
-msgstr "Filtré par %s."
+msgstr "Filtré par %s"
 
 msgid "Akismet API key:"
-msgstr "Clé API Akismet :"
+msgstr "Clé de l'interface Akismet :"
 
 msgid "API key verified"
-msgstr "Clé API vérifiée"
+msgstr "Clé vérifiée"
 
 msgid "API key not verified"
-msgstr "Clé API non vérifiée"
+msgstr "Clé non vérifiée"
 
 msgid "Get your own API key"
-msgstr "Obtenez votre propre clé API"
+msgstr "Obtenez votre clé Akismet"
 
 msgid "Antispam"
@@ -85,18 +69,15 @@
 
 msgid "Delete junk comments older than"
-msgstr "Supprimer les commentaires indésirables âgés de plus de"
+msgstr "Supprimer les commentaires indésirables après"
 
 msgid "days"
 msgstr "jours"
 
-msgid "Generic antispam plugin for Dotclear"
-msgstr "Antispam générique pour Dotclear"
-
 msgid "IP Blacklist / Whitelist Filter"
-msgstr "Filtre de liste noire et blanche d'IP"
+msgstr "Liste noire / Liste blanche IP"
 
 #, php-format
 msgid "Filtered by %1$s with rule %2$s."
-msgstr "Flitré par %1$s avec la règle %2$s."
+msgstr "Filtré par %1$s avec la règle %2$s."
 
 msgid "IP address has been successfully added."
@@ -104,5 +85,5 @@
 
 msgid "IP addresses have been successfully removed."
-msgstr "L'adresse IP a été retirée avec succès."
+msgstr "L'adresse IP a été supprimée avec succès."
 
 msgid "Blacklist"
@@ -113,52 +94,43 @@
 
 msgid "Add an IP address: "
-msgstr "Ajouter une adresse IP : "
+msgstr "Ajouter une adresse IP"
 
 msgid "Global IP"
 msgstr "IP globale"
 
-msgid "Global IP (used for all blogs)"
-msgstr "IP globale (valable pour tous les blogs)"
-
 msgid "Add"
 msgstr "Ajouter"
 
 msgid "No IP address in list."
-msgstr "Pas d'adresse IP dans la liste."
+msgstr "Aucune adresse IP dans la liste."
 
 msgid "IP list"
-msgstr "Liste IP"
-
-msgid "Local IPs (used only for this blog)"
-msgstr "IP locales (valables seulement pour ce blog)"
-
-msgid "Global IPs (used for all blogs)"
-msgstr "IP globales (valables pour tous les blogs)"
+msgstr "Liste d'IP"
 
 msgid "Checks sender IP address against DNSBL servers"
-msgstr "Contrôle l'adresse IP de l'émetteur via les serveurs DNSBL"
+msgstr "Vérifie l'adresse IP de l'auteur sur des serveurs DNSBL"
 
 #, php-format
 msgid "Filtered by %1$s with server %2$s."
-msgstr "Filtré par %1$s par le serveur %2$s."
+msgstr "Filtré par %1$s avec le serveur %2$s."
 
 msgid "IP Lookup servers"
-msgstr "Serveurs de contrôle d'IP"
+msgstr "Serveurs de résolution d'IP"
 
 msgid "Add here a coma separated list of servers."
-msgstr "Ajouter ici la liste des serveurs séparés par des virgules."
+msgstr "Ajoutez ici une liste de serveurs, séparés par des virgules."
 
 msgid "Checks links in comments against surbl.org"
-msgstr "Contrôle les liens des commentaires via surbl.org"
+msgstr "Vérifie les liens dans les commentaires sur surbl.org"
 
 msgid "Words Blacklist"
-msgstr "Liste de mots interdits"
+msgstr "Liste de termes interdits"
 
 #, php-format
 msgid "Filtered by %1$s with word %2$s."
-msgstr "Filtré par %1$s à cause du mot %2$s."
+msgstr "Filtré par %1$s avec le terme %2$s."
 
 msgid "Words have been successfully added."
-msgstr "Les mots ont été ajoutés avec succès."
+msgstr "Les mots ont été ajouté avec succès."
 
 msgid "Word has been successfully added."
@@ -166,15 +138,12 @@
 
 msgid "Words have been successfully removed."
-msgstr "Les mots ont été retirés avec succès."
-
-msgid "Add a word "
-msgstr "Ajouter un mot "
+msgstr "Les mots ont été supprimés avec succès."
+
+msgid "Add a word"
+msgstr "Ajouter un mot"
 
 msgid "Global word"
 msgstr "Mot global"
 
-msgid "Global word (used for all blogs)"
-msgstr "Mot global (valable pour tous les blogs)"
-
 msgid "No word in list."
 msgstr "Aucun mot dans la liste."
@@ -183,21 +152,15 @@
 msgstr "Liste de mots interdits"
 
-msgid "Local words (used only for this blog)"
-msgstr "Mots locaux (valables seulement pour ce blog)"
-
-msgid "Global words (used for all blogs)"
-msgstr "Mots globaux (valables pour tous les blogs)"
-
 msgid "Delete selected words"
 msgstr "Supprimer les mots sélectionnés"
 
 msgid "Create default wordlist"
-msgstr "Créer une liste de mots par défaut"
+msgstr "Créer une liste par défaut"
 
 msgid "This word exists"
-msgstr "Ce mot est déjà présent"
+msgstr "Ce mot existe"
 
 msgid "No description"
-msgstr "Pas de description"
+msgstr "Aucune description"
 
 #, php-format
@@ -206,16 +169,16 @@
 
 msgid "Unknown filter."
-msgstr "Filtre inconnu."
+msgstr "Filtre inconnu"
 
 msgid "This comment is a spam:"
-msgstr "Ce commentaire est indésirable :"
+msgstr "Ce commentaire est un indésirable :"
 
 #, php-format
 msgid "(including %d spam comment)"
-msgstr "(incluant %d commentaire indésirable)"
+msgstr "(dont %d commentaire indésirable)"
 
 #, php-format
 msgid "(including %d spam comments)"
-msgstr "(incluant %d commentaires indésirables)"
+msgstr "(dont %d commentaires indésirables)"
 
 msgid "Spam moderation"
@@ -223,21 +186,21 @@
 
 msgid "Spam"
-msgstr "Indésirable"
+msgstr "Spam"
 
 msgid "Ham"
-msgstr "Désirable"
+msgstr "Non spam"
 
 msgid "Filter does not exist."
-msgstr "Ce filtre n'existe pas."
+msgstr "Le filtre n'existe pas."
 
 msgid "Filter has no user interface."
-msgstr "Ce filtre n'a pas de réglages."
+msgstr "Le filtre n'a pas d'interface utilisateur."
 
 #, php-format
 msgid "%s configuration"
-msgstr "configuration %s"
+msgstr "%s configuration"
 
 msgid "Information"
-msgstr "Information"
+msgstr "Informations"
 
 msgid "Spam comments have been successfully deleted."
@@ -245,8 +208,8 @@
 
 msgid "Junk comments:"
-msgstr "Commentaires indésirables :"
+msgstr "Commentaires indésirables :"
 
 msgid "Published comments:"
-msgstr "Commentaires publiés :"
+msgstr "Commentaires publiés :"
 
 msgid "Delete all spams"
@@ -255,7 +218,5 @@
 #, php-format
 msgid "All spam comments older than %s day(s) will be automatically deleted."
-msgstr ""
-"Tous les commentaires indésirables âgés d'au moins %s jour(s) seront "
-"supprimés automatiquement."
+msgstr "Tous les indésirables de plus de %s jour(s) seront automatiquement supprimés."
 
 msgid "You can modify this duration in "
@@ -266,8 +227,8 @@
 
 msgid "Filters configuration has been successfully saved."
-msgstr "La configurations des filtres a été enregistrée avec succès."
+msgstr "La configuration des filtres a été enregistrée avec succès."
 
 msgid "Available spam filters"
-msgstr "Filtres d'indésirable disponibles"
+msgstr "Filtres disponibles"
 
 msgid "Order"
@@ -278,5 +239,5 @@
 
 msgid "Auto Del."
-msgstr "Auto suppr."
+msgstr "Suppr. Auto"
 
 msgid "Filter name"
@@ -299,5 +260,5 @@
 
 msgid "Attachments"
-msgstr "Annexes"
+msgstr "Fichiers attachés"
 
 msgid "remove"
@@ -310,15 +271,9 @@
 msgstr "Ajouter des fichiers à la page"
 
-msgid "Manage post attachments"
-msgstr "Gestion des fichiers attachés"
-
 msgid "Blogroll"
-msgstr "Liste des liens"
+msgstr "Liens / Blogroll"
 
 msgid "manage blogroll"
-msgstr "Gestion de la liste des liens"
-
-msgid "Manage your blogroll"
-msgstr "Gestion de votre liste de liens"
+msgstr "gérer la liste de liens"
 
 msgid "Links"
@@ -328,21 +283,12 @@
 msgstr "Toutes les catégories"
 
-msgid "Display on:"
-msgstr "Afficher :"
-
 msgid "Home page only"
-msgstr "En page d'accueil seulement"
-
-msgid "All pages"
-msgstr "Sur toutes les pages"
-
-msgid "Except on home page"
-msgstr "Sauf en page d'accueil"
+msgstr "Page d'accueil uniquement"
 
 msgid "You must provide a link title"
-msgstr "Vous devez fournir un titre de lien"
+msgstr "Vous devez indiquer un titre de lien"
 
 msgid "You must provide a link URL"
-msgstr "Vous devez fournir une URL de lien"
+msgstr "Vous devez indiquer une URL"
 
 msgid "You need to provide a XBEL or OPML file."
@@ -350,20 +296,20 @@
 
 msgid "File is not in XML format."
-msgstr "Ce fichier n'est pas au format XML."
+msgstr "Le fichier n'est pas au format XML."
 
 msgid "No such link or title"
-msgstr "Pas de lien ou de titre"
+msgstr "Lien ou catégorie inexistant"
 
 msgid "Return to blogroll"
-msgstr "Retourner à la liste des liens"
+msgstr "Retour à la liste des liens"
 
 msgid "Category has been successfully updated"
-msgstr "La catégorie a été mise à jour avec succès"
+msgstr "Catégorie mise à jour avec succès"
 
 msgid "Edit category"
-msgstr "Modifier la catégorie"
+msgstr "Modifier une catégorie"
 
 msgid "Link has been successfully updated"
-msgstr "Le lien a été mis à jour avec succès"
+msgstr "Lien mis à jour avec succès"
 
 msgid "Edit link"
@@ -374,77 +320,77 @@
 
 msgid "_xfn_Me"
-msgstr "_xfn_Me"
+msgstr "Moi"
 
 msgid "_xfn_Another link for myself"
-msgstr "_xfn_Another link for myself"
+msgstr "Autre lien m'appartenant"
 
 msgid "_xfn_Friendship"
-msgstr "_xfn_Friendship"
+msgstr "Amitié"
 
 msgid "_xfn_Contact"
-msgstr "_xfn_Contact"
+msgstr "Contact"
 
 msgid "_xfn_Acquaintance"
-msgstr "_xfn_Acquaintance"
+msgstr "Connaissance"
 
 msgid "_xfn_Friend"
-msgstr "_xfn_Friend"
+msgstr "Ami(e)"
 
 msgid "_xfn_Physical"
-msgstr "_xfn_Physical"
+msgstr "Physique"
 
 msgid "_xfn_Met"
-msgstr "_xfn_Met"
+msgstr "Rencontré(e)"
 
 msgid "_xfn_Professional"
-msgstr "_xfn_Professional"
+msgstr "Professionnel"
 
 msgid "_xfn_Co-worker"
-msgstr "_xfn_Co-worker"
+msgstr "Camarade de travail"
 
 msgid "_xfn_Colleague"
-msgstr "_xfn_Colleague"
+msgstr "Collègue"
 
 msgid "_xfn_Geographical"
-msgstr "_xfn_Geographical"
+msgstr "Géographique"
 
 msgid "_xfn_Co-resident"
-msgstr "_xfn_Co-resident"
+msgstr "Colocataire"
 
 msgid "_xfn_Neighbor"
-msgstr "_xfn_Neighbor"
+msgstr "Voisin(e)"
 
 msgid "_xfn_Family"
-msgstr "_xfn_Family"
+msgstr "Famille"
 
 msgid "_xfn_Child"
-msgstr "_xfn_Child"
+msgstr "Enfant"
 
 msgid "_xfn_Parent"
-msgstr "_xfn_Parent"
+msgstr "Parent"
 
 msgid "_xfn_Sibling"
-msgstr "_xfn_Sibling"
+msgstr "Frère/Soeur"
 
 msgid "_xfn_Spouse"
-msgstr "_xfn_Spouse"
+msgstr "Époux/Épouse"
 
 msgid "_xfn_Kin"
-msgstr "_xfn_Kin"
+msgstr "Famille"
 
 msgid "_xfn_Romantic"
-msgstr "_xfn_Romantic"
+msgstr "Romantique"
 
 msgid "_xfn_Muse"
-msgstr "_xfn_Muse"
+msgstr "Muse"
 
 msgid "_xfn_Crush"
-msgstr "_xfn_Crush"
+msgstr "Bluette"
 
 msgid "_xfn_Date"
-msgstr "_xfn_Date"
+msgstr "Petit(e) ami(e)"
 
 msgid "_xfn_Sweetheart"
-msgstr "_xfn_Sweetheart"
+msgstr "Ami(e)"
 
 msgid "Nothing to import"
@@ -452,5 +398,5 @@
 
 msgid "Import operation cancelled."
-msgstr "L'importation a été annulée."
+msgstr "Importation annulée."
 
 msgid "Items order has been successfully updated"
@@ -458,14 +404,14 @@
 
 msgid "Items have been successfully removed."
-msgstr "Les éléments ont été retirés avec succès."
+msgstr "Éléments supprimés avec succès."
 
 msgid "Link has been successfully created."
-msgstr "Le lien a été créé avec succès."
+msgstr "Lien créé avec succès."
 
 msgid "category has been successfully created."
-msgstr "La catégorie a été créée avec succès."
+msgstr "Catégorie mise à jour avec succès."
 
 msgid "links have been successfully imported."
-msgstr "Les liens ont été importés avec succès."
+msgstr "Liens importés avec succès."
 
 msgid "URL"
@@ -482,5 +428,5 @@
 
 msgid "Are you sure you want to delete selected links?"
-msgstr "Êtes-vous sûr de vouloir supprimer ces liens ?"
+msgstr "Êtes-vous certain de vouloir supprimer les liens sélectionnés ?"
 
 msgid "The link list is empty."
@@ -497,14 +443,8 @@
 
 msgid "OPML or XBEL File:"
-msgstr "Fichier OPML ou XBEL :"
+msgstr "Fichier OPML ou XBEL :"
 
 msgid "Import"
-msgstr "Importation"
-
-msgid "Blowup Config"
-msgstr "Configuration de Blowup"
-
-msgid "Configure your Blowup Theme"
-msgstr "Configurer votre thème Blowup"
+msgstr "Importer"
 
 msgid "Light linear gradient"
@@ -512,5 +452,5 @@
 
 msgid "Medium linear gradient"
-msgstr "Dégragé linéaire moyen"
+msgstr "Dégradé linéaire moyen"
 
 msgid "Dark linear gradient"
@@ -518,11 +458,11 @@
 
 msgid "Solid color"
-msgstr "Couleur"
+msgstr "Couleur unie"
 
 msgid "Custom..."
-msgstr "Personnalisé…"
+msgstr "Personnalisé..."
 
 msgid "Blowup configuration"
-msgstr "Configuration de Blowup"
+msgstr "Configuration Blowup"
 
 msgid "Predefined styles"
@@ -535,13 +475,9 @@
 msgstr "Sélectionnez un style prédéfini"
 
-msgid ""
-"For the following reasons, images cannot be created. You won't be able to "
-"change some background properties."
-msgstr ""
-"Pour les raisons suivantes, les images n'ont pu être créées. Vous ne pourrez "
-"pas changer certaines propriétés de fond."
+msgid "For the following reasons, images cannot be created. You won't be able to change some background properties."
+msgstr "Pour les raisons qui suivent, les images ne pouvant être créées, vous ne pourrez pas changer certaines propriétés."
 
 msgid "Theme configuration has been successfully updated."
-msgstr "La configuration du thème a été enregistrée avec succès."
+msgstr "La configuration du thème a été mise à jour avec succès."
 
 msgid "General"
@@ -549,29 +485,29 @@
 
 msgid "Background color:"
-msgstr "Couleur de fond :"
+msgstr "Couleur de fond&nbsp;:"
 
 msgid "Background color fill:"
-msgstr "Couleur de remplissage du fond :"
+msgstr "Remplissage de la couleur de fond&nbsp;:"
 
 msgid "Main text font:"
-msgstr "Police du texte principal :"
+msgstr "Police du texte principal&nbsp;:"
 
 msgid "Main text font size:"
-msgstr "Taille de police du texte principal :"
+msgstr "Taille du texte principal&nbsp;:"
 
 msgid "Main text color:"
-msgstr "Couleur du texte principal :"
+msgstr "Couleur du texte principal&nbsp;:"
 
 msgid "Text line height:"
-msgstr "Hauteur des lignes de texte :"
+msgstr "Hauteur des lignes :"
 
 msgid "Links color:"
-msgstr "Couleur des liens :"
+msgstr "Couleur des liens&nbsp;:"
 
 msgid "Visited links color:"
-msgstr "Couleur des liens visités :"
+msgstr "Couleurs des liens visités&nbsp;:"
 
 msgid "Focus links color:"
-msgstr "Couleur des liens ayant le focus :"
+msgstr "Couleur des liens survolés&nbsp;:"
 
 msgid "Page top"
@@ -579,5 +515,5 @@
 
 msgid "Prelude color:"
-msgstr "Couleur du prélude :"
+msgstr "Couleur du prélude&nbsp;:"
 
 msgid "Hide main title"
@@ -585,23 +521,23 @@
 
 msgid "Main title font:"
-msgstr "Police du titre principal :"
+msgstr "Police du titre principal&nbsp;:"
 
 msgid "Main title font size:"
-msgstr "Taille de police du titre principal :"
+msgstr "Taille du titre principal&nbsp;:"
 
 msgid "Main title color:"
-msgstr "Couleur du titre principal :"
+msgstr "Couleur du titre principal&nbsp;:"
 
 msgid "Main title alignment:"
-msgstr "Alignement du titre principal :"
+msgstr "Alignement du titre principal&nbsp;:"
 
 msgid "center"
-msgstr "centré"
+msgstr "centre"
 
 msgid "left"
-msgstr "à gauche"
+msgstr "gauche"
 
 msgid "right"
-msgstr "à droite"
+msgstr "droite"
 
 msgid "Main title position (x:y)"
@@ -609,90 +545,90 @@
 
 msgid "Top image"
-msgstr "Image de haut de page"
+msgstr "Image d'en-tête"
 
 msgid "Choose \"Custom...\" to upload your own image."
-msgstr "Choisissez « Personnalisé… » pour téléverser votre propre image."
+msgstr "Choisissez \"Personnalisé...\" pour déposer votre propre image."
 
 msgid "Add your image:"
-msgstr "Ajouter votre image :"
+msgstr "Ajouter votre image&nbsp;:"
 
 #, php-format
 msgid "JPEG or PNG file, 800 pixels wide, maximum size %s"
-msgstr "Fichier JPEG ou PNG, 800 pixels de large maximum, taille maximum de %s"
+msgstr "Fichier JPEG ou PNG, 800 pixels de large et de taille maximale %s"
 
 msgid "Sidebar"
-msgstr "Volet"
+msgstr "Bandeau"
 
 msgid "Sidebar position:"
-msgstr "Position du volet :"
+msgstr "Position du bandeau"
 
 msgid "Sidebar text font:"
-msgstr "Police du texte du volet :"
+msgstr "Police du texte du bandeau&nbsp;:"
 
 msgid "Sidebar text font size:"
-msgstr "Taille de police du texte du volet :"
+msgstr "Taille du texte du bandeau&nbsp;:"
 
 msgid "Sidebar text color:"
-msgstr "Couleur du texte du volet :"
+msgstr "Couleur du texte du bandeau&nbsp;:"
 
 msgid "Sidebar titles font:"
-msgstr "Police des titres du volet :"
+msgstr "Police des titres du bandeau&nbsp;:"
 
 msgid "Sidebar titles font size:"
-msgstr "Taille de police des titres du volet :"
+msgstr "Taille des titres du bandeau&nbsp;:"
 
 msgid "Sidebar titles color:"
-msgstr "Couleur des titres du volet :"
+msgstr "Couleur des titres du bandeau&nbsp;:"
 
 msgid "Sidebar 2nd level titles font:"
-msgstr "Police des titres secondaires du volet :"
+msgstr "Police des titres de niveau 2 du bandeau&nbsp;:"
 
 msgid "Sidebar 2nd level titles font size:"
-msgstr "Taille de police des titres secondaires du volet :"
+msgstr "Taille des titres de niveau 2 du bandeau&nbsp;:"
 
 msgid "Sidebar 2nd level titles color:"
-msgstr "Couleur des titres secondaires du volet :"
+msgstr "Couleur des titres de niveau 2 du bandeau&nbsp;:"
 
 msgid "Sidebar lines color:"
-msgstr "Couleur des lignes du volet :"
+msgstr "Couleur des lignes du bandeau&nbsp;:"
 
 msgid "Sidebar links color:"
-msgstr "Couleur des liens du volet :"
+msgstr "Couleur des liens du bandeau&nbsp;:"
 
 msgid "Sidebar visited links color:"
-msgstr "Couleur des liens visités du volet :"
+msgstr "Couleurs des liens vistés du bandeau&nbsp;:"
 
 msgid "Sidebar focus links color:"
-msgstr "Couleur des liens du volet ayant le focus :"
+msgstr "Couleurs des liens survolés du bandeau&nbsp;:"
 
 msgid "Date title font:"
-msgstr "Police du titre des dates :"
+msgstr "Police des titres de dates&nbsp;:"
 
 msgid "Date title font size:"
-msgstr "Taille de police du titre des dates :"
+msgstr "Taille des titres de dates&nbsp;:"
 
 msgid "Date title color:"
-msgstr "Couleur du titre des dates :"
+msgstr "Couleur des titres de date&nbsp;:"
 
 msgid "Entry title font:"
-msgstr "Police du titre des billets :"
+msgstr "Police des titres de billet&nbsp;:"
 
 msgid "Entry title font size:"
-msgstr "Taille de police du titre des billets :"
+msgstr "Taille des titres des billets&nbsp;:"
 
 msgid "Entry title color:"
-msgstr "Couleur du titre des billets :"
+msgstr "Couleur des titres des billets&nbsp;:"
 
 msgid "Comment background color:"
-msgstr "Couleur de fond des commentaires :"
+msgstr "Couleur du fond des commentaires&nbsp;:"
 
 msgid "Comment text color:"
-msgstr "Couleur du texte des commentaires :"
+msgstr "Couleur du texte des commentaires&nbsp;:"
 
 msgid "My comment background color:"
-msgstr "Couleur de fond de mes commentaires :"
+msgstr "Couleur du fond de mes commentaires&nbsp;:"
 
 msgid "My comment text color:"
-msgstr "Couleur du texte de mes commentaires :"
+msgstr "Couleur du texte de mes commentaires&nbsp;:"
 
 msgid "Footer"
@@ -700,17 +636,17 @@
 
 msgid "Footer font:"
-msgstr "Police du pied de page :"
+msgstr "Police du pied de page&nbsp;:"
 
 msgid "Footer font size:"
-msgstr "Taille de police du pied de page :"
+msgstr "Taille du texte du pied de page&nbsp;:"
 
 msgid "Footer color:"
-msgstr "Couleur du pied de page :"
+msgstr "Couleur du texte du pied de page&nbsp;:"
 
 msgid "Footer links color:"
-msgstr "Couleur des liens du pied de page :"
+msgstr "Couleur des liens du pied de page&nbsp;:"
 
 msgid "Footer background color:"
-msgstr "Couleur de fond du pied de page :"
+msgstr "Couleur de fond du pied de page&nbsp;:"
 
 msgid "Additional CSS"
@@ -718,13 +654,8 @@
 
 msgid "Configuration import / export"
-msgstr "Configuration de l'import/export"
-
-msgid ""
-"You can share your configuration using the following code. To apply a "
-"configuration, paste the code, click on \"Apply code\" and save."
-msgstr ""
-"Vous pouvez partager votre configuration en utilisant le code suivant. Pour "
-"appliquer une configuration, copiez le code, cliquez sur « Appliquer le code "
-"», puis sauvegardez."
+msgstr "Import / export de configuration"
+
+msgid "You can share your configuration using the following code. To apply a configuration, paste the code, click on \"Apply code\" and save."
+msgstr "Vous pouvez partager votre configuration en utilisant le code suivant. Pour appliquer une configuration, copiez le code, cliquez sur \"Appliquer le code\" et enregistrez."
 
 msgid "Copy this code:"
@@ -732,96 +663,67 @@
 
 msgid "default"
-msgstr "défaut"
-
-msgid ""
-"At least one of the following functions is not available: "
-"imagecreatetruecolor, imagepng & imagecreatefrompng."
-msgstr ""
-"Au moins une des fonctions suivantes n'est pas disponible : "
-"imagecreatetruecolor, imagepng et imagecreatefrompng."
+msgstr "par défaut"
+
+msgid "At least one of the following functions is not available: imagecreatetruecolor, imagepng & imagecreatefrompng."
+msgstr "L'une de ces fonctions au moins est indisponible : imagecreatetruecolor, imagepng & imagecreatefrompng."
 
 msgid "The 'public' directory does not exist."
-msgstr "Le répertoire ‘public’ n'existe pas."
+msgstr "Le répertoire 'public' n'existe pas."
 
 #, php-format
 msgid "The '%s' directory cannot be modified."
-msgstr "Le répertoire ‘%s’ ne peut être modifié."
+msgstr "Le répertoire '%s' ne peut pas être modifié."
 
 msgid "Unable to create images."
-msgstr "Impossible de créer des images."
+msgstr "Impossible de créer les images."
 
 msgid "Invalid file type."
-msgstr "Type de fichier invalide."
+msgstr "Type de fichier non valide."
 
 msgid "Uploaded image is not 800 pixels wide."
-msgstr "L'image soumise ne fait pas 800 pixels de large."
+msgstr "L'image fournie de fait pas 800 pixels de large."
 
 msgid "Unable to open image."
 msgstr "Impossible d'ouvrir l'image."
 
-msgid "Fair Trackbacks"
-msgstr "Filtre de rétroliens"
-
-msgid "Trackback validity check"
-msgstr "Contrôle de validité des rétroliens"
-
 msgid "Checks trackback source for a link to the post"
-msgstr "Contrôle si la source du rétrolien comporte un lien vers le billet"
+msgstr "Vérifie si la source du rétrolien possède un lien vers le billet"
 
 msgid "Import/Export"
 msgstr "Import/Export"
 
-msgid "Import / Export"
-msgstr "Import / Export"
-
-msgid "Import and Export your blog"
-msgstr "Importez et exportez votre blog"
-
 msgid "Flat file export"
-msgstr "Fichier d'exportation « à plat »"
+msgstr "Exporter un fichier texte"
 
 msgid "Exports a blog or a full Dotclear installation to flat file."
-msgstr ""
-"Exporte un blog ou une installation Dotclear complète vers un fichier « à "
-"plat »."
+msgstr "Exporte un blog ou toutes les données de Dotclear dans un fichier texte."
 
 msgid "Export file not found."
-msgstr "Le fichier d'export n'a pas été trouvé."
-
-msgid "Failed to compress export file."
-msgstr "Impossible de compresser le fichier d'export."
-
-msgid "Single blog"
-msgstr "Blog simple"
+msgstr "Fichier d'export non trouvé."
+
+msgid "Export a blog"
+msgstr "Exporter un blog"
 
 #, php-format
 msgid "This will create an export of your current blog: %s"
-msgstr "Cela créera un export du blog courant : %s"
-
-msgid "Compress file"
-msgstr "Compresse le fichier"
+msgstr "Ceci va exporter le contenu du blog en cours : %s."
+
+msgid "Export"
+msgstr "Exporter"
 
 msgid "You may also want to download your media directory as a zip file"
-msgstr ""
-"Vous pouvez également télécharger votre répertoire de média sous forme de "
-"fichier archive zip"
-
-msgid "Export"
-msgstr "Export"
-
-msgid "Multiple blogs"
-msgstr "Tous les blogs"
-
-msgid "This will create an export of all the content of your database."
-msgstr "Cela créera un export avec tout le contenu de votre base de données."
+msgstr "Vous pouvez également télécharger votre répertoire de médias au format zip."
+
+msgid "Export all content"
+msgstr "Exporter tout le contenu"
 
 msgid "Congratulation!"
-msgstr "Bravo !"
+msgstr "Félicitations !"
 
 msgid "Your blog has been successfully imported. Welcome on Dotclear 2!"
-msgstr "Votre blog a été importé avec succès. Bienvenue sur Dotclear 2 !"
+msgstr "Votre blog a été importé avec succès. Bienvenue sur Dotclear 2 !"
 
 msgid "Why don't you blog this now?"
-msgstr "Pourquoi ne bloguez-vous pas cela maintenant ?"
+msgstr "Pourquoi ne pas le bloguer maintenant ?"
 
 msgid "or"
@@ -829,30 +731,21 @@
 
 msgid "visit your dashboard"
-msgstr "voir votre tableau de bord"
+msgstr "vous rendre sur votre tableau de bord"
 
 msgid "Dotclear 1.2 import"
-msgstr "Importation depuis Dotclear 1.2"
+msgstr "Importer depuis Dotclear 1.2"
 
 msgid "Import a Dotclear 1.2 installation into your current blog."
-msgstr "Importer une installation Dotclear 1.2 dans votre blog courant."
-
-#, php-format
-msgid ""
-"This will import your Dotclear 1.2 content as new content in the current "
-"blog: %s."
-msgstr ""
-"Cela importera votre contenu Dotclear 1.2 comme nouveau contenu dans le blog "
-"courant : %s."
-
-msgid ""
-"Please note that this process will empty your categories, blogroll, entries "
-"and comments on the current blog."
-msgstr ""
-"Notez que cela supprimera les catégories, liste de liens, billets et "
-"commentaires actuels de votre blog courant. "
+msgstr "Importe un blog Dotclear 1.2 dans votre blog en cours."
+
+#, php-format
+msgid "This will import your Dotclear 1.2 content as new content in the current blog: %s."
+msgstr "Ceci va importer votre blog Dotclear 1.2 comme un nouveau contenu dans le blog en cours : %s."
+
+msgid "Please note that this process will empty your categories, blogroll, entries and comments on the current blog."
+msgstr "Veuillez noter que cette opération va vider vos catégories, liens, billets et commentaires sur le blog en cours."
 
 msgid "Depending on the size of your blog, it could take a few minutes."
-msgstr ""
-"Cela peut prendre plusieurs minutes en fonction de la taille de votre blog."
+msgstr "Selon la taille de votre blog, ceci peut prendre quelques minutes."
 
 msgid "General information"
@@ -860,11 +753,8 @@
 
 msgid "Import my blog now"
-msgstr "Importer mon blog maintenant"
-
-msgid ""
-"We first need some information about your old Dotclear 1.2 installation."
-msgstr ""
-"Nous avons besoin au préalable de quelques informations à propos de votre "
-"installation Dotclear 1.2."
+msgstr "Importer mon blog"
+
+msgid "We first need some information about your old Dotclear 1.2 installation."
+msgstr "Nous avons d'abord besoin de renseignements à propos de votre ancienne installation Dotclear 1.2."
 
 msgid "Entries import options"
@@ -872,81 +762,65 @@
 
 msgid "Number of entries to import at once:"
-msgstr "Nombre d'éléments à importer à chaque passe :"
+msgstr "Nombre de billets à importer à chaque étape :"
 
 msgid "Importing users"
-msgstr "Importation des utilisateurs"
+msgstr "Importe les utilisateurs"
 
 msgid "Importing categories"
-msgstr "Importation des catégories"
+msgstr "Importe les catégories"
 
 msgid "Importing blogroll"
-msgstr "Importation de la liste des liens"
+msgstr "Importe les liens"
 
 #, php-format
 msgid "Importing entries from %d to %d / %d"
-msgstr "Importation des éléments %d à %d / %d"
+msgstr "Importation des billets %d à %d"
 
 msgid "Please read carefully"
-msgstr "Lisez soigneusement"
-
-msgid ""
-"Every newly imported user has received a random password and will need to "
-"ask for a new one by following the \"I forgot my password\" link on the "
-"login page (Their registered email address has to be valid.)"
-msgstr ""
-"Chaque utilisateur nouvellement importé a reçu un mot de passe aléatoire et "
-"devra en demander un nouveau en cliquant sur le lien « J'ai oublié mon mot "
-"de passe » sur la page d'authentification (son adresse email doit être "
-"valide)."
-
-#, php-format
-msgid ""
-"Please note that Dotclear 2 has a new URL layout. You can avoid broken links "
-"by installing <a href=\"%s\">DC1 redirect</a> plugin and activate it in your "
-"blog configuration."
-msgstr ""
-"Notez que Dotclear a un nouveau schéma d'URL. Vous pouvez éviter les liens "
-"brisés en installant l'extension <a href=\"%s\">DC1 redirect</a> et en "
-"l'activant dans la configuration de votre blog."
+msgstr "Merci de lire attentivement"
+
+msgid "Every newly imported user has received a random password and will need to ask for a new one by following the \"I forgot my password\" link on the login page (Their registered email address has to be valid.)"
+msgstr "Chaque utilisateur nouvellement importé a reçu un mot de passe aléatoire et devra en demander un nouveau en suivant le lien \"J'ai oublié mon mot de passe\" sur la page de connexion à l'interface d'aministration."
+
+#, php-format
+msgid "Please note that Dotclear 2 has a new URL layout. You can avoid broken links by installing <a href=\"%s\">DC1 redirect</a> plugin and activate it in your blog configuration."
+msgstr "Veuillez noter que Dotclear 2 a un nouveau format d'URL. Vous pouvez éviter les liens morts en installant le plugin <a href=\"%s\">DC1 redirect</a> et en l'activant dans la configuration de votre blog."
 
 msgid "next step"
-msgstr "Étape suivante"
+msgstr "étape suivante"
 
 msgid "Dotclear tables not found"
-msgstr "Les tables Dotclear n'ont pas été trouvées"
+msgstr "Tables Dotclear non trouvées"
 
 msgid "Feed import"
-msgstr "Importation de flux"
+msgstr "Importer depuis un flux"
 
 msgid "Imports a feed as new entries."
-msgstr "Importer un flux comme nouveau contenu"
+msgstr "Importe un flux comme nouveaux billets."
 
 msgid "Cannot retrieve feed URL."
-msgstr "Impossible de trouver l'URL du flux."
+msgstr "Impossible d'atteindre l'URL du fil."
 
 msgid "No items in feed."
-msgstr "Aucun élément dans le flux"
+msgstr "Aucun élément dans le feed."
 
 msgid "Content successfully imported."
-msgstr "Le contenu a été importé avec succès."
-
-#, php-format
-msgid ""
-"This will import a feed (RSS or Atom) a as new content in the current blog: "
-"%s."
-msgstr ""
-"Cela importera un flux (RSS ou ATOM) comme un nouveau contenu dans le blog "
-"courant : %s."
+msgstr "Contenu importé avec succès."
+
+msgid "Import from a feed"
+msgstr "Importer depuis un fil de nouvelles"
+
+#, php-format
+msgid "This will import a feed (RSS or Atom) a as new content in the current blog: %s."
+msgstr "Ceci va importer un fil (RSS ou Atom) comme un nouveau contenu dans le blog en cours : %s."
 
 msgid "Feed URL:"
-msgstr "URL du flux :"
+msgstr "URL du fil"
 
 msgid "Flat file import"
-msgstr "Importation d'un fichier « à plat »"
+msgstr "Importer depuis un fichier texte"
 
 msgid "Imports a blog or a full Dotclear installation from flat file."
-msgstr ""
-"Importe un blog ou une installation Dotclear complète depuis un fichier « à "
-"plat »."
+msgstr "Importe un blog ou toutes les données depuis un fichier texte."
 
 msgid "Single blog successfully imported."
@@ -954,144 +828,95 @@
 
 msgid "Are you sure you want to import a full backup file?"
-msgstr "Êtes-vous sûr de vouloir importer un fichier de sauvegarde complet ?"
-
-#, php-format
-msgid ""
-"This will import a single blog backup as new content in the current blog: %s."
-msgstr ""
-"Cela importera une sauvegarde d'un blog comme nouveau contenu du blog "
-"courant : %s."
+msgstr "Êtes-vous certain de vouloir charger un fichier de sauvegarde complet ?"
+
+msgid "Import a single blog"
+msgstr "Importer un blog"
+
+#, php-format
+msgid "This will import a single blog backup as new content in the current blog: %s."
+msgstr "Ceci va charger une sauvegarde de blog comme un nouveau contenu dans le blog en cours : %s."
 
 msgid "Upload a backup file"
-msgstr "Téléversez un fichier de sauvegarde"
+msgstr "Charger un fichier de sauvegarde"
 
 msgid "or pick up a local file in your public directory"
-msgstr ""
-"ou sélectionnez un fichier local présent dans votre répertoire de média"
-
-msgid "This will reset all the content of your database, except users."
-msgstr ""
-"Attention : Cela supprimera au préalable tout le contenu de votre base de "
-"données à l'exception des utilisateurs."
-
-msgid "Another file with same name exists."
-msgstr "Un autre fichier portant ce nom existe déjà."
-
-msgid "Failed to extract backup file."
-msgstr "Impossible d'extraire le fichier de sauvegarde."
-
-msgid "No backup in compressed file."
-msgstr "Aucune sauvegarde dans le fichier compressé."
+msgstr "ou choisissez un fichier local dans votre répertoire public"
+
+msgid "Import a full backup file"
+msgstr "Import d'un fichier de sauvegarde complet"
+
+msgid "Warning: This will reset all the content of your database, except users."
+msgstr "Attention : Ceci va remettre à zéro tout le contenu, sauf les utilisateurs."
 
 msgid "WordPress import"
-msgstr "Importation WordPress"
+msgstr "Importer depuis WordPress"
 
 msgid "Import a WordPress installation into your current blog."
-msgstr "Importe une installation WordPress dans le blog courant."
-
-#, php-format
-msgid ""
-"This will import your WordPress content as new content in the current blog: "
-"%s."
-msgstr ""
-"Cela importera le contenu WordPress comme un nouveau contenu dans le blog "
-"courant : %s."
+msgstr "Importe un blog WordPress dans votre blog en cours."
+
+#, php-format
+msgid "This will import your WordPress content as new content in the current blog: %s."
+msgstr "Ceci va importer votre blog WordPress comme un nouveau contenu dans le blog en cours : %s."
 
 msgid "We first need some information about your old WordPress installation."
-msgstr ""
-"Nous avons besoin au préalable de quelques informations au sujet de votre "
-"ancienne installation WordPress."
-
-msgid ""
-"WordPress and Dotclear's handling of categories are quite different. You can "
-"assign several categories to a single post in WordPress. In the Dotclear "
-"world, we see it more like \"One category, several tags.\" Therefore "
-"Dotclear can only import one category per post and will chose the lowest "
-"numbered one. If you want to keep a trace of every category, you can import "
-"them as tags, with an optional prefix."
-msgstr ""
-"La gestion des catégories chez WordPress et Dotclear est tout à fait "
-"différente. Vous pouvez assigner plusieurs catégories à un seul poste dans "
-"WordPress. Dans le monde Dotclear, nous le voyons davantage comme « une "
-"catégorie, plusieurs mot-clés ». Par conséquent Dotclear peut seulement "
-"importer une catégorie par billet et il choisira celui de plus petit numéro. "
-"Si vous voulez conserver une trace de chaque catégorie, vous pouvez les "
-"importer sous forme de mot-clés, avec un préfixe optionnel."
-
-msgid ""
-"On the other hand, in WordPress, a post can not be uncategorized, and a "
-"default installation has a first category labelised <i>\"Uncategorized\"</"
-"i>. If you did not change that category, you can just ignore it while "
-"importing your blog, as Dotclear allows you to actually keep your posts "
-"uncategorized."
-msgstr ""
-"D'autre part, dans WordPress, un billet ne peut pas être sans catégorie, et "
-"une installation par défaut possède systématiquement une première catégorie "
-"nommée <i>« sans catégorie »</ i>. Si vous n'avez pas changé cette "
-"catégorie, vous pouvez simplement l'ignorer lors de l'importation sur votre "
-"blog, puisque Dotclear vous permet réellement de conserver votre message "
-"sans catégorie."
+msgstr "Nous avons d'abord besoin de renseignements à propos de votre ancienne installation WordPress."
+
+msgid "WordPress and Dotclear's handling of categories are quite different. You can assign several categories to a single post in WordPress. In the Dotclear world, we see it more like \"One category, several tags.\" Therefore Dotclear can only import one category per post and will chose the lowest numbered one. If you want to keep a trace of every category, you can import them as tags, with an optional prefix."
+msgstr "WordPress et Dotclear gèrent les catégories différemment. Dans WordPress, un article peut être classé dans plusieurs catégories, alors que dans Dotclear, on voit ça plutôt comme \"Une catégorie, plusieurs mots-clefs.\" Dotclear ne peut donc importer qu'une seule catégorie par article et choisira dans ce cas la première créée. Si vous désirez garder une trace de chaque catégorie, vous pouvez les importer en tant que mots-clefs, avec un préfixe optionnel."
+
+msgid "On the other hand, in WordPress, a post can not be uncategorized, and a default installation has a first category labelised <i>\"Uncategorized\"</i>. If you did not change that category, you can just ignore it while importing your blog, as Dotclear allows you to actually keep your posts uncategorized."
+msgstr "Par contre, il est impossible dans WordPress de ne pas assigner une catégorie à un article, c'est pourquoi lors de l'installation est créée une première catégorie appelée <i>\"Non classée\"</i>. Si vous n'avez pas modifié cette catégorie, l'importation peut simplement l'ignorer. En effet, Dotclear vous permet d'avoir des articles sans catégorie."
 
 msgid "Ignore the first category:"
-msgstr "Ignorer la première catégorie :"
+msgstr "Ignorer la première catégorie :"
 
 msgid "Import lowest numbered category on posts:"
-msgstr "Importer la catégorie ayant le plus faible numéro dans les billets :"
+msgstr "Importer la catégorie la plus ancienne sur les articles :"
 
 msgid "Import all categories as tags:"
-msgstr "Importer toutes les catégories comme des mot-clés :"
+msgstr "Importer les catégories comme des mots-clés :"
 
 msgid "Prefix such tags with:"
-msgstr "Préfixer les mot-clés avec :"
+msgstr "Préfixer ces mots-clés avec :"
 
 msgid "Content filters"
 msgstr "Filtres de contenu"
 
-msgid ""
-"You may want to process your post and/or comment content with the following "
-"filters."
-msgstr ""
-"Vous pouvez formater le contenu de vos billets et commentaires avec les "
-"filtres suivants."
+msgid "You may want to process your post and/or comment content with the following filters."
+msgstr "Vous pouvez utiliser les filtres suivants sur vos articles et/ou commentaires."
 
 msgid "Post content formatter:"
-msgstr "Formatage du contenu des billets :"
+msgstr "Formatage des articles&nbsp:"
 
 msgid "Comment content formatter:"
-msgstr "Formatage du contenu des commentaires :"
+msgstr "Formatage des commentaires&nbsp;:"
 
 msgid "WordPress tables not found"
-msgstr "Les tables WordPress n'ont pu être trouvées."
+msgstr "Tables WordPress non trouvées"
 
 msgid "No file to read."
-msgstr "Aucun fichier à lire."
+msgstr "Aucun fichier lisible."
 
 msgid "File is not a DotClear backup."
-msgstr "Ce fichier n'est pas un fichier de sauvegarde Dotclear."
+msgstr "Le fichier n'est pas une sauvegarde DotClear."
 
 msgid "File is not a single blog export."
-msgstr "Ce fichier n'est pas une exportation d'un blog."
+msgstr "Le fichier n'est pas un fichier d'export simple."
 
 msgid "File is not a full export."
-msgstr "Ce fichier n'est pas un fichier de sauvegarde complet."
-
-#, php-format
-msgid ""
-"ID of \"%3$s\" does not match on record \"%1$s\" at line %2$s of backup file."
-msgstr ""
-"L'ID de \"%3$s\" ne correspond pas dans l'enregistrement \"%1$s\" à la ligne "
-"%2$s du fichier de sauvegarde."
+msgstr "Le fichier n'est pas un fichier d'export complet."
+
+msgid "The backup file does not appear to be well formed."
+msgstr "Le fichier de sauvegarde ne semble pas être correctement formaté"
 
 msgid "Please wait..."
-msgstr "Veuillez patientez…"
-
+msgstr "Veuillez patienter..."
+
+# French translation of DotClea"
 msgid "Maintenance"
 msgstr "Maintenance"
 
-msgid "Maintain your installation"
-msgstr "Maintenez votre installation"
-
 msgid "Optimization successful."
-msgstr "Optimisation terminée avec succès."
+msgstr "Optimisation réalisée avec succès."
 
 msgid "Comments and trackback counted."
@@ -1099,12 +924,12 @@
 
 msgid "Templates cache directory emptied."
-msgstr "Le répertoire de cache des « templates » a été vidé."
+msgstr "Répertoire du cache des templates vidé."
 
 msgid "Logs deleted."
-msgstr "Les journaux ont été supprimés."
+msgstr "Journaux effacés."
 
 #, php-format
 msgid "Indexing entry %d to %d."
-msgstr "Indexation des billets %d à %d."
+msgstr "Index des billets %d à %d"
 
 msgid "next"
@@ -1112,5 +937,5 @@
 
 msgid "Entries index done."
-msgstr "Indexation des billets effectuée."
+msgstr "Index des billets complet."
 
 msgid "Back"
@@ -1119,14 +944,14 @@
 #, php-format
 msgid "Indexing comment %d to %d."
-msgstr "Indexation des commentaires %d à %d."
+msgstr "Index des commentaires %d à %d"
 
 msgid "Comments index done."
-msgstr "Indexation des commentaires effectuée."
+msgstr "Index des commentaires complet."
 
 msgid "Optimize database room"
-msgstr "Optimise la place occupée par la base de données"
+msgstr "Optimiser l'espace de la base de données"
 
 msgid "Vacuum tables"
-msgstr "Vidage des tables"
+msgstr "Nettoyer les tables"
 
 msgid "Counters"
@@ -1134,5 +959,5 @@
 
 msgid "Reset comments and ping counters"
-msgstr "Remet à zéro les compteurs de commentaires et de signalements"
+msgstr "Réinitialiser les compteurs des commentaires et rétroliens"
 
 msgid "Search engine index"
@@ -1140,23 +965,23 @@
 
 msgid "This may take a very long time"
-msgstr "Cela peut prendre un certain temps"
+msgstr "Ceci peut prendre beaucoup de temps"
 
 msgid "Index all posts"
-msgstr "Indexation de tous les billets"
+msgstr "Indexer tous les billets"
 
 msgid "Index all comments"
-msgstr "Indexation de tous les commentaires"
+msgstr "Indexer tous les commentaires"
 
 msgid "Vacuum logs"
-msgstr "Vidages des journaux"
+msgstr "Vider les journaux"
 
 msgid "Delete all logs"
-msgstr "Suppression de tous les journaux"
+msgstr "Supprimer tous les journaux"
 
 msgid "Empty templates cache directory"
-msgstr "Vidage du répertoire de cache des « templates »"
+msgstr "Vider le répertoire du cache des templates"
 
 msgid "Empty directory"
-msgstr "Vidage du répertoire"
+msgstr "Vider le répertoire"
 
 msgid "Pages"
@@ -1172,8 +997,5 @@
 
 msgid "manage pages"
-msgstr "gestion des pages"
-
-msgid "Serve entries as simple web pages"
-msgstr "Publie des billets comme de simples pages web"
+msgstr "gérer les pages"
 
 msgid "Published on"
@@ -1181,8 +1003,8 @@
 
 msgid "This page's comments feed"
-msgstr "Flux des commentaires de cette page"
+msgstr "Fil des commentaires de cette page"
 
 msgid "You must provide a valid email address."
-msgstr "Vous devez indiquer une adresse e-mail valide."
+msgstr "Vous devez indiquer une adresse email valide."
 
 msgid "Page title"
@@ -1198,15 +1020,9 @@
 msgstr "Aucune page"
 
-msgid "Warning: Comments are not more accepted for this page."
-msgstr "Attention : les commentaires ne sont plus acceptés pour cette page."
-
-msgid "Warning: Trackbacks are not more accepted for this page."
-msgstr "Attention : les rétroliens ne sont plus acceptés pour cette page."
-
 msgid "select this page"
 msgstr "sélectionner cette page"
 
 msgid "Are you sure you want to delete selected pages?"
-msgstr "Êtes-vous sûr de vouloir supprimer les pages sélectionnées ?"
+msgstr "Êtes-vous certain de vouloir supprimer les pages sélectionnées ?"
 
 msgid "New page"
@@ -1214,5 +1030,5 @@
 
 msgid "Selected pages action:"
-msgstr "Action sur les pages sélectionnées :"
+msgstr "Action sur les pages sélectionnées :"
 
 msgid "This page does not exist."
@@ -1229,8 +1045,8 @@
 
 msgid "Are you sure you want to delete this page?"
-msgstr "Êtes-vous sûr de vouloir supprimer cette page ?"
+msgstr "Êtes-vous certain de vouloir supprimer cette page ?"
 
 msgid "Page has been successfully updated."
-msgstr "La page a été modifiée avec succès."
+msgstr "La page a été mise à jour avec succès."
 
 msgid "Page has been successfully created."
@@ -1241,53 +1057,38 @@
 
 msgid "Page status:"
-msgstr "État de la page :"
+msgstr "État de la page :"
 
 msgid "Page position:"
-msgstr "Position de la page :"
+msgstr "Position de la page :"
 
 msgid "Page lang:"
-msgstr "Langue de la page :"
+msgstr "Langue de la page :"
 
 msgid "Page password:"
-msgstr "Mot de passe de la page :"
-
-msgid ""
-"Warning: If you set the URL manually, it may conflict with another page."
-msgstr ""
-"Attention : si vous définissez vous-même l'URL, elle peut entrer en conflit "
-"avec celle d'une autre page."
+msgstr "Mot de passe de la page :"
+
+msgid "Warning: If you set the URL manually, it may conflict with another page."
+msgstr "Attention : si vous indiquez l'URL manuellement, celle-ci peut entrer en conflit avec une autre page."
 
 msgid "Add files to this page"
-msgstr "Ajouter des fichiers à cette page"
-
-msgid "hidden"
-msgstr "masquée"
-
-msgid "Hidden"
-msgstr "Masquée"
-
-msgid "If checked this page will be active but not listed in widget Pages."
-msgstr "Si coché cette page sera active mais non listée dans le widget Pages."
+msgstr "Ajouter un fichier à la page"
 
 msgid "Pings"
-msgstr "Signalements"
-
-msgid "Ping services"
-msgstr "Services de signalement"
+msgstr "Pings"
 
 msgid "Pings configuration"
-msgstr "Configuration des signalements"
+msgstr "Configuration des pings"
 
 msgid "Settings have been successfully updated."
-msgstr "Les réglages ont été modifiés avec succès."
+msgstr "Paramètres enregistrés avec succès."
 
 msgid "Activate pings extension"
-msgstr "Activer l'extension de signalement"
+msgstr "Activer le module de ping"
 
 msgid "Service name:"
-msgstr "Nom du service :"
+msgstr "Nom du service :"
 
 msgid "Service URI:"
-msgstr "URI du service :"
+msgstr "URI du service :"
 
 msgid "error"
@@ -1295,21 +1096,15 @@
 
 msgid "Test ping services"
-msgstr "Tester les services de signalement"
+msgstr "Tester les services de ping"
 
 msgid "Check all"
-msgstr "Tout sélectionner"
+msgstr "Tout cocher."
 
 msgid "Pings:"
-msgstr "Signalements :"
+msgstr "Pings :"
 
 msgid "Simple menu"
 msgstr "Menu simple"
 
-msgid "Simple Menu"
-msgstr "Menu simple"
-
-msgid "Simple menu for Dotclear"
-msgstr "Menu simple pour Dotclear"
-
 msgid "Menu"
 msgstr "Menu"
@@ -1319,5 +1114,5 @@
 
 msgid "All tags"
-msgstr "Tous les mot-clés"
+msgstr "Tous les mots-clés"
 
 msgid "Home"
@@ -1331,5 +1126,5 @@
 
 msgid "Tags"
-msgstr "Mot-clés"
+msgstr "Mots-clés"
 
 msgid "User defined"
@@ -1439,16 +1234,16 @@
 
 msgid "Tags:"
-msgstr "Mot-clés :"
+msgstr "Mots-clés :"
 
 #, php-format
 msgid "Are you sure you want to remove this %s?"
-msgstr "Êtes-vous sûr de vouloir retirer ce %s ?"
+msgstr "Êtes vous certain de vouloir supprimer ce %s ?"
 
 #, php-format
 msgid "Add a %s to this entry"
-msgstr "Ajouter %s à ce billet"
+msgstr "Ajouter un %s à ce billet"
 
 msgid "Choose from list"
-msgstr "Choisir dans la liste"
+msgstr "Choisir depuis la liste"
 
 msgid "all"
@@ -1468,20 +1263,20 @@
 
 msgid "Enter tags separated by coma"
-msgstr "Entrez les mot-clés séparés par des virgules"
+msgstr "Entrer les mots-clés séparés par une virgule"
 
 msgid "Add tags"
-msgstr "Ajouter des mot-clés"
+msgstr "Ajouter des mots-clés"
 
 msgid "Remove tags"
-msgstr "Retirer des mot-clés"
+msgstr "Supprimer des mots-clés"
 
 msgid "Add tags to entries"
-msgstr "Ajouter des mot-clés à des billets"
+msgstr "Ajouter des mots-clés aux billets"
 
 msgid "Tags to add:"
-msgstr "Mot-clés à ajouter :"
+msgstr "Mots-clés à ajouter :"
 
 msgid "Remove selected tags from entries"
-msgstr "Retirer les mot-clés sélectionnés des billets"
+msgstr "Supprimer les mots-clés sélectionnés des billets"
 
 msgid "No tags for selected entries"
@@ -1489,5 +1284,5 @@
 
 msgid "Following tags have been found in selected entries:"
-msgstr "Les mot-clés suivants ont été trouvés pour les billets sélectionnés :"
+msgstr "Les mots-clés suivants ont été trouvés dans les billets sélectionnés :"
 
 msgid "short"
@@ -1498,17 +1293,14 @@
 
 msgid "Tags list format:"
-msgstr "Format de la liste des mot-clés :"
-
-msgid "Tags for posts"
-msgstr "Mots-clés pour les billets"
+msgstr "Format de la liste des mots-clés :"
 
 msgid "This tag's comments Atom feed"
-msgstr "Flux Atom des commentaires associés à ce mot-clé"
+msgstr "Fil Atom des commentaires de ce mot-clé"
 
 msgid "This tag's entries Atom feed"
-msgstr "Flux Atom des billets associés à ce mot-clé"
+msgstr "Fil Atom des billets de ce mot-clé"
 
 msgid "Limit (empty means no limit):"
-msgstr "Limite (laisser vide si pas de limite) :"
+msgstr "Limite (laisser vide pour aucune limite)"
 
 msgid "Entries count"
@@ -1519,5 +1311,5 @@
 
 msgid "Link to all tags:"
-msgstr "Lien vers tous les mot-clés :"
+msgstr "Lien vers tous les mots-clés :"
 
 msgid "Edit tag"
@@ -1525,8 +1317,8 @@
 
 msgid "Tag has been successfully renamed"
-msgstr "Le mot-clé a été renommé avec succès"
+msgstr "Mot-clé renommé avec succès"
 
 msgid "Back to tags list"
-msgstr "Retour à la liste des mot-clés"
+msgstr "Retour à la liste des mots-clés"
 
 msgid "Actions for this tag"
@@ -1534,5 +1326,5 @@
 
 msgid "Edit tag name:"
-msgstr "Renommer ce mot-clé :"
+msgstr "Renommer ce mot-clé :"
 
 msgid "Rename"
@@ -1540,5 +1332,5 @@
 
 msgid "Delete this tag:"
-msgstr "Supprimer ce mot-clé :"
+msgstr "Supprimer ce mot-clé :"
 
 msgid "List of entries with this tag"
@@ -1546,20 +1338,17 @@
 
 msgid "Tag has been successfully removed"
-msgstr "Le mot-clé a été retiré avec succès"
+msgstr "Mot-clé supprimé avec succès"
 
 msgid "No tags on this blog."
-msgstr "Aucun mot-clé sur ce blog."
+msgstr "Aucun mot-clé sur ce blog"
 
 msgid "Theme Editor"
 msgstr "Éditeur de thème"
 
-msgid "Syntax color"
-msgstr "Coloration syntaxique"
-
 msgid "No file"
 msgstr "Aucun fichier"
 
 msgid "File does not exist."
-msgstr "Ce fichier n'existe pas."
+msgstr "Le fichier n'existe pas."
 
 #, php-format
@@ -1568,23 +1357,19 @@
 
 #, php-format
-msgid ""
-"Unable to write file %s. Please check your theme files and folders "
-"permissions."
-msgstr ""
-"Impossible d'écrire le fichier %s. Contrôlez les permissions des fichiers et "
-"des répertoires de votre thème."
+msgid "Unable to write file %s. Please check your theme files and folders permissions."
+msgstr "Impossible d'écrire le fichier %s. Veuillez vérifier les permissions des fichiers et répertoires de votre thème."
 
 msgid "Saving document..."
-msgstr "Enregistrement du document…"
+msgstr "Sauvegarde du document..."
 
 msgid "Document saved"
-msgstr "Document enregistré"
+msgstr "Document sauvegardé"
 
 msgid "An error occurred:"
-msgstr "Une erreur est survenue :"
+msgstr "Une erreur s'est produite :"
 
 #, php-format
 msgid "Your current theme on this blog is \"%s\"."
-msgstr "Actuellement votre thème sur ce blog est « %s »."
+msgstr "Le thème utilisé actuellement sur votre blog est \"%s\"."
 
 msgid "You can't edit default theme."
@@ -1592,5 +1377,5 @@
 
 msgid "Please select a file to edit."
-msgstr "Sélectionnez un fichier à modifier."
+msgstr "Veuillez sélectionner un fichier à modifier."
 
 msgid "File editor"
@@ -1599,13 +1384,11 @@
 #, php-format
 msgid "Editing file %s"
-msgstr "Édition du fichier %s"
+msgstr "Modification du fichier %s"
 
 msgid "This file is not writable. Please check your theme files permissions."
-msgstr ""
-"Ce fichier n'est pas modifiable. Contrôlez les permissions de vos fichiers "
-"de thème."
+msgstr "Ce fichier ne peut pas être modifié. Veuillez vérifier les permissions des fichiers de votre thème."
 
 msgid "Templates files"
-msgstr "Fichiers du thème"
+msgstr "Fichiers template"
 
 msgid "CSS files"
@@ -1615,10 +1398,4 @@
 msgstr "Fichiers JavaScript"
 
-msgid "user:preferences"
-msgstr "user:preferences"
-
-msgid "Manage every user preference directive"
-msgstr "Gestion des préférences utilisateur"
-
 msgid "Preferences successfully updated"
 msgstr "Préférences mises à jour avec succès"
@@ -1652,8 +1429,8 @@
 
 msgid "With entries counts"
-msgstr "Avec le nombre de billets"
+msgstr "Afficher le nombre de billets"
 
 msgid "Subscribe links"
-msgstr "Liens de souscription"
+msgstr "Liens d'abonnement"
 
 msgid "Subscribe"
@@ -1661,14 +1438,14 @@
 
 msgid "Feeds type:"
-msgstr "Type de flux :"
+msgstr "Types de fil :"
 
 msgid "Feed reader"
-msgstr "Lecteur de flux"
+msgstr "Lecteur de fils de nouvelles"
 
 msgid "Somewhere else"
-msgstr "Autre part"
+msgstr "Ailleurs"
 
 msgid "Entries limit:"
-msgstr "Limite du nombre de billets :"
+msgstr "Nombre de billets maximum :"
 
 msgid "Text"
@@ -1676,5 +1453,5 @@
 
 msgid "Text:"
-msgstr "Texte :"
+msgstr "Texte :"
 
 msgid "Last entries"
@@ -1682,8 +1459,8 @@
 
 msgid "Uncategorized"
-msgstr "Sans catégorie"
+msgstr "Non catégorisé"
 
 msgid "Tag:"
-msgstr "Mot-clé :"
+msgstr "Mot-clé :"
 
 msgid "Last comments"
@@ -1691,13 +1468,13 @@
 
 msgid "Comments limit:"
-msgstr "Limite du nombre de commentaires :"
+msgstr "Nombre de commentaires maximum :"
 
 #, php-format
 msgid "This blog's entries %s feed"
-msgstr "Flux %s des billets de ce blog"
+msgstr "Fil %s des billets de ce blog"
 
 #, php-format
 msgid "This blog's comments %s feed"
-msgstr "Flux %s des commentaires de ce blog"
+msgstr "Fil %s des commentaires de ce blog"
 
 msgid "Entries feed"
@@ -1719,9 +1496,6 @@
 msgstr "Widgets"
 
-msgid "Widgets for your blog sidebars"
-msgstr "Widgets pour les volets de votre blog"
-
 msgid "Are you sure you want to reset sidebars?"
-msgstr "Êtes-vous sûr de vouloir remettre à zéro les volets ?"
+msgstr "Êtes-vous certain de vouloir réinitialiser les bandeaux ?"
 
 msgid "Available widgets"
@@ -1729,5 +1503,5 @@
 
 msgid "Append to:"
-msgstr "Ajouter à :"
+msgstr "Ajouter à :"
 
 msgid "Add widgets to sidebars"
@@ -1735,8 +1509,8 @@
 
 msgid "Navigation sidebar"
-msgstr "Volet de navigation"
+msgstr "Bandeau de navigation"
 
 msgid "Extra sidebar"
-msgstr "Volet d'extra"
+msgstr "Bandeau d'extra"
 
 msgid "Custom sidebar"
@@ -1752,66 +1526,42 @@
 msgstr "Utilisation des widgets"
 
-msgid ""
-"Widgets may be used to add various blocks of content to be displayed on your "
-"public pages. To add a widget, drag it from the Available widgets list on "
-"the left to one of the sidebars on the right of this page. You can order "
-"your widgets in a sidebar by dragging them up or down. You must update "
-"sidebars to apply your changes."
-msgstr ""
-"Les widgets sont utilisés pour ajouter des blocs de contenus divers dans vos "
-"pages publiques. Pour ajouter un widget, faites-le glisser depuis la liste "
-"des Widgets disponibles à gauche jusqu'à l'un des bandeaux sur la droite de "
-"la page. Vous pouvez ré-ordonner vos widgets dans un bandeau en le faisant "
-"glisser vers le haut ou vers le bas. Vous devez mettre à jour les bandeaux "
-"pour enregistrer vos modifications."
-
-msgid ""
-"Once included in a sidebar, widgets have configuration options that you can "
-"reach by clicking on the + sign next to their name."
-msgstr ""
-"Une fois inclus dans un bandeau, les widgets ont généralement des options "
-"que vous pouvez configurer. Cliquez sur le signe + à côté de leur nom pour y "
-"accéder."
+msgid "Widgets may be used to add various blocks of content to be displayed on your public pages. To add a widget, drag it from the Available widgets list on the left to one of the sidebars on the right of this page. You can order your widgets in a sidebar by dragging them up or down. You must update sidebars to apply your changes."
+msgstr "Les widgets sont utilisés pour ajouter des blocs de contenus divers dans vos pages publiques. Pour ajouter un widget, faites-le glisser depuis la liste des Widgets disponibles à gauche jusqu'à l'un des bandeaux sur la droite de la page. Vous pouvez ré-ordonner vos widgets dans un bandeau en le faisant glisser vers le haut ou vers le bas. Vous devez mettre à jour les bandeaux pour enregistrer vos modifications."
+
+msgid "Once included in a sidebar, widgets have configuration options that you can reach by clicking on the + sign next to their name."
+msgstr "Une fois inclus dans un bandeau, les widgets ont généralement des options que vous pouvez configurer. Cliquez sur le signe + à côté de leur nom pour y accéder."
 
 msgid "Reset sidebars to get back to default widgets installation."
-msgstr ""
-"Réinitialisez les bandeaux pour retrouver les widgets par défaut de votre "
-"installation."
+msgstr "Réinitialisez les bandeaux pour retrouver les widgets par défaut de votre installation."
 
 msgid "Widget templates tags"
-msgstr "Balise de widget"
-
-msgid ""
-"If you are allowed to edit your theme templates, you can directly add "
-"widgets as templates tags, with their own configuration."
-msgstr ""
-"Si vous êtes autorisé à modifier vos fichiers de thème, vous pouvez ajouter "
-"des widgets sous forme de balise, avec leur propre configuration."
+msgstr "Marqueurs de template des widgets"
+
+msgid "If you are allowed to edit your theme templates, you can directly add widgets as templates tags, with their own configuration."
+msgstr "Si vous avez le droit de modifier les templates de votre thème, vous pouvez directement ajouter des widgets à l'aide de marqueurs de template, avec leur propre configuration."
 
 msgid "To add a widget in your template, you need to write code like this:"
-msgstr ""
-"Pour ajouter un widget à votre thème, vous devez insérer un code similaire "
-"à :"
+msgstr "Pour ajouter un widget dans votre template, vous devez écrire un code comme ceci :"
 
 msgid "Widget ID"
-msgstr "ID du widget"
+msgstr "Identifiant du widget"
 
 msgid "Setting name"
-msgstr "Nom de l'élément de réglage"
+msgstr "Nom du paramètre"
 
 msgid "Setting value"
-msgstr "Valeur de l'élément de réglage"
+msgstr "Valeur du paramètre"
 
 msgid "Here are the following available widgets for your blog:"
-msgstr "Voici les widgets disponibles pour votre blog :"
+msgstr "Voici les widgets disponibles pour votre blog :"
 
 msgid "Widget ID:"
-msgstr "Identifiant du widget :"
+msgstr "Identifiant du widget :"
 
 msgid "No setting for this widget"
-msgstr "Aucun réglage pour ce widget"
+msgstr "Aucun paramètre pour ce widget"
 
 msgid "Setting name:"
-msgstr "Nom de l'élément de réglage :"
+msgstr "Nom du paramètre :"
 
 msgid "No widget."
@@ -1822,78 +1572,54 @@
 
 msgid "Remove widget"
-msgstr "Retirer le widget"
-
-msgid "boolean"
-msgstr "booléen"
-
-msgid "listitem"
-msgstr "élément de liste"
-
-msgid "string"
-msgstr "chaîne de caractères"
-
-msgid "possible values:"
-msgstr "valeurs possibles :"
-
-msgid "empty string"
-msgstr "chaîne vide"
-
-msgid "CSS class:"
-msgstr "Classe CSS :"
-
-msgid "Blogroll list"
-msgstr "Liste de liens"
-
-msgid "List of published pages"
-msgstr "Liste des pages publiées"
-
-msgid "List of simple menu items"
-msgstr "Liste des éléments de menu simple"
-
-msgid "Tags cloud"
-msgstr "Nuage de mots-clés"
-
-msgid "Search engine form"
-msgstr "Formulaire de recherche"
-
-msgid "List of navigation links"
-msgstr "Liste des liens de navigation"
-
-msgid "List of selected entries"
-msgstr "Liste des billets sélectionnés"
-
-msgid "List of available languages"
-msgstr "Liste des langues disponibles"
-
-msgid "List of categories"
-msgstr "Liste des catégories"
-
-msgid "RSS or Atom feed subscription links"
-msgstr "Liens d'abonnements aux flux RSS ou Atom"
-
-msgid "Last entries from feed"
-msgstr "Derniers billets d'un flux"
-
-msgid "Simple text"
-msgstr "Texte simple"
-
-msgid "List of last entries published"
-msgstr "Derniers billets publiés"
-
-msgid "List of last comments posted"
-msgstr "Liste des derniers commentaires postés"
-
-#~ msgid "Export a blog"
-#~ msgstr "Exporter un blog"
-
-#~ msgid "Export all content"
-#~ msgstr "Exporte tout le contenu"
-
-#~ msgid "Import from a feed"
-#~ msgstr "Importer depuis un flux"
-
-#~ msgid "Import a full backup file"
-#~ msgstr "Importer un fichier de sauvegarde complet"
-
-#~ msgid "The backup file does not appear to be well formed."
-#~ msgstr "Le fichier de sauvegarde semble mal formaté."
+msgstr "Supprimer le widget"
+
+#~ msgid "List"
+#~ msgstr "Liste"
+
+#~ msgid "Return to filters"
+#~ msgstr "Retour aux filtres"
+
+#~ msgid "import"
+#~ msgstr "importer"
+
+#~ msgid "Preview"
+#~ msgstr "Prévisualiser"
+
+#~ msgid "Send"
+#~ msgstr "Envoyer"
+
+#~ msgid "View page"
+#~ msgstr "Voir la page"
+
+#~ msgid "Preview page"
+#~ msgstr "Prévisualiser la page"
+
+#~ msgid "Save order"
+#~ msgstr "Enregistrer l'ordre"
+
+#~ msgid "External media"
+#~ msgstr "Média externe"
+
+#~ msgid "External media selector"
+#~ msgstr "Sélecteur de médias externes"
+
+#~ msgid "Supported media services"
+#~ msgstr "Services de média supportés"
+
+#~ msgid "Please enter the URL of the page containing the video you want to include in your post."
+#~ msgstr "Entrez l'URL de la page contenant la video que vous voulez intégrer à votre billet."
+
+#~ msgid "Page URL:"
+#~ msgstr "URL de la page :"
+
+#~ msgid "Media alignment"
+#~ msgstr "Alignement du média"
+
+#~ msgid "Media title"
+#~ msgstr "Titre du média"
+
+#~ msgid "Unsupported service"
+#~ msgstr "Service non pris en charge"
+
+#~ msgid "Invalid page URL"
+#~ msgstr "URL de la page non valide"
Index: locales/fr/public.po
===================================================================
--- locales/fr/public.po	(revision 221)
+++ locales/fr/public.po	(revision 438)
@@ -10,8 +10,8 @@
 "Last-Translator: xave <xave@dotclear.net>\n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Poedit-Language: French\n"
 
Index: ocales/lt/date.po
===================================================================
--- locales/lt/date.po	(revision 813)
+++ 	(revision )
@@ -1,135 +1,0 @@
-# German translation of DotClear
-# Copyright (C) 2008.
-# Andreas Diller <nendilo@gmail.com>, 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: Dotclear 2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-15 16:27+0200\n"
-"PO-Revision-Date: 2012-04-18 21:10+0100\n"
-"Last-Translator: Paulius Černakauskas <paulius.cernakauskas@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Lithuanian\n"
-"X-Poedit-Country: LITHUANIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-msgid "%Y-%m-%d %H:%M"
-msgstr "%d.%m.%Y %H:%M"
-
-msgid "_Jan"
-msgstr "Saus."
-
-msgid "_Feb"
-msgstr "Vas."
-
-msgid "_Mar"
-msgstr "Kov."
-
-msgid "_Apr"
-msgstr "Bal."
-
-msgid "_May"
-msgstr "Geg."
-
-msgid "_Jun"
-msgstr "Bir."
-
-msgid "_Jul"
-msgstr "Liep."
-
-msgid "_Aug"
-msgstr "Rugpj."
-
-msgid "_Sep"
-msgstr "Rugs."
-
-msgid "_Oct"
-msgstr "Spal."
-
-msgid "_Nov"
-msgstr "Lapkr."
-
-msgid "_Dec"
-msgstr "Gruodž."
-
-msgid "January"
-msgstr "sausio"
-
-msgid "February"
-msgstr "vasario"
-
-msgid "March"
-msgstr "kovo"
-
-msgid "April"
-msgstr "balandžio"
-
-msgid "May"
-msgstr "gegužės"
-
-msgid "June"
-msgstr "birželio"
-
-msgid "July"
-msgstr "liepos"
-
-msgid "August"
-msgstr "rugpjūčio"
-
-msgid "September"
-msgstr "rugsėjo"
-
-msgid "October"
-msgstr "spalio"
-
-msgid "November"
-msgstr "lapkričio"
-
-msgid "December"
-msgstr "gruodžio"
-
-msgid "_Mon"
-msgstr "Pr."
-
-msgid "_Tue"
-msgstr "An."
-
-msgid "_Wed"
-msgstr "Tr."
-
-msgid "_Thu"
-msgstr "Kt."
-
-msgid "_Fri"
-msgstr "Pn."
-
-msgid "_Sat"
-msgstr "Š."
-
-msgid "_Sun"
-msgstr "S."
-
-msgid "Monday"
-msgstr "pirmadienį"
-
-msgid "Tuesday"
-msgstr "antradienį"
-
-msgid "Wednesday"
-msgstr "trečiadienį"
-
-msgid "Thursday"
-msgstr "ketvirtadienį"
-
-msgid "Friday"
-msgstr "penktadienį"
-
-msgid "Saturday"
-msgstr "šeštadienį"
-
-msgid "Sunday"
-msgstr "sekmadienį"
-
Index: ocales/lt/help/blowupConfig.html
===================================================================
--- locales/lt/help/blowupConfig.html	(revision 813)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-<head>
-  <title>Blowup theme Konfiguration</title>
-</head>
-
-<body>
-<p>Eine ver&auml;nderten Konfiguration erlaubt eine den eigenen W&uuml;nschen entsprechende Anpassung des Blowup Theme. Um dieses zu erreichen, f&uuml;lle das Konfigurationsfeld aus und w&auml;hle einen vordefinierten Style.</p>
-
-<h3>Farben</h3>
-
-<p>Wenn Du einen Farbwert eingeben willst, dann solltest Du Hexadezimalzahlenformat verwenden. Zum Beispiel: "#FF0000" steht f&uuml;r die Farbe Rot. Du kannst auch die Farbpipette neben dem Farbfeld verwenden.</p>
-<p>Wenn Du nicht weisst, was Hexadezimalformat bedeutet:</p>
-<ul>
- <li><a href="http://de.wikipedia.org/wiki/Hexadezimale_Farbdefinition">Hexadezimale Farbdefinition</a> (Wikipedia)</li>
- <li><a href="http://kuler.adobe.com/">Adobe Kuler (Englisch)</a></li>
- <li><a href="http://colorblender.com/">ColorBlender (Englisch)</a></li>
- <li><a href="http://www.colorcombos.com/">ColorCombos (Englisch)</a></li>
-</ul>
-
-<h3>Masseinheiten</h3>
-
-<p>Die Festlegung der Seitengr&ouml;sse Deines Blogs erfolgt in folgenden Masseinheiten. Zum Beispiel: "1em". Solltest Du keine Einheit hinter Deinem Wert schreiben, wird Pixel (px) als Standard ausgegeben.</p>
-<p>Folgende Masseinheiten sind zur Verwendung verf&uuml;gbar:</p>
-<ul>
-  <li>px</li>
-  <li>em</li>
-  <li>ex</li>
-  <li>pt</li>
-  <li>%</li>
-</ul>
-
-<h3>Das Bild im Header</h3>
-
-<p>Du kannst ein Bild Deiner Wahl statt des Standardbildes einsetzen.</p>
-
-<p>Wenn Du  "Benutzerdefiniert..." in der Bilderliste ausw&auml;hlst, dann hast Du die M&ouml;glichkeit, Dein eigenes Bild upzuloaden. <strong>Das Dateiformat muss entweder JPG der PNG sein und es muss 800px breit sein.</strong>
-
-<p>Wenn Du ein JPG-Bild uploadest, dann wird automatisch ein Rahmen um das Bild gesetzt. Dies geschieht nicht bei der Verwendung eines PNG-Bildes und die Transparenz wird ebenfalls beibehalten.</p>
-
-<h3>Vordefinierte Styles</h3>
-
-<p>Du kannst Deinen vordefinierten Style aus dem Drop-down Menu "Vordefinierte Styles" w&auml;hlen.
-Wenn Du ein Style ausgew&auml;hlt hast, dann musst Deine &Auml;nderung abspeichern.</p>
-
-<p>Du kannst anschliessend den Style entsprechend Deiner Wahl anpassen.</p>
-
-<h3>Konfiguration Import / Export</h3>
-
-<p>Am Ende der Blowup Einstellungen kannst Du ein Feld mit der Bezeichnung "Konfiguration Import / Export" sehen. Dieses Textfeld beinhaltet die gegenw&auml;rtige Konfiguration. Du kannst diese kopieren und anderen zur Verf&uuml;gung stellen.</p>
-
-<p>Um eine Konfiguration zu importieren, brauchst Du nur das Feld mit Deinen Konfigurationsangaben ausf&uuml;llen. Anschliessend klicke auf "Code anwenden".</p>
-
-</body>
-</html>
Index: ocales/lt/help/core_blog_pref.html
===================================================================
--- locales/lt/help/core_blog_pref.html	(revision 813)
+++ 	(revision )
@@ -1,145 +1,0 @@
-<html>
-<head>
-  <title>Blogeinstellungen</title>
-</head>
-
-<body>
-
-<h3>Blogdetails</h3>
-<dl>
-  <dt>Blog ID</dt>
-  <dd>Einmalvergebene ID Deines Blogs. Diese kann nur in der Funktion des Super 
-    Adminstrators vergeben werden..</dd>
-  
-  <dt>Blogname</dt>
-  <dd>Name des Blogs, erforderlich.</dd>
-  
-  <dt>Blog URL</dt>
-  <dd>Vollst&auml;ndige Blog URL. Erforderlich und kann nur in der Funktion des 
-    Super Adminstrators vergeben werden..</dd>
-  
-  <dt>Blogstatus</dt>
-  <dd>
-    <ul>
-      <li><strong>online</strong>: Blog f&uuml;r alle Besucher ge&ouml;ffnet</li>
-      <li><strong>offline</strong>: Blog f&uuml;r  Besucher geschlossen, jedoch offen f&uuml;r Besucher mit Schreibrechten
-      </li>
-      <li><strong>Entfernt</strong>: Blog geschlossen f&uuml;r Besucher und Besucher mit Schreibrechten.</li>
-    </ul>
-  </dd>
-  
-  <dt>Blogbeschreibung</dt>
-  <dd>Hier kannst Du eine Beschreibung Deines Blogs einf&uuml;gen. Verwende einfachen Text ohne Formatierung.</dd>
-</dl>
-
-<h3>Blogkonfiguration</h3>
-<dl>
-  <dt>Name des Eigent&uuml;mer des Blogs</dt>
-  <dd>Name der Person, die f&uuml;r das Blog verantwortlich ist. Es k&ouml;nnte auch der Eigent&uuml;mer oder Herausgeber sein, sofern dieser existiert.</dd>
-  
-  <dt>Copyright Hinweis</dt>
-  <dd>Hinweis &uuml;ber die Urheberrechte des Blogs.</dd>
-  
-  <dt>Standardsprache</dt>
-  <dd>Sprache des Bloginterfaces. Entweder der vorhandenen Landessprache oder, wenn diese nicht verf&uuml;gbar ist, wird Englisch als Standard eingesetzt.
-  </dd>
-  
-  <dt>Blogzeitzone</dt>
-  <dd>Definiert die Zeitzone des Blogs und wird f&uuml;r Kommentare und Trackbacks verwendet.
-  </dd>
-  
-  <dt>Datumsformate</dt>
-  <dd>Das Datumsformat eines Blogeintrages. Weitere Informationen &uuml;ber Datum und Zeitformate siehe unten.
-  </dd>
-  
-  <dt>Zeitformat</dt>
-  <dd>Das Zeitormat eines Blogeintrages. Weitere Informationen &uuml;ber Datum und Zeitformate siehe unten.
-  </dd>
-  
-  <dt>Anzeige .. Eintr&auml;ge pro Seite </dt>
-  <dd>Diese Nummer wird die Begrenzung der Eintr&auml;ge auf der Homepage, der Startseite, der ersten Seite
-  jeder Kategorie und des RSS Feeds sein.</dd>
-  
-  <dt>Kommentare offen lassen f&uuml;r .. Tage</dt>
-  <dd>Die Anzahl der Tage zwischen der Ver&ouml;ffentlichung der Kommentare und Trackbacks nach der Ver&ouml;ffentlichung des Beitrages.
-  Bleibt das Feld frei, alle Kommentare sind offen.</dd>
-  
-  <dt>Anzeige von Smilies in Eintr&auml;gen und Kommentare </dt>
-  <dd>Anzeigeausschnitte von Abk&uuml;rzungen wie :-) oder ;-) als Icons.</dd>
-  
-  <dt>Kommentare akzeptieren</dt>
-  <dd>Globale Einstellung f&uuml;r das Akzeptieren von Kommentare im Blog. Du kannst auch die Priorit&auml;t f&uuml;r jeden einzelnen
-  Eintrag im Blogeintrag selbst setzen.</dd>
-  
-  <dt>Trackbacks akzeptieren</dt>
-  <dd>Globale Einstellung f&uuml;r das Akzptieren von Trackbacks im Blog. Du kannst auch die Priorit&auml;t f&uuml;r jeden einzelnen
-  Eintrag im Blogeintrag selbst setzen.
-  </dd>
-  
-  <dt>Kommentare und Trackbacks moderieren</dt>
-  <dd>Diese Kommentare und Trackbacks werden nur mit Einwilligung des Blogeigent&uuml;mers ver&ouml;ffentlicht.</dd>
-  
-  <dt>Hinzuf&uuml;gen der "nofollow" Anweisung auf Kommentare und Trackbacklinks</dt>
-  <dd>F&uuml;gt ein Attribut dem Kommentar und Trackbacklink bei, das Suchbots nicht erlaubt, diese Links zu verfolgen. 
-  Dieser Antispam-Filter hat seine Wirksamkeit.
-   </dd>
-  
-  <dt>Wiki syntax f&uuml;r Kommentare </dt>
-  <dd>Erlaubt das Verwenden der wiki syntax in Kommentaren.
-  </dd>
-</dl>
-
-<h3>Formatreferenzen</h3>
-<p>Einige Felder k&ouml;nnen in Verh&auml;ltnis zu Datum und Zeit gesetzt werden.
-Hier ist die Referenz:</p>
-
-<ul>
-  <li><strong>%a</strong>: gek&uuml;rzter Wochentag (lokal)</li>
-  <li><strong>%A</strong>: Kompletter Wochentag (lokal)</li>
-  <li><strong>%b</strong>: gek&uuml;rzter Monatsname (lokal)</li>
-  <li><strong>%B</strong>: Kompletter Monatsname (lokal)</li>
-  <li><strong>%c</strong>: Lokale Datum und Zeitangabe</li>
-  <li><strong>%C</strong>: Jahrhundert (Jahr, dividiert durch 100 und
-  abgerundet zwischen 00 und 99)</li>
-  <li><strong>%d</strong>: numerischer Monatstag (von 01 bis 31)</li>
-  <li><strong>%D</strong>: identisch mit %m/%d/%y</li>
-  <li><strong>%e</strong>: numerischer Monatstag (von 01 bis 31)</li>
-  <li><strong>%g</strong>: identisch mit %G, 2stellig.</li>
-  <li><strong>%G</strong>: Jahr  4stellig, entsprechend der Anzahl der Wochen
-  (cf. %V). Format und Wert identisch mit %Y, mit der Ausnahme, dass, wenn die Woche zum vorhergehenden oder nachfolgenden
-  Jahr geh&ouml;rt, das gegenw&auml;rtige Jahr verwendet wird.</li>
-  <li><strong>%h</strong>: identisch mit %b</li>
-  <li><strong>%H</strong>: digitale Uhrzeit, 24H Modus
-  (von 00 bis 23)</li>
-  <li><strong>%I</strong>: digitale Uhrzeit, 12H Modus
-  (von 01 bis 12)</li>
-  <li><strong>%j</strong>: Tag eines Jahres, digital (von 001 bis 366)</li>
-  <li><strong>%m</strong>: Monat, digital (von 1 bis  12)</li>
-  <li><strong>%M</strong>: Minute, digital</li>
-  <li><strong>%n</strong>: Zeilentrennung Character</li>
-  <li><strong>%p</strong>: entweder `am' oder `pm', bezogen zur absoluten Zeit
-  oder abh&auml;ngig von den lokalen Einstellungen.</li>
-  <li><strong>%r</strong>: Stunde, a.m. und p.m. Format</li>
-  <li><strong>%R</strong>: Stunde, 24h Format</li>
-  <li><strong>%S</strong>: Sekunde, digital</li>
-  <li><strong>%t</strong>: tab character</li>
-  <li><strong>%T</strong>: Gegenw&auml;rtige Zeit (identisch mit %H:%M:%S)</li>
-  <li><strong>%u</strong>: Wochentag, digit, von 1 bis 7. (1 steht f&uuml;r Montag)</li>
-  <li><strong>%U</strong>: Wochennummer, der erste Sonntag des Jahres ist der Tag, an dem die erste Woche beginnt.</li>
-  <li><strong>%V</strong>: Wochennummer definiert nach ISO 8601:1988, digital, 
-    von 01 bis 53. Die Woche 1 ist die erste Woche, mit mehr als 4 Tagen im gegenw&auml;rtigen 
-    Jahr, dessen Montag ist der erste Tag. (Verwende %G oder %g f&uuml;r die Jahrelemente 
-    korrespondierend zu der Anzahl der Wochen der in Erw&auml;gung gezogenenen 
-    Zeit.)</li>
-  <li><strong>%W</strong>: Anzahl der Wochen im Jahr, der erste Montag im Jahr ist der Beginn der ersten Woche.</li>
-  <li><strong>%w</strong>: Wochentag, digital, 0 steht f&uuml;r Sonntag</li>
-  <li><strong>%x</strong>: Bevorzugtes Format f&uuml;r den Tag ohne Zeit.</li>
-  <li><strong>%X</strong>: Bevorzugtes Format f&uuml;r die Zeit ohne Datum</li>
-  <li><strong>%y</strong>: Jahr, 2stellig (von 00 bis 99)</li>
-  <li><strong>%Y</strong>: tJahr, 4stellig</li>
-  <li><strong>%Z ou %z</strong>: Zeitzone, Name oder Kurzzeichen</li>
-  <li><strong>%%</strong>: ein Charakter in Worten `%' </li>
-</ul>
-
-</body>
-</html>
Index: ocales/lt/help/core_categories.html
===================================================================
--- locales/lt/help/core_categories.html	(revision 813)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<html>
-<head>
-  <title>Kategorien</title>
-</head>
-
-<body>
-<h3>Kategorienliste</h3>
-<dl>
-  <dt>Neue Kategorie erstellen</dt>
-  <dd>Gib Deiner Kategorie den Namen, den Du w&uuml;nschst und
-  klicke auf Speichern. Um den Namen dieser Kategorie zu ver&auml;ndern,
-  klicke auf deren Namen in der Liste.</dd>
-  
-  <dt>Wechseln der Kategoriezuordnung</dt>
-  <dd>Um die Reihenfolge der Kategorien zu &auml;ndern, ziehe diese am 
-  Dreickeck in die gew&uuml;nschte Position und lass sie los. 
-  Anschliessend speichere, was Du ge&auml;ndert hast, in dem Du auf <strong>Reihenfolge speichern</strong> klickst.
-  Solltest Du kein Dreieck sehen, dann verwende das Nummernfeld und gib der Kategorie die gew&uuml;nschte Positionsnummer. 
-  </dd>
-</dl>
-
-<h3>Modifizierung einer Kategorie</h3>
-<dl>
-  <dt>Titel</dt>
-  <dd>Gib Deiner Kategorie den Namen, den Du w&uuml;nschst und
-   klicke auf Speichern. 
-  </dd>
-  
-  <dt>URL</dt>
-  <dd>DotClear erstellt eine Standard URL f&uuml;r diese Kategorie und
-   macht diese damit nach folgendem Beispiel erreichbar: <strong>http://mein-blog.tld/category/Meine-Kategorie</strong>. 
-    Du kannst auf das kleine Schloss rechts vom Namen klicken, um den Namen zu ver&auml;ndern. 
-  </dd>
-  
-  <dt>Beschreibung</dt>
-  <dd>In dem Textfeld kannst Du beschreiben, was diese Kategorie beinhaltet 
-  und es wird angezeigt, wenn Du Deine Kategorie in Deinem Blog aufrufst. Du kannst es mit beliebigem Inhalt f&uuml;llen
-  (Abs&auml;tze, Listenpunkte, etc.) Das Format fuer dieses Feld ist HTML.</dd>
-  <!-- question : tous medias acceptés ? -->
-</dl>
-
-</body>
-</html>
Index: ocales/lt/help/core_comments.html
===================================================================
--- locales/lt/help/core_comments.html	(revision 813)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<html>
-<head>
-  <title>Kommentare</title>
-</head>
-
-<body>
-<h3>Filter f&uuml;r die Kommentarliste</h3>
-<dl>
-  <dt>Typ:</dt>
-  <dd>Keine, Kommentare oder Trackbacks.</dd>
-  
-  <dt>Status:</dt>
-  <dd><ul>
-    <li><strong>Junk</strong>: <!-- Pour spampl' ? --></li>
-    <li><strong>unerledigt</strong>: <!-- Modération ? --></li>
-    <li><strong>unver&ouml;ffentlicht</strong>: offline</li>
-    <li><strong>ver&ouml;ffentlicht</strong>: online</li>
-  </ul></dd>
-  
-  <dt>Ordnen nach:</dt>
-  <dd>W&auml;hle: Datum, Artikeltitel, Autor oder Status, 
-  dann w&auml;hle die Reihenfolge.
-  </dd>
-  
-  <dt>Reihenfolge</dt>
-  <dd>W&auml;hle, ob die Liste aufsteigend oder absteigend sortiert werden soll. 
-  </dd>
-  
-  <dt>Kommentatoren</dt>
-  <dd>Diese Suche ist nicht sehr genau. Willst Du nur nach einem Teil des Namens
-   suchen, dann schreibe ein  <strong>*</strong>davor.
-   </dd>
-  
-  <dt>Kommentare pro Seite:</dt>
-  <dd>Erlaubt Dir die Anzahl der Kommentare pro Seite festzulegen.</dd>
-</dl>
-
-<h3>Einen Kommentar modifzieren oder hinzuf&uuml;gen</h3>
-<dl>
-  <dt>Autor:</dt>
-  <dd>Autorenname. Pflichtfeld</dd>
-  
-  <dt>Email:</dt>
-  <dd>E-mailadresse des Autoren</dd>
-  
-  <dt>Website:</dt>
-  <dd>URL der Website des Autoren</dd>
-  
-  <dt>Status:</dt>
-  <dd><ul>
-    <li><strong>Junk</strong>: <!-- Pour spampl' ? --></li>
-    <li><strong>unerledigt</strong>: <!-- Modération ? --></li>
-    <li><strong>unver&ouml;ffentlicht</strong>: offline</li>
-    <li><strong>ver&ouml;ffentlicht</strong>: online</li>
-  </ul></dd>
-  
-  <dt>Kommentar:</dt>
-  <dd>Inhalt des Kommentars und das Format ist HTML.
-  </dd>
-</dl>
-</body>
-</html>
Index: ocales/lt/help/core_media.html
===================================================================
--- locales/lt/help/core_media.html	(revision 813)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<html>
-<head>
-  <title>Mediamanager</title>
-</head>
-
-<body>
-
-<h3>Medialiste</h3>
-<p>Der Mediamanager zeigt eine &Uuml;bersicht aller Medien, die Du in Deinem Blog, 
-in dem Du gerade arbeitest, verwendest oder hochgeladen hast.</p>
-
-<p>Du klickst auf den Namen oder das Icon oder den Unterordner, um diese ansehen zu k&ouml;nnen.</p>
-
-<p>Wenn Du ein MP3 anklickst, zeigt sich ein kleiner Player und Du kannst die Datei abspielen. Allerdings muss das 
-Flash plugin in Deinem Browser installiert sein, um MP3 abspielen zu koennen.</p>
-
-<p>Bilder werden sofern m&ouml;glich mit einem Thumbnail dargestellt.</p>
-
-<h3>Dateien hinzuf&uuml;gen</h3>
-<dl>
-  <dt>Ausw&auml;hlen der Datei</dt>
-  <dd>Du w&auml;hlst die Datei lokal auf Deinem Rechner aus. Eine Datei gr&ouml;sser 
-    als die maximale Gr&ouml;sse wird nicht hochgeladen.</dd>
-  <dt>Titel</dt>
-  <dd>Opptional, ob Du deiner Datei einen Titel geben m&ouml;chtest.</dd>
-  <dt>Privat</dt>
-  <dd>&Uuml;berpr&uuml;fe, ob Du die Datei nur privat nutzen willst und diese 
-    kann &ouml;ffentlich nicht abgerufen werden.</dd>
-</dl>
-
-<h3>Neuer Ordner</h3>
-<p>Du kannst Unterordner in Deinem Mediamanger erstellen. Setze einen Namen ein und speichere es ab.</p>
-
-<h3>Mediendetails</h3>
-<p>Diese Seite erlaubt Dir Informationen &uuml;ber die gegenw&auml;rtigen Dateien 
-  und wo Du diese eingesetzt hast, zu erhalten.</p>
-
-<dl>
-  <dt>Dateiname</dt>
-  <dd>Dateinamen wechseln</dd>
-  
-  <dt>Dateititel</dt>
-  <dd>Gib der Datei einen Titel oder behalte den gegenw&auml;rtigen.</dd>
-  
-  <dt>Dateidatum</dt>
-  <dd>&Auml;ndere das Dateidatum.</dd>
-  
-  <dt>Privat</dt>
-  <dd>Suche aus, ob die Datei privat oder &ouml;ffentlich ist.</dd>
-  
-  <dt>Neuer Ordner</dt>
-  <dd>Erlaubt Dir, die Dateien in ein neues Verzeichnis zu legen.</dd>
-  
-  <dt>Datei austauschen</dt>
-  <dd>Du kannst die Datei austauschen, beh&auml;lst jedoch alle Attribute, 
-  wie Titel und Zuordnung des Blogeintrages.
-  Beachte die maximale Gr&ouml;sse.</dd>
-</dl>
-
-<h3>Besondere Behandlung eines Bildes</h3>
-<p>Wenn Du ein Bild hinzuf&uuml;gst, 4 verschiedene Gr&ouml;ssen werden m&ouml;glich sein:</p>
-<ul>
-  <li><strong>Quadrat</strong>: ein 48x48 Pixel Vorschaubild</li>
-  <li><strong>Vorschaubild</strong>: das Bild wird zu einer Breite von 100 Pixel in der Breite reduziert.</li>
-  <li><strong>Klein</strong>: Die Breite ist 240 Pixel</li>
-  <li><strong>Mittel</strong>: Die Breite betr&auml;gt 500 Pixel.</li>
-  <li><strong>Original</strong>: die Originalgr&ouml;sse</li>
-</ul>
-
-<h3>Eine Datei einem Blogeintrag hinzuf&uuml;gen</h3>
-<p>Um eine Datei einem Beitrag zuzuf&uuml;gen, musst Du zuerst einen Blogbeitrag erstellen. 
-Klicke auf "Datei zu diesem Beitrag hinzuf&uuml;gen" und es &ouml;ffnet sich der Medienmanager.</p>
-
-<p>Klicke auf das [+] Icon (Datei zu diesem Beitrag hinzuf&uuml;gen). 
-Die Datei wird dem Beitrag hinzugef&uuml;gt.</p>
-
-<p>Die angef&uuml;gten Dateien werden rechts neben dem Beitrag angezeigt.
-MP3 Dateien werden durch den mitgelieferten Flash Player f&uuml;r Besucher abspielbar sein.</p>
-
-<h3>Podcast und Ver&ouml;ffentlichen von Musikdateien</h3>
-<p>Alle Dateien sind in Deinem RSS Feed eingef&uuml;gt und erlaubt jeden Dateityp anzubieten.</p>
-
-</body>
-</html>
Index: ocales/lt/help/core_post.html
===================================================================
--- locales/lt/help/core_post.html	(revision 813)
+++ 	(revision )
@@ -1,113 +1,0 @@
-<html>
-<head>
-  <title>Einen Eintrag bearbeiten</title>
-</head>
-
-<body>
-
-<h3>Einen Eintrag bearbeiten</h3>
-
-<dl>
-  <dt>Titel des Eintrags</dt>
-  <dd>Gib Deinem Eintrag einen Titel. Dieses Feld ist Pflicht.</dd>
-  
-  <dt>Exzerpt oder Auszug</dt>
-  <dd>Der Inhalt dieses Feldes wird auf Seiten wie der Startseite oder Kategorieseite gezeigt, die Blogeintr&auml;ge als Liste 
-  ausgeben. Ein Exzerpt ist mit einem Link "weiter lesen" gekennzeichnet.
-  Dieser Auszug wird auch auf der eigentlichen Eintragsseite, der post.html, wiedergegeben. 
-  Wenn Du es leer l&auml;sst, wird der Text im <em>Inhalt</em> Feld auf der Startseite
-  und anderen Seiten mit Listen gezeigt.</dd>
-  
-  <dt>Inhalt</dt>
-  <dd>Der Inhalt Deines Blogeintrages. Pflichtfeld.</dd>
-  
-  <dt>Anmerkungen</dt>
-  <dd>Dieses Feld ist f&uuml;r pers&ouml;nliche Notizen. Der Inhalt wird nicht in Deinem Blog angezeigt.</dd>
-  
-  <dt>Kategorie</dt>
-  <dd>Die Kategorie Deines Eintrages.Um eine neue Kategorie zu erstellen, klicke auf "Kategorie" in der linken Menuleiste. 
- Die Auswahl einer Kategorie ist kein Pflichtfeld. M&ouml;chtest Du keine Kategorie ausw&auml;hlen, bleibt das Feld blank. </dd>
-  
-  <dt>Status des Eintrags</dt>
-  <dd>Erlaubt folgenden Status auzuw&auml;hlen:
-    <ul>
-      <li><strong>unerledigt:</strong> Status ist noch nicht entschieden.</li>
-      <li><strong>eingeplant:</strong> Der Eintrag wird zu einer bestimmten Zeit online gehen, die
-      in dem <em>Ver&ouml;ffentlicht am</em> Feld angegeben wird.</li>
-      <li><strong>unver&ouml;ffentlicht:</strong> Der Eintrag ist offline.</li>
-      <li><strong>ver&ouml;ffentlicht:</strong> Der Eintrag ist online.</li>
-    </ul>
-  </dd>
-  
-  <dt>Ver&ouml;ffentlicht am</dt>
-  <dd>Hier kannst Du Datum und Zeit ver&auml;ndern. Wenn der Status des Eintrags
-  <em>eingeplant</em> ist,  wird dieser zu der gew&auml;hlten Zeit erscheinen.</dd>
-  
-  <dt>Textformat</dt>
-  <dd>W&auml;hle den Syntaxtyp aus. Wiki ist eine vereinfachte Syntax und wird 
-    zu xhtml konvertiert. Wir raten die Wiki Syntax zu verwenden, wenn Du keine 
-    html Kenntnisse hast. Schaue in der Wiki Syntax Reference nach mehr Informationen.</dd>
-  
-  <dt>Kommentare akzeptieren</dt>
-  <dd>W&auml;hle die Box aus, um Besuchern die M&ouml;glichkeit zu geben, Kommentare zu schreiben. Bitte beachte die
-  allgemeinen Einstellungen f&uuml;r Dein Blog.</dd>
-  
-  <dt>Trackbacks akzeptieren</dt>
-  <dd>Ein Trackback gibt die M&ouml;glichkeit, einen Auszug aus Deinem Blogeintrag in einem anderen Blog als Kommentar zu hinterlassen. 
-  Bitte beachte die  allgemeinen Einstellungen f&uuml;r Dein Blog.</dd>
-  
-  <dt>Ausgew&auml;hlter Beitrag</dt>
-  <dd>Ein ausgew&auml;hlter Beitrag wird in Deiner Sidebar mit dem Widget "Ausgew&auml;hlter Beitrag" erscheinen.</dd>
-  
-  <dt>Passwort eintragen</dt>
-  <dd>Du kannst ein Passwort f&uuml;r Deinen Eintrag anbieten. Ein passwortgesch&uuml;tzter Beitrag wird nicht in Deinem Blog erscheinen
-  und wird nur mit dem direkten Aufrufen der URL (siehe <em>Eintrag ansehen</em>) und dem Eingeben des Passwortes einsehbar sein.</dd>
-  
-  <dt>Basisname</dt>
-  <dd>Wenn Du auf das Schloss klickst, dann kannst Du dem Eintrag eine andere URL geben.
-Sollte die URL schon vergeben sein, wird eine Nummer hinzugef&uuml;gt.</dd>
-  
-  <dt>Eintragssprache</dt>
-  <dd>Deine Sprache wird mit zwei Buchstaben angegeben. Standardsprache ist Deine 
-  (Benutzer) Sprache, jedoch kannst Du auch die Sprache &auml;ndern, z.B. 
-  "en" oder "fr-qc". Dieser Code ist nur f&uuml;r den jeweiligen Eintrag und eine &Uuml;berpr&uuml;fung findet nicht statt.</dd>
-  
-  <dt>Anlagen</dt>
-  <dd>Anlagen sind alle Medien in Deinem Beitrag. Das Link <em>Anlage dem Eintrag hinzuf&uuml;gen"</em> 
-  erlaubt weitere Dateien hinzuzuf&uuml;gen. Speichere Deinen Eintrag ab, bevor Du auf das Link klickst. 
-  Weitere Inofrmationen siehe in der Hilfe zum Medienmanager nach.</dd>
-</dl>
-
-<h3>Kommentare</h3>
-<dl>
-  <dt>Kommentarliste</dt>
-  <dd>Im <em>Kommentare</em> Registerblatt kannst Du diese lesen und den Status dieser &auml;ndern. 
-  Als Blogadministrator kannst Du Kommentare offline und online setzen, diese l&ouml;schen oder als Junk kennzeichnen.</dd>
-  
-  <dt>Einen Kommentar hinzuf&uuml;gen</dt>
-  <dd>Im <em>Einen Kommentar hinzuf&uuml;gen</em> Registerblatt kannst Du einen Kommentar schreiben oder 
-  auf einen Kommentar antworten, ohne den Backend Bereich des Blogs zu verlassen.
-  Die Syntax ist xhtml. Benutze das Feld, um einen Kommentar zu ver&auml;ndern</dd>
-</dl>
-
-<h3>Trackback</h3>
-<p>Um ein Trackback zu machen, klicke auf das <em>Ping blogs</em> Link.
-Du wirst einen Hinweis finden, wenn der Status nicht <em>ver&ouml;ffentlicht</em> ist.</p>
-
-<dl>
-  <dt>URLs pingen</dt>
-  <dd>F&uuml;ge die Trackback URL des Blogeintrages ein, das Du pingen willst.</dd>
-  
-  
-  <dt>Exzerpt senden</dt>
-  <dd>Dieses Feld beinhaltet die ersten S&auml;tze, die auch in dem Blog angezeigt werden, dass Deinen Beitragt anpingt. 
-  Du kannst den Inhalt bearbeiten.</dd>
-  
-  
-  <dt> Ping URLs automatisch entdecken</dt>
-  <dd>Wenn ein Link in Deinem Blog zu einem spezifischen Eintrag f&uuml;hrt und die Blogeinstellungen entsprechend sind, 
- wird dieses Tool erlauben automatisch die URLs f&uuml;r Dich zu pingen.</dd>
-</dl>
-
-</body>
-</html>
Index: ocales/lt/help/core_posts.html
===================================================================
--- locales/lt/help/core_posts.html	(revision 813)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<html>
-<head>
-  <title>Eintr&auml;ge organisieren</title>
-</head>
-
-<body>
-
-<h3>Sortierung die Eintr&auml;geliste</h3>
-
-<dl>
-  <dt>Autor</dt>
-  <dd>Sortierung nach Autor</dd>
-  
-  <dt>Kategorie</dt>
-  <dd>Sortierung nach Kategorie.</dd>
-  
-  <dt>Status</dt>
-  <dd><ul>
-    <li><strong>unerledigt:</strong> Status ist noch nicht entschieden.</li>
-    <li><strong>geplant:</strong> Eintrag wird automatisch online gesetzt.</li>
-    <li><strong>unver&ouml;ffentlicht:</strong> Eintr&auml;ge sind offline</li>
-    <li><strong>ver&ouml;ffentlicht:</strong> Eintr&auml;ge sind online.</li>
-  </ul></dd>
-  
-  <dt>Ausgew&auml;hlt</dt>
-  <dd>Nur ausgew&auml;hlte oder unausgew&auml;hlte Eintr&auml;ge sind erw&auml;hnt.</dd>
-  
-  <dt>Monat</dt>
-  <dd>Sortiert nach einem bestimmten Monat oder Jahr.</dd>
-  
-  <dt>Sprache</dt>
-  <dd>Filter sortiert nach Sprachen, die in dem Blog verwendet wurden.</dd>
-  
-  <dt>Reihenfolge nach</dt>
-  <dd>Definiert die Reihenfolge nach Datum, Titel, Autor, Status oder 
-  dem ausgew&auml;hlten Status.</dd>
-  
-  <dt>Sortierung</dt>
-  <dd>Aufsteigende oder absteigende Reihenfolge.</dd>
-  
-  <dt>Eintr&auml;ge per Seite</dt>
-  <dd>Anzahl der Eintr&auml;ge, die auf jeder Seite gezeigt werden sollen.
-  </dd>
-</dl>
-
-<h3>Ausgew&auml;hlte Status eines Eintrages</h3>
-<p>Sofern Deine Berechtigungen es erlauben, kannst Du &uuml;bergreifende
-Verfahren der Eintr&auml;ge setzen.</p>
-
-<ul>
-  <li><strong>Ver&ouml;ffentlichen</strong>: Stellt Eintr&auml;ge nach dem Speichern sofort online.</li>
-  <li><strong>Unver&ouml;ffentlicht</strong>: Eintr&auml;ge bleiben zun&auml;chst offline.</li>
-  <li><strong>Geplant</strong>: Eintr&auml;ge werden nach Zeitplan online gesetzt.</li>
-  <li><strong>Ungeplant</strong>: Ist weder ver&ouml;ffentlicht noch unver&ouml;ffentlicht.</li>
-  <li><strong>Kategorie wechseln</strong>: Du kannst die bevorzugte Kategorie w&auml;hlen.</li>
-  <li><strong>Autoren wechseln</strong>: Erlaubt den Autoren ID zu wechseln, wenn Du in Vertretung
-  f&uuml;r jemanden den Artikel schreibst.</li>
-  <li><strong>L&ouml;schen</strong>: Zur&uuml;ckhalten der Eintr&auml;ge
-  (dieses Verfahren kann nicht r&uuml;ckg&auml;ngig gemacht werden).</li>
-</ul>
-
-</body>
-</html>
Index: ocales/lt/help/core_user_pref.html
===================================================================
--- locales/lt/help/core_user_pref.html	(revision 813)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<html>
-<head>
-  <title>Benutzereinstellungen</title>
-</head>
-
-<body>
-
-<h3>Benutzereinstellungen</h3>
-<dl>
-  <dt>Name, Vorname</dt>
-  <dd>Wenn der Nickname leer ist, dann wird der Autorenname stattdessen angezeigt, 
-  wobei erst der Vorname und dann der Nachname angezeigt werden.</dd>
-  
-  <dt>Nickname</dt>
-  <dd>Du kannst selbst entscheiden, was der Nickname Deiner Eintr&auml;ge sein soll.</dd>
-  
-  <dt>E-mail</dt>
-  <dd>Diese Addresse wird Nachrichten wie "Neuer Kommentar ist eingetroffen" erhalten.</dd>
-  
-  <dt>URL</dt>
-  <dd>Die Webadresse des Benutzers, sofern der Autor eine Verlinkung zu seiner Webadresse w&uuml;nscht.
-  </dd>
-  
-  <dt>Bevorzugtes Format</dt>
-  <dd>Ausw&auml;hlen der bevorzugten Syntax. Wiki ist eine vereinfachte Syntax und wird zu xhtml konvertiert. 
-  Wir raten die Wiki Syntax zu verwenden, wenn Du keine HTML Kenntnisse hast. </dd>
-  
-  <dt>Standardstatus des Eintrages</dt>
-  <dd>Der Standardstatus kann folgender sein:
-    <ul>
-      <li><strong>unerledigt:</strong> Status ist noch nicht entschieden.</li>
-      <li><strong>eingeplant:</strong> Der Eintrag wird zu einer bestimmten Zeit online gehen, die
-      in dem <em>Ver&ouml;ffentlicht am</em> Feld angegeben wird.</li>
-      <li><strong>unver&ouml;ffentlicht:</strong> Der Eintrag ist offline.</li>
-      <li><strong>ver&ouml;ffentlicht:</strong> Der Eintrag ist online.</li>
-    </ul>
-  </dd>
-  
-  <dt>Die H&ouml;he des Eintragsfeldes</dt>
-  <dd>Die H&ouml;he des Eintragsfeldes ist standardm&auml;ssig auf 24 gesetzt.</dd>
-  
-  <dt>Benutzersprache</dt>
-  <dd>Die bevorzugte Sprache in der Du die Beitr&auml;ge ver&ouml;ffentlichen willst. Sollte eine &Uuml;bersetzung vorhanden sein,
-  wird die Benutzeroberfl&auml;che ebenfalls in der Sprache angezeigt.</dd>
-  
-  <dt>Die Zeitzone des Benutzers</dt>
-  <dd>Die Wahl wird definiert durch die Zeit, in der der Eintrag ver&ouml;ffentlicht wird.</dd>
-  
-  <dt>WYSIWYG Modus verwenden</dt>
-  <dd>Erlaubt die Verwendung des WYSIWYG Editors f&uuml;r das Eintragsfeld und Beschreibungsfeld.</dd>
-</dl>
-
-<h3>Passwort austauschen</h3>
-<p>Um das Passwort wechseln zu k&ouml;nnen musst Du es zwei Mal eintragen:
-<em>Neues Passwort</em> und <em>Passwort best&auml;tigen</em>. Die minimale L&auml;nge ist 6 Buchstaben.</p>
-<p>Wird kein neues Passwort eingegeben, bleibt das alte bestehen.</p>
-
-</body>
-</html>
Index: ocales/lt/help/core_wiki.html
===================================================================
--- locales/lt/help/core_wiki.html	(revision 813)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<html>
-<head>
-  <title>Wiki Syntax Referenz</title>
-</head>
-
-<body>
-
-<h3>Wiki Syntax Referenz</h3>
-
-<p>Die Wiki Syntax ist ein Weg, mit minimalen Tags Deinen Text zu bearbeiten. 
-Du ben&ouml;ntigst nur die Grundvoraussetzungen wie Titel, Absatz, Zitat und Liste...</p>
-
-<dl>
-<dt>Blockelemente</dt>
-<dd>
-<ul>
-  <li>Lass eine leere Zeile zwischen zwei gleichen Blocks</li>
-  <li><strong>Absatz</strong>: Freier Text, endet mit einer leeren Zeile, wenn ein n&auml;chster Absatz folgt.</li>
-  <li><strong>Titel</strong>: <code>!!! title</code>, <code>!! title</code>
-  oder <code>! title</code>, was Dir die M&ouml;glichkeit gibt, 3 Formen zu haben.</li>
-  <li><strong>Horizontale Linie</strong>: <code>----</code></li>
-  <li><strong>Liste</strong>: Beginne jede Zeile mit
-  <code>*</code> oder <code>#</code> f&uuml;r nummerierte und unnummerierte Listen.
-  Listenzuordnung ist bereits gemacht mit folgenden Verwendungen:
-<pre>
-* item 1
-** item 1.1
-* item 2
-*# item 2.1
-...
-</pre>
-  </li>
-  <li><strong>Vormatierter Text</strong>: Jede Zeile muss mit einem Leerzeichen beginnen.</li>
-  <li><strong>Zitat</strong>: Jede Zeile muss mit einem Semikolon beginnen (<code>&gt;</code>).</li>
-</ul>
-</dd>
-
-<dt>Tagformate</dt>
-<dd>
-<ul>
-  <li><strong>Betonung</strong>: zwei Anf&uuml;hrungszeichen <code>''text''</code></li>
-  <li><strong>Starke Betonung</strong>: zwei Unterstriche <code>__text__</code></li>
-  <li><strong>Neue Zeile</strong>: <code>%%%</code></li>
-  <li><strong>Einschub</strong>: zwei Pluszeichen <code>++text++</code></li>
-  <li><strong>L&ouml;schung</strong>: zwei Minuszeichen <code>--text--</code></li>
-  <li><strong>Link</strong>: <code>[url]</code>, <code>[name|url]</code>,
-    <code>[name|url|language]</code> oder <code>[name|url|language|title]</code></li>
-  <li><strong>Bild</strong>:
-    <code>((url|alternative text))</code>,
-    <code>((url|alternative text|position))</code> oder
-    <code>((url|alternative text|position|long description))</code>.
-    <br />Die Position kann L oder G (links), R oder D (rechts) oder C (zentriert) sein.</li>
-  <li><strong>Ankerpunkt</strong>: <code>~anchor~</code></li>
-  <li><strong>Acronym</strong>: <code>??acronym|title??</code></li>
-  <li><strong>Inline HTML</strong>: zwei backquotes <code>``html code``</code></li>
-  <li><strong>Inline quote</strong>: <code>{{quote}}</code>,
-    <code>{{quote|language}}</code> oder <code>{{quote|language|url}}</code></li>
-  <li><strong>Code</strong>: <code>@@code@@</code></li>
-  <li><strong>Fussnote</strong>: <code>$$footnote$$</code></li>
-</ul>
-</dd>
-
-<dt>Unformatierter Text</dt>
-<dd>Wenn Du Deinen Text nicht formatieren willst, dann f&uuml;ge einfach nur
-<code>\</code> ein. Zum Beispiel:
-<code>\[Text in eckigen Klammern ohne URL\]</code>
-</dd>
-
-<dt>HTML Code</dt>
-<dd>Auch wenn Du Dich f&uuml;r die Verwendung der Wiki Syntax entschieden hast, Du ben&ouml;ntigst
-mitunter ausdrucksreichere M&ouml;glichkeiten, die Dir die HTML Syntax bietet. Geh folgendermassen vor:
-<pre>
-///html
-&lt;p style="color:red"&gt;mein text in rot&lt;/p&gt;
-///
-</pre>
-</dd>
-</dl>
-
-
-</body>
-</html>
Index: ocales/lt/help/themeEditor.html
===================================================================
--- locales/lt/help/themeEditor.html	(revision 813)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-<head>
-  <title>Theme Editor</title>
-</head>
-
-<body>
-<p>Der Theme Editor erlaubt Dir die Templatedateien,  die Stylesheetdateien und die JavaScriptdateien des Theme zu &auml;ndern, das Du gerade verwendest.</p>
-
-<p>Die Dateiliste ist in 3 Sektionen aufgeteilt&nbsp;:</p>
-<ul>
-  <li>Templatedateien: die Templates</li>
-  <li>CSS Dateien: die Stylesheets</li>
-  <li>JavaScriptdateien</li>
-</ul>
-
-<p>Die gelben Quadrate vor dem Dateinamen bedeuten, dass diese Dateien Teil des Templates sind. Schwarze Quadrate bedeuten, dass die Dateien Teil des "Standard" Theme sind.</p>
-<p>Wenn Du eine Datei &auml;ndern willst, die zum "Standard" Theme geh&ouml;rt, so wird diese automatisch kopiert.</p>
-
-<p>Um eine Datei zu bearbeiten, klicke einfach auf den Dateinamen und der Inhalt dieser wird im Editor erscheinen. 
-Wenn der Inhalt beschrieben werden kann, dann kannst Du auch auf "Speichern" klicken und Deine &Auml;nderungen werden gespeichert.</p>
-
-<p>Die &Auml;nderungen sind nicht r&uuml;ckg&auml;ngig zu machen und deshalb sei vorsichtig.</p>
-
-<p>Mehr Hilfe bei der &Auml;nderungen bekommst Du hier <a href="http://doc.dotclear.net/2.0/resources/templates">Template Tagliste</a>.</p>
-
-</body>
-</html>
Index: ocales/lt/main.po
===================================================================
--- locales/lt/main.po	(revision 813)
+++ 	(revision )
@@ -1,2630 +1,0 @@
-# German translation of DotClear
-# Copyright (C) 2008.
-# Andreas Diller <nendilo@gmail.com>, 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: Dotclear 2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-15 22:40+0100\n"
-"PO-Revision-Date: 2012-04-19 03:31+0100\n"
-"Last-Translator: Paulius Černakauskas <paulius.cernakauskas@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Lithuanian\n"
-"X-Poedit-Country: LITHUANIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-msgid "Dotclear has been upgraded."
-msgstr "Dotclear atnaujintas."
-
-msgid "Password reset"
-msgstr "Naujo slaptažodžio nustatymas"
-
-msgid "Someone has requested to reset the password for the following site and username."
-msgstr "Dalyvis paprašė nustatyti naują slaptažodį šiame puslapyje ir tokiu vardu."
-
-msgid "Username:"
-msgstr "Prisijungimo vardas:"
-
-msgid "To reset your password visit the following address, otherwise just ignore this email and nothing will happen."
-msgstr "Paspauskite atsiųstą nuoroda tam, kad iš naujo nustatyti slaptažodį. Jei neketinote keisti slaptažodžio, nespauskite ir senasis išliks."
-
-#, php-format
-msgid "The e-mail was sent successfully to %s."
-msgstr "El. laiškas sėkmingai išsiųstas į %s."
-
-msgid "Your new password"
-msgstr "Jūsų naujas slaptažodis."
-
-msgid "Password:"
-msgstr "Slaptažodis:"
-
-msgid "Your new password is in your mailbox."
-msgstr "Naujas slaptažodis yra jūsų elektroniniame pašte."
-
-msgid "Passwords don't match"
-msgstr "Slaptažodžiai nesutampa"
-
-msgid "You didn't change your password."
-msgstr "Jūs nepakeitėte savo slaptažodžio."
-
-msgid "You have to change your password before you can login."
-msgstr "Jūs turite pakeisti savo slaptažodį kad galėtumėte prisijungti."
-
-msgid "In order to login, you have to change your password now."
-msgstr "Jūs turite pakeisti savo slaptažodį prieš prisijungdami."
-
-msgid "Wrong username or password"
-msgstr "Klaidingas prisijungimo vardas ir slaptažodis"
-
-msgid "Back to login screen"
-msgstr "Atgal į prisijungimo puslapį"
-
-msgid "Request a new password"
-msgstr "Prašyti naujo slaptažodžio"
-
-msgid "Email:"
-msgstr "El. paštas:"
-
-msgid "recover"
-msgstr "atstatyti"
-
-msgid "Change your password"
-msgstr "Slaptawodžio keitimas"
-
-msgid "New password:"
-msgstr "Naujas slaptažodis:"
-
-msgid "Confirm password:"
-msgstr "Patvirtinkite slaptažodį:"
-
-msgid "change"
-msgstr "keisti"
-
-msgid "Remember my ID on this computer"
-msgstr "Prisiminti mano ID šiame kompiuteryje"
-
-msgid "login"
-msgstr "prisijungti"
-
-msgid "You must accept cookies in order to use the private area."
-msgstr "Tam kad pasiekti tolimesnį puslapį jūs turite leisti įjungti Cookies."
-
-msgid "I forgot my password"
-msgstr "Pamiršau slaptažodį"
-
-msgid "New blog"
-msgstr "Naujas blogas"
-
-msgid "Blogs"
-msgstr "Blogai"
-
-msgid "Blog details"
-msgstr "Blogas išsamiau"
-
-msgid "Blog ID:"
-msgstr "Blogo ID:"
-
-msgid "Required field"
-msgstr "Būtinas laukelis"
-
-msgid "At least 2 characters using letters, numbers or symbols."
-msgstr "Naudokite raidžių, skaičių ir simbolių kombinaciją iš mažiausiai 2 ženklų."
-
-msgid "Please note that changing your blog ID may require changes in your public index.php file."
-msgstr "Jei keičiate savo blogo ID, gali tekti atlikti pakeitimus index.php faile."
-
-msgid "Blog name:"
-msgstr "Blogo pavadinimas:"
-
-msgid "Blog URL:"
-msgstr "Blogo URL:"
-
-msgid "Blog description:"
-msgstr "Blogo aprašymas:"
-
-msgid "save"
-msgstr "išsaugoti"
-
-msgid "No such blog ID"
-msgstr "Tokio blogo ID nėra"
-
-msgid "Password verification failed"
-msgstr "Slaptažodžio patvirtinti nepavyko."
-
-msgid "Delete a blog"
-msgstr "Ištrinti blogą"
-
-msgid "Warning"
-msgstr "Dėmesio"
-
-#, php-format
-msgid "You are about to delete the blog %s. Every entry, comment and category will be deleted."
-msgstr "Jūs ketinate ištrinti %s blogą. Visi įrašai, komentarai ir kategorijos bus ištrintos."
-
-msgid "Please give your password to confirm the blog deletion."
-msgstr "Įveskite savo slaptažodį, kad patvirtintumėte blogo ištrynimą."
-
-msgid "Your password:"
-msgstr "Jūsų slaptažodis:"
-
-msgid "Delete this blog"
-msgstr "Trinti šį blogą."
-
-msgid "No given blog id."
-msgstr "Nėra pasirinkto blogo ID."
-
-msgid "No such blog."
-msgstr "Tokio blogo nėra"
-
-msgid "year/month/day/title"
-msgstr "metai/mėnuo/diena/antraštė"
-
-msgid "year/month/title"
-msgstr "metai/mėnuo/antraštė"
-
-msgid "year/title"
-msgstr "metai/antraštė"
-
-msgid "title"
-msgstr "antraštė"
-
-msgid "Title"
-msgstr "Antraštė"
-
-msgid "Title, Date"
-msgstr "Antraštė, Data"
-
-msgid "Title, Country, Date"
-msgstr "Antraštė, Šalis, Data"
-
-msgid "Title, City, Country, Date"
-msgstr "Antraštė, Miestas, Šalis, Data"
-
-msgid "I would like search engines and archivers to index and archive my blog's content."
-msgstr "Noriu, kad paieškos sistemos ir archyvatoriai indeksuotų ir archyvuotų mano blogo turinį."
-
-msgid "I would like search engines and archivers to index but not archive my blog's content."
-msgstr "Noriu, kad paieškos sistemos ir archyvatoriai indeksuotų ir bet ne archyvuotų mano blogo turinio."
-
-msgid "I would like to prevent search engines and archivers from indexing or archiving my blog's content."
-msgstr "Nenoriu, kad paieškos sistemos ir archyvatoriai indeksuotų ir archyvuotų mano blogo turinio."
-
-msgid "That blog Id is already in use."
-msgstr "Šito blogo ID jau yra naudojamas."
-
-msgid "Invalid language code"
-msgstr "Netinkamas kalbos kodas"
-
-msgid "Blog settings"
-msgstr "Blogo nustatymai"
-
-msgid "Warning: except for special configurations, it is generally advised to have a trailing \"/\" in your blog URL in PATH_INFO mode."
-msgstr "Dėmesio: blogo adreso URL gale rekomenduojama naudoti \"/\" pasirinkus PATH_INFO, išskyrus specialius konfigūravimo atvejus."
-
-msgid "Warning: except for special configurations, it is generally advised to have a trailing \"?\" in your blog URL in when QUERY_STRING mode."
-msgstr "Dėmesio: blogo adreso URL gale rekomenduojama naudoti \"?\" pasirinkus QUERY_STRING, išskyrus specialius konfigūravimo atvejus."
-
-msgid "Blog has been successfully created."
-msgstr "Blogas sėkmingai sukurtas."
-
-msgid "Blog has been successfully updated."
-msgstr "Blogas sėkmingai atnaujintas."
-
-msgid "Parameters"
-msgstr "Parametrai"
-
-msgid "URL scan method:"
-msgstr "URL skaitymo metodas:"
-
-msgid "Blog status:"
-msgstr "Blogo būklė:"
-
-msgid "Blog configuration"
-msgstr "Blogo konfigūracija"
-
-msgid "Blog editor name:"
-msgstr "Blogo autoriaus vardas:"
-
-msgid "Default language:"
-msgstr "Pagrindinė kalba:"
-
-msgid "Blog timezone:"
-msgstr "Blogo laiko juosta:"
-
-msgid "Copyright notice:"
-msgstr "Copyright:"
-
-msgid "New post URL format:"
-msgstr "Naujo įrašo URL formatas:"
-
-msgid "Enable XML/RPC interface"
-msgstr "Įjungti XML/RPC sąsają"
-
-msgid "more information"
-msgstr "daugiau informacijos"
-
-msgid "Comments and trackbacks"
-msgstr "Komentarai ir trackback'ai"
-
-msgid "Accept comments"
-msgstr "Leisti komentuoti"
-
-msgid "Moderate comments"
-msgstr "Tvarkyti komentarus"
-
-#, php-format
-msgid "Leave comments open for %s days"
-msgstr "Komentarus palikti atvirus %s dienų"
-
-msgid "Leave blank to disable this feature."
-msgstr "Norėdami išjungti, palikite tuščią"
-
-msgid "Wiki syntax for comments"
-msgstr "Wiki syntax komentarams"
-
-msgid "Accept trackbacks"
-msgstr "Leisti trackback'us"
-
-msgid "Moderate trackbacks"
-msgstr "Tvarkyti trackback'us"
-
-#, php-format
-msgid "Leave trackbacks open for %s days"
-msgstr "Trackback'us palikti atvirus %s dienų"
-
-msgid "Add \"nofollow\" relation on comments and trackbacks links"
-msgstr "Pridėti \"nofollow\" prie komentarų ir trackback'ų nuorodų."
-
-msgid "Blog presentation"
-msgstr "Blogo pristatymas"
-
-msgid "Date format:"
-msgstr "Datos formatas:"
-
-msgid "Time format:"
-msgstr "Laiko formatas:"
-
-msgid "Display smilies on entries and comments"
-msgstr "Įrašuose ir komentaruose rodyti veidelius"
-
-#, php-format
-msgid "Display %s entries per page"
-msgstr "Rodyti %s įrašus puslapyje"
-
-#, php-format
-msgid "Display %s entries per feed"
-msgstr "Rodyti %s įrašus kanale"
-
-#, php-format
-msgid "Display %s comments per feed"
-msgstr "Rodyti %s komentarus kanale"
-
-msgid "Truncate feeds"
-msgstr "Trumpinti kanalus"
-
-msgid "Media and images"
-msgstr "Media ir paveikslėliai"
-
-msgid "Generated image sizes (in pixels)"
-msgstr "Sukurtų paveikslėlių dydis (pikseliais)"
-
-msgid "Thumbnails:"
-msgstr "Miniatiūros:"
-
-msgid "Small:"
-msgstr "Mažos:"
-
-msgid "Medium:"
-msgstr "Vidutinės:"
-
-msgid "Inserted image title"
-msgstr "Įrašykite paveikslėlio pavadinimą"
-
-msgid "This defines image tag title when you insert it in a post from the media manager. It is retrieved from the picture's metadata."
-msgstr "Čia nustatomas paveikslėlio pavadinimas kai jis įkeliamas iš media tvarkyklės. Pavadinimas gaunamas iš metadata informacijos."
-
-msgid "Search engines robots policy"
-msgstr "Paieškos variklių nustatymai"
-
-msgid "XML/RPC interface"
-msgstr "XML/RPC sąsaja"
-
-msgid "XML/RPC interface allows you to edit your blog with an external client."
-msgstr "XML/RPC sąsaja leiidžia jums redaguoti savo blogą per išorinį klientą."
-
-msgid "XML/RPC interface is not active. Change settings to enable it."
-msgstr "XML/RPC sąsaja neaktyvi. Keiskite nustatymus norėdami įjungti."
-
-msgid "XML/RPC interface is active. You should set the following parameters on your XML/RPC client:"
-msgstr "XML/RPC sąsaja yra aktyvi. Savo XML/RPC kliente turėtumėte nustatyti šiuos parametrus:"
-
-msgid "Server URL:"
-msgstr "Serverio URL:"
-
-msgid "Blogging system:"
-msgstr "Blogo sistema:"
-
-msgid "User name:"
-msgstr "Prisijungimo vardas:"
-
-msgid "your password"
-msgstr "jūsų slaptažodis"
-
-msgid "Users"
-msgstr "Dalyviai"
-
-msgid "Users on this blog"
-msgstr "Dalyviai šiame bloge"
-
-msgid "No users"
-msgstr "Dalyvių nėra"
-
-msgid "change permissions"
-msgstr "keisti leidimus"
-
-msgid "Super administrator"
-msgstr "Super administratorius"
-
-msgid "You can't remove default theme."
-msgstr "Negalite ištrinti numatytosios temos"
-
-msgid "Theme does not exist."
-msgstr "Tokia tema neegzistuoja"
-
-msgid "Unable to move uploaded file."
-msgstr "Nepavyksta perkelti atsiųsto failo."
-
-msgid "An error occurred while downloading the file."
-msgstr "Atsisiunčiant failą įvyko klaida"
-
-#, php-format
-msgid "by %s"
-msgstr "per %s"
-
-#, php-format
-msgid "version %s"
-msgstr " %s versija"
-
-#, php-format
-msgid "(built on \"%s\")"
-msgstr "(sukurtas \"%s\")"
-
-#, php-format
-msgid "(requires \"%s\")"
-msgstr "(reikalauja \"%s\")"
-
-msgid "Stylesheet"
-msgstr "Stylesheet"
-
-msgid "Theme configuration"
-msgstr "Temos konfigūravimas"
-
-msgid "Blog themes"
-msgstr "Blogo temos"
-
-msgid "Blog appearance"
-msgstr "Blogo vaizdavimas"
-
-msgid "Theme has been successfully changed."
-msgstr "Tema sėkmingai pakeista."
-
-msgid "Theme has been successfully installed."
-msgstr "Tema sėkmingai instaliuota."
-
-msgid "Theme has been successfully upgraded"
-msgstr "Tema sėkmingai atnaujinta."
-
-msgid "Theme has been successfully deleted."
-msgstr "Tema sėkmingai ištrinta."
-
-#, php-format
-msgid "You can find additional themes for your blog on %s."
-msgstr "Daugiau temų savo blogui galite rasti %s."
-
-msgid "To install or upgrade a theme you generally just need to upload it in \"Install or upgrade a theme\" section."
-msgstr "Paprastai norint atnaujinti temą tereikia ją įkelti į \"Install or upgrade a theme\" skyrių"
-
-msgid "Themes"
-msgstr "Temos"
-
-#, php-format
-msgid "You are currently using \"%s\""
-msgstr "Šiuo metu jūs naudojate \"%s\""
-
-msgid "use selected theme"
-msgstr "naudoti pasirinktą temą"
-
-msgid "delete selected theme"
-msgstr "ištrinti pasirinkta temą"
-
-msgid "Install or upgrade a theme"
-msgstr "instaliuoti arba atnaujinti pasirinktą temą"
-
-msgid "You can install themes by uploading or downloading zip files."
-msgstr "Instaliuoti temas galite įkeldami arba atsisiųsdami zip failus."
-
-msgid "Upload a zip file"
-msgstr "Įkelti zip failą"
-
-msgid "Theme zip file:"
-msgstr "Temos zip failas:"
-
-msgid "Upload theme"
-msgstr "Įkelti temą"
-
-msgid "Download a zip file"
-msgstr "Atsisiųsti zip failą"
-
-msgid "Theme zip file URL:"
-msgstr "Temos zip failo URL:"
-
-msgid "Download theme"
-msgstr "Atsisiųsti temą"
-
-msgid "To enable this function, please give write access to your themes directory."
-msgstr "Įjunkite įrašymo teises savo temų direktorijai norėdami naudotis šia funkcija."
-
-msgid "back"
-msgstr "atgal"
-
-msgid "Last update"
-msgstr "Paskutinis atnaujinimas"
-
-msgid "Blog name"
-msgstr "Blogo pavadinimas"
-
-msgid "Blog ID"
-msgstr "Blogo ID"
-
-msgid "Descending"
-msgstr "Mažėjantis"
-
-msgid "Ascending"
-msgstr "Didėjantis"
-
-msgid "List of blogs"
-msgstr "Blogų sąrašas"
-
-msgid "Blog has been successfully deleted."
-msgstr "Blogas sėkmingai ištrintas."
-
-msgid "Create a new blog"
-msgstr "Kurtin naują blogą"
-
-msgid "Filters"
-msgstr "Filtrai"
-
-msgid "Order by:"
-msgstr "Rikiuoti pagal:"
-
-msgid "Sort:"
-msgstr "Rūšiuoti:"
-
-msgid "Search:"
-msgstr "Ieškoti:"
-
-msgid "Blogs per page"
-msgstr "Blogų viename puslapyje"
-
-msgid "filter"
-msgstr "filtras"
-
-msgid "No blog"
-msgstr "Nėra blogo"
-
-msgid "Page(s)"
-msgstr "Puslapis(iai)"
-
-msgid "Entries"
-msgstr "Įrašai"
-
-msgid "Status"
-msgstr "Statusas"
-
-#, php-format
-msgid "Edit blog %s"
-msgstr "Regaguoti blogą %s"
-
-msgid "edit"
-msgstr "redaguoti"
-
-#, php-format
-msgid "Switch to blog %s"
-msgstr "Pereitį į blogą %s"
-
-msgid "This category does not exist."
-msgstr "Ši kategorija neegzistuoja"
-
-msgid "Categories"
-msgstr "Kategorijos"
-
-msgid "The category has been successfully created."
-msgstr "Kategorija sėkmingai sukurta."
-
-msgid "The category has been successfully removed."
-msgstr "Kategorija sėkmingai pašalinta."
-
-msgid "Categories have been successfully reordered."
-msgstr "Kategorijos sėkmingai pertvarkytos."
-
-msgid "The category has been successfully moved."
-msgstr "Kategorija sėkmingai perkelta."
-
-msgid "No category yet."
-msgstr "Kategorijos kolkas nėra."
-
-msgid "Categories list"
-msgstr "Kategorijų sąrašas"
-
-#, php-format
-msgid "%d entries"
-msgstr "%d įrašai"
-
-#, php-format
-msgid "%d entry"
-msgstr "%d įrašas"
-
-msgid "total:"
-msgstr "viso:"
-
-msgid "URL:"
-msgstr "URL:"
-
-msgid "Add a new category"
-msgstr "Pridėti naują kategoriją"
-
-msgid "Title:"
-msgstr "Antraštė:"
-
-msgid "Parent:"
-msgstr "Pozicija:"
-
-msgid "Top level"
-msgstr "Viršus"
-
-msgid "Save"
-msgstr "Išsaugoti"
-
-msgid "Remove a category"
-msgstr "Pašalinti kategoriją"
-
-msgid "Choose a category to remove:"
-msgstr "Pasirinkti pašalinamą kategoriją:"
-
-msgid "ok"
-msgstr "tinka"
-
-msgid "Reorder categories"
-msgstr "Pertvarkyti kategorijas"
-
-msgid "This will relocate all categories on the top level"
-msgstr "Visos viršuje esančios kategorijos bus perkeltos"
-
-msgid "Reorder"
-msgstr "Pertvarkyti"
-
-msgid "New category"
-msgstr "Nauja kategorija"
-
-msgid "Category has been successfully updated."
-msgstr "Kategorija sėkmingai atnaujinta"
-
-msgid "Category information"
-msgstr "Kategorijos informacija"
-
-msgid "Warning: If you set the URL manually, it may conflict with another category."
-msgstr "Dėmesio: rankinis URL nustatymas gali sukurti neatitikimą su kita kategoriją."
-
-msgid "Description:"
-msgstr "Aprašymas:"
-
-msgid "Move this category"
-msgstr "Perkelti šią kategoriją"
-
-msgid "Category parent"
-msgstr "Pagrindinė kategorija"
-
-msgid "Category sibling"
-msgstr "Antrinė kategorija"
-
-msgid "Move current category"
-msgstr "Perkelti dabartinę kategoriją"
-
-msgid "after"
-msgstr "po"
-
-msgid "before"
-msgstr "prieš"
-
-msgid "Entry does not exist."
-msgstr "Įrašas neegzistuoja."
-
-msgid "No comment"
-msgstr "Komentarų nėra."
-
-msgid "You can't edit this comment."
-msgstr "Jūs negalite redaguoti šio komentaro."
-
-msgid "Edit comment"
-msgstr "Redaguoti komentarą"
-
-msgid "Comment has been successfully updated."
-msgstr "Komentaras sėkmingai atnaujintas."
-
-#, php-format
-msgid "Your comment on my blog %s"
-msgstr "Jūsų komentaras mano %s bloge"
-
-#, php-format
-msgid ""
-"Hi!\n"
-"\n"
-"You wrote a comment on:\n"
-"%s\n"
-"\n"
-"\n"
-msgstr ""
-"Sveiki!\n"
-"\n"
-"Jūs parašėte komentarą:\n"
-"%s\n"
-"\n"
-"\n"
-
-msgid "Send an e-mail"
-msgstr "Siųsti el. laišką"
-
-#, php-format
-msgid "Back to \"%s\""
-msgstr "Atgal į \"%s\""
-
-msgid "IP address:"
-msgstr "IP adresas:"
-
-msgid "Date:"
-msgstr "Data:"
-
-msgid "Author:"
-msgstr "Autorius:"
-
-msgid "Web site:"
-msgstr "Asmeninis tinklapis:"
-
-msgid "Status:"
-msgstr "Statusas:"
-
-msgid "Comment:"
-msgstr "Komentaras:"
-
-msgid "delete"
-msgstr "trinti"
-
-msgid "comment"
-msgstr "komentaras"
-
-msgid "trackback"
-msgstr "trackback'as"
-
-msgid "Date"
-msgstr "Data"
-
-msgid "Entry title"
-msgstr "Įrašo antraštė"
-
-msgid "Author"
-msgstr "Autorius"
-
-msgid "publish"
-msgstr "publikuoti"
-
-msgid "unpublish"
-msgstr "nebepublikuoti"
-
-msgid "mark as pending"
-msgstr "žymti kaip laukiantį"
-
-msgid "mark as junk"
-msgstr "žymėti kaip šiukšlę"
-
-msgid "Comments"
-msgstr "Komentarai"
-
-msgid "Type:"
-msgstr "Tipas:"
-
-msgid "Comments per page"
-msgstr "Komentarų viename puslapyje"
-
-msgid "Comment author:"
-msgstr "Komentaro autorius:"
-
-msgid "You have one spam comments."
-msgstr "Turite vieną spamo komentarą."
-
-msgid "Show it."
-msgstr "Parodyti."
-
-#, php-format
-msgid "You have %s spam comments."
-msgstr "Turite %s spamo komentarų(us)."
-
-msgid "Show them."
-msgstr "Parodyti."
-
-msgid "Selected comments action:"
-msgstr "Veiksmas pasirinktiems komentarams:"
-
-#, php-format
-msgid "%d comment"
-msgstr "%d komentaras"
-
-#, php-format
-msgid "%d comments"
-msgstr "%d komentarai"
-
-msgid "New entry"
-msgstr "Naujas įrašas"
-
-msgid "User preferences"
-msgstr "Dalyvio nustatymai"
-
-msgid "Documentation"
-msgstr "Dokumentacija"
-
-msgid "Latest news"
-msgstr "Naujienos"
-
-msgid "Dashboard"
-msgstr "Valdymas"
-
-msgid "Make this blog my default blog"
-msgstr "Padaryti šitą dlogą pagrindiniu"
-
-msgid "This blog is offline"
-msgstr "Šis blogas yra išjungtas"
-
-msgid "This blog is removed"
-msgstr "Šis blogas yra pašalintas"
-
-msgid "DC_ADMIN_URL is not defined, you should edit your configuration file."
-msgstr "DC_ADMIN_URL nėra nurodytas. Redaguokite savo konfigūracinį failą."
-
-msgid "Following plugins have been installed:"
-msgstr "Buvo instaliuoti šie plugin'ai:"
-
-msgid "Following plugins have not been installed:"
-msgstr "Šie plugin'ai nebuvo instaliuoti:"
-
-msgid "Quick entry"
-msgstr "Greitas įrašas"
-
-msgid "Content:"
-msgstr "Turinys:"
-
-msgid "Category:"
-msgstr "Kategorija:"
-
-msgid "save and publish"
-msgstr "saugoti ir publikuoti"
-
-#, php-format
-msgid "Dotclear %s is available!"
-msgstr "Pasirodė naujas Dotclear %s!"
-
-msgid "Upgrade now"
-msgstr "Atnaujinti dabar"
-
-msgid "Remind me later"
-msgstr "Priminti vėliau"
-
-msgid "Some plugins are installed twice:"
-msgstr "Kai kurie plugin'ai instaduoti du kart:"
-
-#, php-format
-msgid "PHP version is %s (5.0 or earlier needed)."
-msgstr "PHP versija %s (reikalinga 5.0 arba ankstesnė)."
-
-msgid "Multibyte string module (mbstring) is not available."
-msgstr "Nėra Multibyte string modulio (mbstring)."
-
-msgid "Iconv module is not available."
-msgstr "Nėra Iconv modulio."
-
-msgid "Output control functions are not available."
-msgstr "Nėra Output control funkcijų."
-
-msgid "SimpleXML module is not available."
-msgstr "Nėra SimpleXML modulio."
-
-msgid "DOM XML module is not available."
-msgstr "Nėra DOM XML modulio."
-
-msgid "PCRE engine does not support UTF-8 strings."
-msgstr "PCRE valdiklis nepalaiko UTF-8 stringų."
-
-msgid "SPL module is not available."
-msgstr "Nėra SPL modulio."
-
-#, php-format
-msgid "MySQL version is %s (4.1 or earlier needed)."
-msgstr "MySQL verija %s (reikalinga 4.1 arba ankstesnė)."
-
-msgid "MySQL InnoDB engine is not available."
-msgstr "Nėra MySQL InnoDB engine."
-
-#, php-format
-msgid "PostgreSQL version is %s (8.0 or earlier needed)."
-msgstr "PostgreSQL versija %s (reikalinga 8.0 arba ankstesnė)."
-
-msgid "Please set a master key (DC_MASTER_KEY) in configuration file."
-msgstr "Nustatykite master key (DC_MASTER_KEY) konfigūraciniame faile."
-
-msgid "Dotclear is already installed."
-msgstr "Dotclear jau yra instaliuota."
-
-msgid "Dotclear cannot be installed."
-msgstr "Dotclear negali būti instaliuota."
-
-msgid "No user ID given"
-msgstr "Nepateiktas dalyvio ID"
-
-msgid "User ID must contain at least 2 characters using letters, numbers or symbols."
-msgstr "Dalyvio ID turi būti skaičių ir simbolių kombinaciją iš mažiausiai 2 ženklų."
-
-msgid "Invalid email address"
-msgstr "Netinkamas el. pašto adresas"
-
-msgid "No password given"
-msgstr "Nėra slaptažodžio"
-
-msgid "Password must contain at least 6 characters."
-msgstr "Slaptažodį turi sudaryti mažiausiai 6 ženklai."
-
-msgid "My first blog"
-msgstr "Mano pirmasis blogas"
-
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
-
-msgid "Welcome to Dotclear!"
-msgstr "Jus sveikina Dotclear!"
-
-msgid "This is your first entry. When you're ready to blog, log in to edit or delete it."
-msgstr "Tai pirmas jūsų blogo įrašas. Prsijunkite norėdami ištrinti arba redaguoti šį įrašą."
-
-msgid "Dotclear Team"
-msgstr "Dotclear komanda"
-
-msgid ""
-"<p>This is a comment.</p>\n"
-"<p>To delete it, log in and view your blog's comments. Then you might remove or edit it.</p>"
-msgstr ""
-"<p>Čia yra komentaras.</p>\n"
-"<p>Prisijunkite tam, kad peržiūrėti ir trinti blogo komentarus.</p>"
-
-msgid "Dotclear Install"
-msgstr "Dotclear instaliacija"
-
-msgid "show"
-msgstr "rodyti"
-
-msgid "Dotclear installation"
-msgstr "Dotclear instaliacija"
-
-#, php-format
-msgid "Cache directory %s is not writable."
-msgstr "Cache direktorija %s neturi rašymo nustatymų."
-
-msgid "Errors:"
-msgstr "Klaidos:"
-
-msgid "Configuration file has been successfully created."
-msgstr "Konfigūracinis failas sėkmingai sukurtas."
-
-msgid "User information"
-msgstr "Dalyvio informacija"
-
-msgid "Please provide the following information needed to create the first user."
-msgstr "Pateikite informaciją reikalingą sukurti pimam dalyviui."
-
-msgid "First Name:"
-msgstr "Vardas:"
-
-msgid "Last Name:"
-msgstr "Pavardė:"
-
-msgid "Username and password"
-msgstr "Prisijungimo vardas ir slaptažodis"
-
-msgid "All done!"
-msgstr "Štai ir viskas!"
-
-msgid "Dotclear has been successfully installed. Here is some useful information you should keep."
-msgstr "Dotclear sėkmingai instaliuota. Čia pateikiama šiek tiek naudingos informacijos, kurią verta išsaugoti."
-
-msgid "Your account"
-msgstr "Jūsų paskyra"
-
-msgid "Your blog"
-msgstr "Jūsų blogas"
-
-msgid "Blog address:"
-msgstr "Blogo adresas:"
-
-msgid "Administration interface:"
-msgstr "Administravimo sąsaja:"
-
-msgid "Manage your blog now"
-msgstr "Tvarkykite savo blogą dabar"
-
-msgid "Installation can not be completed"
-msgstr "Instaliacija negali būti baigta"
-
-msgid "For the said reasons, Dotclear can not be installed. Please refer to <a href=\"http://dotclear.org/documentation/2.0/admin/install\">the documentation</a> to learn how to correct the problem."
-msgstr "Dėl šių priežaščių, instaliacija negali būti baigta. Peržiūrėkite susijusią <a href=\"http://dotclear.org/documentation/2.0/admin/install\">dokumentaciją (anglų k.)</a>, skitrą tokių problemų sprendimui."
-
-#, php-format
-msgid "File %s does not exist."
-msgstr "Failas %s neegzistuoja."
-
-#, php-format
-msgid "Cannot write %s file."
-msgstr "Negalima įrašyti failo %s."
-
-msgid "Dotclear installation wizard"
-msgstr "Dotclaer instaliavimas"
-
-msgid "Welcome"
-msgstr "Sveiki"
-
-msgid "To complete your Dotclear installation and start writing on your blog, we just need to know how to access your database and who you are. Just fill this two steps wizard with this information and we will be done."
-msgstr "Mums reikia žinoti kaip naudotis jūsų duomenų baze ir kas jūs esate tam, kad galėtume baigti Dotclear instaliaciją ir pradėtume rašyti blogą. Jums tereiks pateikti sekančią informaciją."
-
-msgid "Attention:"
-msgstr "Dėmesio:"
-
-msgid "this wizard may not function on every host. If it does not work for you, please refer to <a href=\"http://dotclear.org/documentation/2.0/admin/install\">the documentation</a> to learn how to create the <strong>config.php</strong> file manually."
-msgstr "šis diegimas gali neveikti kaikuriuose hostuose. Jeigu diegimas neveikia prašome peržiūrėti <a href=\"http://dotclear.org/documentation/2.0/admin/install\">dokumentaciją (anglų k.)</a>, kaip rankiniu būdu sukurti <strong>config.php</strong> failą."
-
-msgid "System information"
-msgstr "Sistemos informacija"
-
-msgid "Please provide the following information needed to create your configuration file."
-msgstr "Pateikite informaciją reikalingą tam, kad sukrti konfigūracinį failą."
-
-msgid "Database type:"
-msgstr "Database type:"
-
-msgid "Database Host Name:"
-msgstr "Database Host Name:"
-
-msgid "Database Name:"
-msgstr "Database Name:"
-
-msgid "Database User Name:"
-msgstr "Database User Name:"
-
-msgid "Database Password:"
-msgstr "Datenbank Passwort:"
-
-msgid "Database Tables Prefix:"
-msgstr "Datenbank Tabellen Präfix:"
-
-msgid "No such installed language"
-msgstr "Nųra tokios instaliuotos kalbos"
-
-msgid "You can't remove English language."
-msgstr "Anglų kalbos pašalinti negalima."
-
-msgid "Permissions to delete language denied."
-msgstr "Leidimas trinti kalbą atmestas."
-
-msgid "Invalid language file URL."
-msgstr "Negaliojantis kalbos failo URL."
-
-msgid "Languages management"
-msgstr "Kalbų tvarkymas"
-
-msgid "Language has been successfully deleted."
-msgstr "Kalba sėkmingai ištrinta"
-
-msgid "Language has been successfully installed."
-msgstr "Kalba sėkmingai instaliuota."
-
-msgid "Language has been successfully upgraded"
-msgstr "Kalba sėkmingai atnaujinta"
-
-msgid "Here you can install, upgrade or remove languages for your Dotclear installation."
-msgstr "Čia jūs galite instaliuoti, atnaujinti arba pašalinti kalbas iš Dotclear instaliacijos."
-
-#, php-format
-msgid "You can change your user language in your <a href=\"%1$s\">preferences</a> or change your blog's main language in your <a href=\"%2$s\">blog settings</a>."
-msgstr "Galite pakeisti savo kalbą <a href=\"%1$s\">nustatymuose</a>, arba pakeisti pagrindinę blogo kalbą <a href=\"%2$s\">blogo nustatymuose</a>."
-
-msgid "Installed languages"
-msgstr "Instaliuotos kalbos"
-
-msgid "No additional language is installed."
-msgstr "Jokia papildoma kalba nėra instaliuota"
-
-msgid "Language"
-msgstr "Kalba"
-
-msgid "Action"
-msgstr "Veiksmas"
-
-msgid "Delete"
-msgstr "Trinti"
-
-msgid "Install or upgrade languages"
-msgstr "Instaliuoti arba trinti kalbas"
-
-#, php-format
-msgid "You can install or remove a language by adding or removing the relevant directory in your %s folder."
-msgstr "Galite instaliuoti arba šalinti kalbą pridėdami arba pašalindami atitinkamą direktoriją savo %s byloje."
-
-msgid "Available languages"
-msgstr "Galimos kalbos"
-
-#, php-format
-msgid "You can download and install a additional language directly from Dotclear.net. Proposed languages are based on your version: %s."
-msgstr "Galite atsisiųsti ir instaliuoti papildomą kalbą tiesiai iš Dotclear.net. Kalbos pateikiamos jūsų versijos %s pagrindu."
-
-msgid "Language:"
-msgstr "Kalba:"
-
-msgid "Install language"
-msgstr "Instaliuoti kalbą"
-
-msgid "You can install languages by uploading zip files."
-msgstr "Galite instaliuoti kalbas ikeldami zip failus."
-
-msgid "Language zip file:"
-msgstr "Kalbos zip failas:"
-
-msgid "Upload language"
-msgstr "Įkelti kalbą"
-
-msgid "Invalid language zip file."
-msgstr "Netinkamas kalbos zip failas"
-
-msgid "The zip file does not appear to be a valid Dotclear language pack."
-msgstr "Šis zip failas netinka kaip Dotclear kalbų paketas."
-
-msgid "An error occurred during language upgrade."
-msgstr "Atnaujinant kalbą įvyko klaida."
-
-msgid "Error:"
-msgstr "Klaida:"
-
-msgid "By names, in ascending order"
-msgstr "Pagal vardus, didėjančia tvarka"
-
-msgid "By names, in descending order"
-msgstr "Pagal vardus, mažėjančia tvarka"
-
-msgid "By dates, in ascending order"
-msgstr "Pagal datas, didėjančia tvarka"
-
-msgid "By dates, in descending order"
-msgstr "Pagal datas, mažėjančia tvarka"
-
-msgid "Media manager"
-msgstr "Media tvarkyklė"
-
-msgid "confirm removal"
-msgstr "patvirtinti pašalinimą"
-
-#, php-format
-msgid "Are you sure you want to remove %s?"
-msgstr "Ar tikrai norite pašalinti %s?"
-
-msgid "cancel"
-msgstr "atšaukti"
-
-msgid "yes"
-msgstr "taip"
-
-msgid "Directory has been successfully created."
-msgstr "Direktorija sėkmingai sukurta."
-
-msgid "Files have been successfully uploaded."
-msgstr "Failai sėkmingai įkelti."
-
-msgid "File has been successfully removed."
-msgstr "Failai sėkmingai pašalinti."
-
-msgid "Directory has been successfully removed."
-msgstr "Direktorija sėkmingai pašalinta."
-
-msgid "Directory has been successfully rebuilt."
-msgstr "Direktorija sėkmingai atstatyta."
-
-msgid "Zip file has been successfully extracted."
-msgstr "Sėkmingai išarchyvuotas zip failas."
-
-#, php-format
-msgid "Choose a file to attach to entry %s by clicking on %s."
-msgstr "Pasirinkite prie įrašo %s prisegamą failą paspausdami %s."
-
-msgid "Attach this file to entry"
-msgstr "Prisegti šį failą prie įrašo"
-
-#, php-format
-msgid "Choose a file to insert into entry by clicking on %s."
-msgstr "Pasirinkite prie įrašo pridedamą failą paspausdami %s."
-
-msgid "No file."
-msgstr "Nėra failo."
-
-msgid "Sort files:"
-msgstr "Rūšiuoti failus:"
-
-msgid "Add files"
-msgstr "Pridėti failus"
-
-msgid "Choose a file:"
-msgstr "Pasirinkite failą:"
-
-#, php-format
-msgid "Maximum size %s"
-msgstr "Maksimalus dydis: %s"
-
-msgid "Private"
-msgstr "Privatus"
-
-msgid "send"
-msgstr "siųsti"
-
-msgid "Please take care to publish media that you own and that are not protected by copyright."
-msgstr "Prašome atsakingai skelbti turimus media elementus, kurie gali būti saugomi autorinių teisių."
-
-msgid "New directory"
-msgstr "Nauja direktorija"
-
-msgid "Directory Name:"
-msgstr "Direktorijos pavadinimas:"
-
-msgid "Download this directory as a zip file"
-msgstr "Atsisiųsti šią direktoriją zip failu"
-
-msgid "open"
-msgstr "atidaryti"
-
-msgid "Insert this file into entry"
-msgstr "Pridėti šį failą prie įrašo"
-
-msgid "Not a valid file"
-msgstr "Netinkamas failas"
-
-msgid "File has been successfully updated."
-msgstr "Failas sėkmingai atnaujintas"
-
-msgid "Thumbnails have been successfully updated."
-msgstr "Miniatiūra sėkmingai atnaujinta"
-
-msgid "Insert media item"
-msgstr "Pridėti media elementą"
-
-msgid "Image size:"
-msgstr "Paveikslėlio dydis:"
-
-msgid "original"
-msgstr "originalas"
-
-msgid "Image alignment"
-msgstr "Paveikslėlio lygiavimas"
-
-msgid "None"
-msgstr "Jokio"
-
-msgid "Left"
-msgstr "Kairė"
-
-msgid "Right"
-msgstr "Dešinė"
-
-msgid "Center"
-msgstr "Centras"
-
-msgid "Image insertion"
-msgstr "Paveikslėlio įdėjimas"
-
-msgid "As a single image"
-msgstr "Kaip vieną paveikslėlį"
-
-msgid "As a link to original image"
-msgstr "Kaip nuorodą į originalų paveikslėlį"
-
-msgid "MP3 disposition"
-msgstr "MP3 dispozicija"
-
-msgid "Please note that you cannot insert mp3 files with visual editor."
-msgstr "Dėmesio, MP3 failai negali būti įkeliami su Visual Editor"
-
-msgid "Please note that you cannot insert video files with visual editor."
-msgstr "Dėmesio, video failai negali būti įkeliami su Visual Editor"
-
-msgid "Video size"
-msgstr "Video dydis"
-
-msgid "Width:"
-msgstr "Plotis:"
-
-msgid "Height:"
-msgstr "Aukštis:"
-
-msgid "Video disposition"
-msgstr "Video dispozicija"
-
-msgid "Media item will be inserted as a link."
-msgstr "Medien elementas bus įkeltas kaip nuoroda."
-
-msgid "Cancel"
-msgstr "Atšaukti"
-
-msgid "Insert"
-msgstr "Įkelti"
-
-msgid "Media details"
-msgstr "Media detalės"
-
-msgid "Available sizes:"
-msgstr "Galimi dydžiai:"
-
-msgid "File owner:"
-msgstr "Failo savininkas:"
-
-msgid "File type:"
-msgstr "Failo tipas:"
-
-msgid "File size:"
-msgstr "Failo dydis:"
-
-msgid "File URL:"
-msgstr "Failo URL:"
-
-msgid "Show entries containing this media"
-msgstr "Rodyti įrašus su šiuo media elementu"
-
-msgid "Entries containing this media"
-msgstr "Įrašai su šiuo media elementu"
-
-msgid "No entry seems contain this media."
-msgstr "Nėra įrašų su šiuo media elementu"
-
-msgid "Image details"
-msgstr "Pavekslėlio detalės"
-
-msgid "No detail"
-msgstr "Nėra detalių"
-
-msgid "Update thumbnails"
-msgstr "Atnaujinti miniatiūras"
-
-msgid "This will create or update thumbnails for this image."
-msgstr "Šio paveikslėlio miniatiūros bus sukurtos arba atnaujintos."
-
-msgid "update thumbnails"
-msgstr "atnaujinti miniatiūras"
-
-msgid "Extract in a new directory"
-msgstr "Išarchyvuoti naujoje direktorijoje"
-
-msgid "Extract in current directory"
-msgstr "Išarchyvuoti šioje direktorijoje"
-
-msgid "Extract archive"
-msgstr "Išarchyvuoti"
-
-msgid "This will extract archive in a new directory that should not exist yet."
-msgstr "Išarchyvuojama naujoje direktorijoje, kuri neturėtų egzistuoti."
-
-msgid "This will extract archive in current directory and will overwrite existing files or directory."
-msgstr "Išarchyvuojama šioje direktorijoje, kuri bus perrašyta kartu su egzistuojančiais failais."
-
-msgid "Extract mode:"
-msgstr "Išarchyvavimo būdas:"
-
-msgid "extract"
-msgstr "išarchyvuoti"
-
-msgid "Change media properties"
-msgstr "Keisti media savybes"
-
-msgid "File name:"
-msgstr "Failo pavadinimas:"
-
-msgid "File title:"
-msgstr "Failo antraštė:"
-
-msgid "File date:"
-msgstr "Failo data:"
-
-msgid "New directory:"
-msgstr "Nauja direktorija:"
-
-msgid "Change file"
-msgstr "Keisti failą"
-
-msgid "No blog or user given."
-msgstr "Nepateiktas joks blogo dalyvis"
-
-msgid "permissions"
-msgstr "teisės"
-
-msgid "Permissions"
-msgstr "Teisės"
-
-msgid "The permissions have been successfully updated."
-msgstr "Teisės sėkmingai atnaujintos "
-
-#, php-format
-msgid "You are about to change permissions on the following blogs for users %s."
-msgstr "Jūs ruošiatės pakeisti šių blogo dalyvių %s teises."
-
-msgid "choose a blog"
-msgstr "pasirinkite blogą"
-
-msgid "Choose a blog"
-msgstr "Pasirinkite blogą"
-
-msgid "Entries per page"
-msgstr "Įrašų viename puslapyje"
-
-#, php-format
-msgid "Choose one or more blogs to which you want to give permissions to users %s."
-msgstr "Pasirinkite vieną ar daugiau blogų kurių teises norėtumėte suteikti dalyviams  %s."
-
-msgid "set permissions"
-msgstr "nustatyti teises"
-
-msgid "No content found on this plugin."
-msgstr "Šiame plugin'e jokio turinio nerasta."
-
-msgid "Plugin not found"
-msgstr "Plugin'as nerastas"
-
-msgid "The plugin you reached does not exist or does not have an admin page."
-msgstr "Plugin'as kurį pasiek'te neegzistuoja arba neturi administravimo puslapio."
-
-msgid "No such plugin."
-msgstr "Nėra tokio plugin'o"
-
-msgid "You don't have permissions to delete this plugin."
-msgstr "Neturite teisių ištrinti šį plugin'ą."
-
-msgid "You don't have permissions to deactivate this plugin."
-msgstr "Neturite teisių išjungti šį plugin'ą."
-
-msgid "Plugins management"
-msgstr "Plugin'ų valdymas"
-
-msgid "Plugin has been successfully deleted."
-msgstr "Plugin'as sėkmingai ištrintas."
-
-msgid "Plugin has been successfully installed."
-msgstr "Plugin'as sėkmingai instaliuotas."
-
-msgid "Plugin has been successfully upgraded"
-msgstr "Plugin'as sėkmingai atnaujintas."
-
-msgid "Plugins add new functionalities to Dotclear. Here you can activate or deactivate installed plugins."
-msgstr "Plugin'ai Dotclear prideda funkcionalumo. Čia galite įjungti ar išjungti instaliuotus plugin'us."
-
-#, php-format
-msgid "You can find additional plugins for your blog on %s."
-msgstr "Papildomus plugin'us galite rasti savo bloge %s."
-
-msgid "To install or upgrade a plugin you generally just need to upload it in \"Install or upgrade a plugin\" section."
-msgstr "Norėdami instaliuoti ar atnaujinti plugin'us, įkelkite juos į \"Instaliuoti arba atnaujinti plugin'ą\" ."
-
-msgid "To install or upgrade a plugin you just need to extract it in your plugins directory."
-msgstr "Norėdami instaliuoti ar atnaujinti plugin'ą išarchyvuokite jį plugin'ų direktorijoje"
-
-msgid "Plugins"
-msgstr "Plugin'ai"
-
-msgid "Activated plugins"
-msgstr "Įjungti plugin'ai"
-
-msgid "Plugin"
-msgstr "Plugin'as"
-
-msgid "Version"
-msgstr "Versija"
-
-msgid "Details"
-msgstr "Detalės"
-
-msgid "Deactivate"
-msgstr "Išjungti"
-
-msgid "Deactivated plugins"
-msgstr "Išjungti plgin'us"
-
-msgid "Activate"
-msgstr "Įjungti"
-
-msgid "Install or upgrade a plugin"
-msgstr "Instaliuoti arba atnaujinti plugin'ą"
-
-msgid "You can install plugins by uploading or downloading zip files."
-msgstr "Galite instaliuoti plugin'us įkeldami ar parsisiųsdami zip failus."
-
-msgid "Plugin zip file:"
-msgstr "Plugin'o zip failas"
-
-msgid "Upload plugin"
-msgstr "Įkelti plugin'ą"
-
-msgid "Plugin zip file URL:"
-msgstr "Plugin'o zip failo URL:"
-
-msgid "Download plugin"
-msgstr "Atisiųsti plugin'ą"
-
-msgid "To enable this function, please give write access to your plugins directory."
-msgstr "Įjunkite įrašymo teises savo plugin'ų direktorijai norėdami naudotis šia funkcija."
-
-msgid "Add a link"
-msgstr "Pridėti nuorodą"
-
-msgid "Available"
-msgstr "Galimas"
-
-msgid "Most used"
-msgstr "Dažniausiai naudojamas"
-
-msgid "Link URL:"
-msgstr "Nuorodos URL:"
-
-msgid "Link title:"
-msgstr "Nuorodos pavadinimas:"
-
-msgid "Link language:"
-msgstr "Nuorodos kalba:"
-
-msgid "insert"
-msgstr "įdėti"
-
-msgid "Add a link to an entry"
-msgstr "Pridėti nuorodą prie įrašo"
-
-msgid "Search entry:"
-msgstr "Ieškoti įraše:"
-
-msgid "This entry does not exist."
-msgstr "Šis įrašas neegzistuoja."
-
-msgid "Edit entry"
-msgstr "Įrašo redagavimas"
-
-msgid "next entry"
-msgstr "sekantis įrašas"
-
-msgid "previous entry"
-msgstr "ankstesnis įrašas"
-
-msgid "Entry has been successfully updated."
-msgstr "Įrašas sėkmingai atnaujintas"
-
-msgid "Entry has been successfully created."
-msgstr "Įrašas sėkmingai sukurtas."
-
-msgid "File has been successfully attached."
-msgstr "Failas sėkmingai prikabintas."
-
-msgid "Attachment has been successfully removed."
-msgstr "Priedas sėkmingai pašalintas."
-
-msgid "Comment has been successfully created."
-msgstr "Komentaras sėkmingai sukurtas."
-
-msgid "Don't forget to validate your XHTML conversion by saving your post."
-msgstr "Nepamirškite patvirtinti XHTML išsaugodami savo įrašą."
-
-msgid "View entry"
-msgstr "Žiūrėti įrašą"
-
-msgid "Preview entry"
-msgstr "Pažiūrėti įrašą"
-
-msgid "Entry status:"
-msgstr "Įrašo būklė:"
-
-msgid "Published on:"
-msgstr "Įrašytas:"
-
-msgid "Text formating:"
-msgstr "Teksto formatas:"
-
-msgid "Convert to XHTML"
-msgstr "Konvertuoti į XHTML"
-
-msgid "Selected entry"
-msgstr "Pasirinktas įrašas"
-
-msgid "Entry lang:"
-msgstr "Įrašo kalba:"
-
-msgid "Entry password:"
-msgstr "Įrašo slaptažodis:"
-
-msgid "Basename:"
-msgstr "Pagindinis vardas:"
-
-msgid "Warning: If you set the URL manually, it may conflict with another entry."
-msgstr "Dųmesio: Įrašydami URL ranka rizikuojate kad nuoroda gali atitikti kitą įrašą."
-
-msgid "Attachments"
-msgstr "Prisegimai"
-
-msgid "remove"
-msgstr "pašalinti"
-
-msgid "No attachment."
-msgstr "Nieko neprisegta."
-
-msgid "Add files to this entry"
-msgstr "Pridėti failus prie šio įrašo"
-
-msgid "Excerpt:"
-msgstr "Santrauka:"
-
-msgid "Notes:"
-msgstr "Pastabos:"
-
-msgid "Ping blogs"
-msgstr "Ping blogai"
-
-msgid "Trackbacks"
-msgstr "Trackback'ai"
-
-msgid "No trackback"
-msgstr "Trackback'ų nėra"
-
-msgid "Add a comment"
-msgstr "Pridėti komentarą"
-
-msgid "Name:"
-msgstr "Vardas:"
-
-msgid "IP address"
-msgstr "IP adresas"
-
-msgid "published"
-msgstr "publikuojamas"
-
-msgid "unpublished"
-msgstr "nepublikuojamas"
-
-msgid "pending"
-msgstr "laukiantis"
-
-msgid "junk"
-msgstr "šiukšlės"
-
-msgid "Edit this comment"
-msgstr "Redaguoti šį komentarą"
-
-msgid "This attachment does not exist"
-msgstr "Šis komentaras neegzistuoja"
-
-msgid "Remove attachment"
-msgstr "Pašalinti prisegtą failą"
-
-msgid "Attachment"
-msgstr "Prisegimas"
-
-msgid "Are you sure you want to remove this attachment?"
-msgstr "Ar tikrai norite pašalinti šį prisegimą?"
-
-msgid "selected"
-msgstr "pažymėtas"
-
-msgid "not selected"
-msgstr "nepažymėtas"
-
-msgid "Category"
-msgstr "Kategorija"
-
-msgid "Selected"
-msgstr "Pažymėta"
-
-msgid "Publish"
-msgstr "Publikuoti"
-
-msgid "Unpublish"
-msgstr "Nebepublikuoti"
-
-msgid "Schedule"
-msgstr "Tvarkaraštis"
-
-msgid "Mark as pending"
-msgstr "Žymėti kaip laukiantį"
-
-msgid "Mark"
-msgstr "Žymėti"
-
-msgid "Mark as selected"
-msgstr "Žymėti kaip pasirinktus"
-
-msgid "Mark as unselected"
-msgstr "Žymėti kaip nepasirinktus"
-
-msgid "Change"
-msgstr "Keisti"
-
-msgid "Change category"
-msgstr "Keisti direktoriją"
-
-msgid "Change author"
-msgstr "Keisti autorių"
-
-msgid "Selected:"
-msgstr "Pažymėtas:"
-
-msgid "Month:"
-msgstr "Mėnuo:"
-
-msgid "Lang:"
-msgstr "Kalba:"
-
-msgid "Selected entries action:"
-msgstr "Pasirinktų įrašų veiksmas:"
-
-msgid "This user does not exist"
-msgstr "Šis dalyvis neegzistuoja"
-
-msgid "Change category for entries"
-msgstr "Keisti įrašų kategoriją"
-
-msgid "Change author for entries"
-msgstr "Keisti įrašų autorių"
-
-msgid "Author ID:"
-msgstr "Autoriaus ID:"
-
-msgid "If you want to change your email or password you must provide your current password."
-msgstr "Norėdami pakeisti savo el. paštą ar slaptažodį privalote pateikti dabartinį savo slaptažodį."
-
-msgid "Personal information has been successfully updated."
-msgstr "Asmeninė informacija sėkmingai atnaujinta."
-
-msgid "Display name:"
-msgstr "Rodyti vardą:"
-
-msgid "Preferred format:"
-msgstr "Pageidaujamas formatas:"
-
-msgid "Default entry status:"
-msgstr "Tipinė įrašo būklė:"
-
-msgid "Entry edit field height:"
-msgstr "Įrašo laukelio aukščio redagavimas:"
-
-msgid "User language:"
-msgstr "Dalyvio kalba:"
-
-msgid "User timezone:"
-msgstr "Dalyvio laiko juosta:"
-
-msgid "Enable WYSIWYG mode"
-msgstr "Įjungti WYSIWYG rėžimą"
-
-msgid "Search"
-msgstr "Paieška"
-
-msgid "Search options"
-msgstr "Paieškos nustatymai"
-
-msgid "Query:"
-msgstr "Užklausa:"
-
-msgid "search entries"
-msgstr "paieškos įrašai"
-
-msgid "search comments"
-msgstr "paieškos komentarai"
-
-msgid "schedule"
-msgstr "tvarkaraštis"
-
-msgid "change category"
-msgstr "keisti kategoriją"
-
-msgid "change author"
-msgstr "keisti autorių"
-
-#, php-format
-msgid "%d entries found"
-msgstr "Rasti %d įrašai"
-
-#, php-format
-msgid "%d entry found"
-msgstr "Rastas %d įrašas"
-
-#, php-format
-msgid "%d comment found"
-msgstr "Rastas %d komentaras"
-
-#, php-format
-msgid "%d comments found"
-msgstr "Rasti %d komentarai"
-
-msgid "This entry does not exist or is not published"
-msgstr "Įrašas neegzistuoja arba nėra publikuotas"
-
-msgid "All pings sent."
-msgstr "Visos ping komandos išsiųstos"
-
-msgid "Auto discover ping URLs"
-msgstr "Automatiškai rasti ping URLus"
-
-msgid "URLs to ping:"
-msgstr "URL kuriems siunčiamas ping:"
-
-msgid "Send excerpt:"
-msgstr "Siųsti ištrauką:"
-
-msgid "Previously sent pings"
-msgstr "Anksčiau siųsti ping"
-
-msgid "Dotclear update"
-msgstr "Dotclear atnaujinimas"
-
-#, php-format
-msgid "Unable to delete file %s"
-msgstr "Nepavyko ištrinti failo %s"
-
-#, php-format
-msgid "Downloaded Dotclear archive seems to be corrupted. Try <a %s>download it</a> again."
-msgstr "Atisiųstas Dotclear archyvas greičiausiai yra sugadintas. Pabandykite <a %s>atsisiųsti archyvą</a> iš naujo."
-
-msgid "The following files of your Dotclear installation have been modified so we won't try to update your installation. Please try to <a href=\"http://dotclear.org/download\">update manually</a>."
-msgstr "Šie Dotclear instaliaciniai failai buvo pakeisti taigi nebus bandoma atnaujinti instaliacijos. Prašome <a href=\"http://dotclear.org/download\">atnaujinti rankiniu būdu</a>."
-
-#, php-format
-msgid "The following files of your Dotclear installation are not readable. Please fix this or try to make a backup file named %s manually."
-msgstr "Šių Dotclear instaliacinių failų neįmanoma perkaityti. Sutaisykite tai arba padarykite atsarginę kopiją pavadintą %s rankiniu būdu."
-
-msgid "The following files of your Dotclear installation cannot be written. Please fix this or try to <a href=\"http://dotclear.org/download\">update manually</a>."
-msgstr "Šių Dotclear instaliacinių failų neįmanoma įrašyti. Sutaisykite tai arba bandykite <a href=\"http://dotclear.org/download\">atnaujinti rankiniu būdu</a>."
-
-msgid "No newer Dotclear version available."
-msgstr "Naujesnė Dotclear versija neegzistuoja."
-
-#, php-format
-msgid "Dotclear %s is available."
-msgstr "Galima atisiųsti naują Dotclear %s versiją."
-
-msgid "To upgrade your Dotclear installation simply click on the following button. A backup file of your current installation will be created in your root directory."
-msgstr "Norėdami atnaujinti Dotclear instaliaciją spustelkite sekantį mygtuką. Atsarginė dabartinės instaiacijos kopija bus sukurta root direktorijoje."
-
-msgid "Update Dotclear"
-msgstr "Atnaujinti Dotclear"
-
-msgid "Update backup files"
-msgstr "Atnaujinti failų atsargines kopijas"
-
-msgid "The following files are backups of previously updates. You can revert your previous installation or delete theses files."
-msgstr "Šie failai yra ankstesnių atnaujinimų atsarginės kopijos. Galite atkurti ankstesnę instaliaciją arba ištrinti šiuos failus."
-
-msgid "Please note that reverting your Dotclear version may have some unwanted side-effects. Consider reverting only if you experience strong issues with this new version."
-msgstr "Dėmesio, ankstesnės Dotclear versijos atstatymas gali turėti tam tikrų nepageidaujamų šalutinių padarinių. Atstatinėkite ankstesnę versiją tik jei turite rimtų problemų su naujaja versija."
-
-#, php-format
-msgid "You should not revert to version prior to last one (%s)."
-msgstr "Neturėtumėte atstatinėti ankstesnės nei prieš tai buvusi versija (%s)."
-
-msgid "Delete selected file"
-msgstr "Trinti pasirinktą failą"
-
-msgid "Revert to selected file"
-msgstr "Atstatyti pasirinktą failą"
-
-msgid "Congratulations, you're one click away from the end of the update."
-msgstr "Sveikinimai, esate per vieną paspaudimą nuo atnaujinimo pabaigos."
-
-msgid "Finish the update."
-msgstr "Baigti atnaujinimą."
-
-msgid "new user"
-msgstr "naujas dalyvis"
-
-#, php-format
-msgid "User \"%s\" already exists."
-msgstr "Dalyvis \"%s\" jau yra."
-
-msgid "User has been successfully updated."
-msgstr "Dalyvis sėkmingai atnaujintas."
-
-msgid "User has been successfully created."
-msgstr "Dalyvis sėkmingai sukurtas."
-
-msgid "Warning:"
-msgstr "Dėmesio:"
-
-msgid "If you change your username, you will have to log in again."
-msgstr "Pakeitęs savo prisijungimo vardą turėsite iš naujo prisijungti."
-
-msgid "Password change required to connect"
-msgstr "Prisijungimui reikalingas slaptažodžio pakeitimas."
-
-msgid "No permissions."
-msgstr "Teisių nėra."
-
-msgid "Add new permissions"
-msgstr "Pridėti naujų teisių"
-
-msgid "Username"
-msgstr "Prisijungimo vvardas"
-
-msgid "Last Name"
-msgstr "Pavardė"
-
-msgid "First Name"
-msgstr "Vardas"
-
-msgid "Display name"
-msgstr "Rodomas vardas"
-
-msgid "Number of entries"
-msgstr "Įrašų skaičius"
-
-msgid "Set permissions"
-msgstr "Nustatyti teises"
-
-msgid "users"
-msgstr "dalyviai"
-
-msgid "User has been successfully removed."
-msgstr "Dalyvis sėkmingai pašalintas"
-
-msgid "Create a new user"
-msgstr "Sukurti naują dalyvį"
-
-msgid "Users per page"
-msgstr "Dalyvių viename puslapyje"
-
-msgid "Selected users action:"
-msgstr "Veiskmas pasirinktiems dalyviams:"
-
-msgid "Blog:"
-msgstr "Blogas:"
-
-msgid "Change blog"
-msgstr "Keisti blogą"
-
-msgid "Blogs:"
-msgstr "Blogai:"
-
-msgid "View site"
-msgstr "Žiūrėti puslapį"
-
-msgid "User:"
-msgstr "Dalyvis:"
-
-msgid "Logout"
-msgstr "Atsijungti"
-
-#, php-format
-msgid "Thank you for using %s."
-msgstr "Ačiū, kad naudojatės %s."
-
-msgid "Help"
-msgstr "Pagalba"
-
-msgid "uncover"
-msgstr "rodyti"
-
-msgid "hide"
-msgstr "slėpti"
-
-msgid "help"
-msgstr "pagalba"
-
-msgid "no selection"
-msgstr "be pasirinkimo"
-
-msgid "select all"
-msgstr "pasirinkti viską"
-
-msgid "invert selection"
-msgstr "atvirkščias pasirinkimas"
-
-msgid "view entry"
-msgstr "žiūrėti įrašą"
-
-#, php-format
-msgid "Are you sure you want to delete selected entries (%s)?"
-msgstr "Ar tikrai norite ištrinti pasirinktus įrašus (%s)?"
-
-msgid "Are you sure you want to delete this entry?"
-msgstr "Ar tikrai norite ištrinti šį įrašą?"
-
-#, php-format
-msgid "Are you sure you want to delete selected comments (%s)?"
-msgstr "Ar tikrai norite ištrinti pasirinktus komentarus (%s)?"
-
-msgid "Are you sure you want to delete this comment?"
-msgstr "Ar tikrai norite ištrinti šį komentarą?"
-
-msgid "Users with posts cannot be deleted."
-msgstr "Dalyviai turintys įrašų negali būti ištrinti."
-
-#, php-format
-msgid "Are you sure you want to delete selected users (%s)?"
-msgstr "Ar tikrai norite ištrinti pasirinktus dalyvius (%s)?"
-
-#, php-format
-msgid "Are you sure you want to delete category \"%s\"?"
-msgstr "Ar tikrai norite ištrinti kategoriją \"%s\"?"
-
-msgid "Are you sure you want to reorder all categories?"
-msgstr "Ar tikrai norite pertvarkyti visas kategorijas?"
-
-#, php-format
-msgid "Are you sure you want to remove media \"%s\"?"
-msgstr "Ar tikrai norite pašalinti media \"%s\"?"
-
-msgid "Are you sure you want to extract archive in current directory?"
-msgstr "Ar tikrai norite išarchyvuoti šioje direktorijoje?"
-
-#, php-format
-msgid "Are you sure you want to remove attachment \"%s\"?"
-msgstr "Ar tikrai norite pašalinti prisegimą \"%s\"?"
-
-#, php-format
-msgid "Are you sure you want to delete \"%s\" language?"
-msgstr "Ar tikrai norite ištrinti \"%s\" kalbą?"
-
-#, php-format
-msgid "Are you sure you want to delete \"%s\" plugin?"
-msgstr "Ar tikrai norite ištrinti \"%s\" plugin'ą?"
-
-msgid "Use this theme"
-msgstr "Naudoti šią temą"
-
-msgid "Remove this theme"
-msgstr "Pašalinti šią temą"
-
-#, php-format
-msgid "Are you sure you want to delete \"%s\" theme?"
-msgstr "Ar tikrai norite ištrinti \"%s\" temą?"
-
-msgid "Zip file content"
-msgstr "Zip failo turinys"
-
-msgid "XHTML markup validator"
-msgstr "XHTML markup validator"
-
-msgid "XHTML content is valid."
-msgstr "XHTML turinys tinkamas."
-
-msgid "There are XHTML markup errors."
-msgstr "Yra XHTML markup klaidų."
-
-msgid "You have unsaved changes. Switch post format will loose these changes. Proceed anyway?"
-msgstr "Yra neišsaugotų pakeitimų. Įrašo formato keitimas panaikins visus atnaujinimus. Tęsti?"
-
-msgid "You have unsaved changes."
-msgstr "Yra neišsaugotų pakeitimų. "
-
-msgid "close"
-msgstr "uždaryti"
-
-msgid "now"
-msgstr "dabar"
-
-msgid "visual"
-msgstr "rodomas"
-
-msgid "source"
-msgstr "kodas"
-
-msgid "You can use the following shortcuts to format your text."
-msgstr "Teksto formatavimui galite naudoti šias santrumpas."
-
-msgid "-- none --"
-msgstr "-- nepasirinkta --"
-
-msgid "-- block format --"
-msgstr "-- paragrafo formatas --"
-
-msgid "Paragraph"
-msgstr "Paragrafas"
-
-msgid "Level 1 header"
-msgstr "1 lygio antraštė"
-
-msgid "Level 2 header"
-msgstr "2 lygio antraštė"
-
-msgid "Level 3 header"
-msgstr "3 lygio antraštė"
-
-msgid "Level 4 header"
-msgstr "4 lygio antraštė"
-
-msgid "Level 5 header"
-msgstr "5 lygio antraštė"
-
-msgid "Level 6 header"
-msgstr "6 lygio antraštė"
-
-msgid "Strong emphasis"
-msgstr "Ryškus išskyrimo šriftas"
-
-msgid "Emphasis"
-msgstr "Išskyrimo šriftas"
-
-msgid "Inserted"
-msgstr "Įdėtas"
-
-msgid "Deleted"
-msgstr "Ištrintas"
-
-msgid "Inline quote"
-msgstr "Citata"
-
-msgid "Code"
-msgstr "Kodas"
-
-msgid "Line break"
-msgstr "Kita eilutė"
-
-msgid "Blockquote"
-msgstr "Kitas paragrafas"
-
-msgid "Preformated text"
-msgstr "Suformatuotas tekstas"
-
-msgid "Unordered list"
-msgstr "Nerūšiuotas sąrašas"
-
-msgid "Ordered list"
-msgstr "Rūšiuotas sąrašas"
-
-msgid "Link"
-msgstr "Nuoroda"
-
-msgid "URL?"
-msgstr "URL?"
-
-msgid "Language?"
-msgstr "Kalba?"
-
-msgid "External image"
-msgstr "Išorinis paveikslėlis"
-
-msgid "Media chooser"
-msgstr "Media pasrinkimas"
-
-msgid "Link to an entry"
-msgstr "Nuoroda į įrašą"
-
-msgid "Activate enhanced uploader"
-msgstr "Įjungti enhanced Uploader"
-
-msgid "Disable enhanced uploader"
-msgstr "Išjungti enhanced uploader"
-
-msgid "File successfully uploaded."
-msgstr "Failas sėkmingai įkeltas"
-
-msgid "Maximum file size allowed:"
-msgstr "Maksimalus leistinas failo dydis:"
-
-msgid "Limit exceeded."
-msgstr "Limitas viršytas."
-
-msgid "File size exceeds allowed limit."
-msgstr "Failo dydis viršija leistiną ribą."
-
-msgid "Canceled."
-msgstr "Atšaukta."
-
-msgid "HTTP Error:"
-msgstr "HTTP klaida:"
-
-msgid "Choose file"
-msgstr "Pasirinkti failą"
-
-msgid "Choose files"
-msgstr "Pasirinkti failus"
-
-msgid "Clean"
-msgstr "Išvalyti"
-
-msgid "Upload"
-msgstr "Įkelti"
-
-msgid "No file in queue."
-msgstr "Eilėje failo nėra."
-
-msgid "1 file in queue."
-msgstr "Eilėje 1 failas."
-
-#, php-format
-msgid "%d files in queue."
-msgstr "%d failai eilėje."
-
-msgid "Queue error:"
-msgstr "Eilės klaida:"
-
-msgid "&#171;prev."
-msgstr "&#171;ankst."
-
-msgid "next&#187;"
-msgstr "sek&#187;"
-
-msgid "No entry"
-msgstr "Įrašo nėra"
-
-msgid "scheduled"
-msgstr "suplanuotas"
-
-msgid "protected"
-msgstr "apsaugotas"
-
-#, php-format
-msgid "%d attachment"
-msgstr "%d prisegimas"
-
-#, php-format
-msgid "%d attachments"
-msgstr "%d prisegimai"
-
-msgid "Type"
-msgstr "Tipas"
-
-msgid "No user"
-msgstr "Nėra dalyvio"
-
-msgid "admin"
-msgstr "admin"
-
-msgid "superadmin"
-msgstr "Super Administratorius"
-
-msgid "Database error"
-msgstr "Datenbankfehler"
-
-msgid "There seems to be no Session table in your database. Is Dotclear completly installed?"
-msgstr "Jūsų duomenų bazėje nėra Session table . Ar Dotclear yra pilkai instaliuotas?"
-
-msgid "System"
-msgstr "Sistema"
-
-msgid "Blog"
-msgstr "Blogas"
-
-msgid "Updates"
-msgstr "Atnaujinimai"
-
-msgid "Languages"
-msgstr "Kalbos"
-
-msgid "Unable to open directory."
-msgstr "Nepavyksta atidaryti direktorijos"
-
-msgid "Unable to create directory."
-msgstr "Nepavyksta sukurti direktorijos"
-
-msgid "File is not writable."
-msgstr "Failui nesuteiktos rašymo teisės."
-
-msgid "Unable to open file."
-msgstr "Nepavyksta atidaryti failo."
-
-msgid "Not an uploaded file."
-msgstr "Ne įkeltas failas."
-
-msgid "The uploaded file exceeds the maximum file size allowed."
-msgstr "Įkeltas failas viršija maksimalų leistiną dydį."
-
-msgid "The uploaded file was only partially uploaded."
-msgstr "Buvo įkelta tik dalis failo."
-
-msgid "No file was uploaded."
-msgstr "Failas nebuvo įkeltas."
-
-msgid "Missing a temporary folder."
-msgstr "Nėra temporary direktorijos."
-
-msgid "Failed to write file to disk."
-msgstr "Nepavyko įrašyti į diską."
-
-#, php-format
-msgid "%s is not a directory."
-msgstr "%s yra ne direktorija."
-
-msgid "Uploading this file is not allowed."
-msgstr "Šio failo įkėlimas yra neleidžiamas."
-
-msgid "Destination directory is not in jail."
-msgstr "Direktorija nėra užrakinta."
-
-msgid "File already exists."
-msgstr "Failas jau egzistuoja."
-
-msgid "Cannot write in this directory."
-msgstr "Negalima įrašyti į šią direktoriją."
-
-msgid "An error occurred while writing the file."
-msgstr "Įrašant failą įvyko klaida."
-
-msgid "Source file does not exist."
-msgstr "Pradinis failas neegzistuoja."
-
-msgid "File is not in jail."
-msgstr "Failas nėra užrakintas."
-
-msgid "Destination directory is not writable."
-msgstr "Paskirta direktorija neturi rašymo teisių."
-
-msgid "Unable to rename file."
-msgstr "Nepavyko pervadinti failo."
-
-msgid "File cannot be removed."
-msgstr "Failas negali būti pašalintas."
-
-msgid "Directory is not in jail."
-msgstr "Direktorija nėra užrakinta."
-
-msgid "Directory cannot be removed."
-msgstr "Direktorija negali būti pašakinta"
-
-msgid "Not enough memory to open image."
-msgstr "Nepakanka atminties atidaryti paveikslėliui."
-
-#, php-format
-msgid "File %s is not compressed in the zip."
-msgstr "Failas %s nėra suarchyvuotas zip formatu."
-
-#, php-format
-msgid "Trying to unzip a folder name %s"
-msgstr " Bandoma išarchyvuoti bylą pavadinimu %s"
-
-msgid "Unable to write destination file."
-msgstr "Nepavyksta įrašyti į paskirtą failą."
-
-msgid "Unable to write in target directory, permission denied."
-msgstr "Nepavyksta įrašyti į adresuotą direktoriją, priėjimas draudžiamas."
-
-msgid "Not enough memory to open file."
-msgstr "Nepakanka atminties atidaryti failui."
-
-msgid "File does not exist"
-msgstr "Failas neegzistuoja"
-
-msgid "Cannot read file"
-msgstr "Nepavyksta perskaityti failo"
-
-msgid "Directory does not exist"
-msgstr "Direktorija neegzistuoja"
-
-msgid "Cannot read directory"
-msgstr "Nepavyksta perskaityti direktorijos"
-
-msgid "administrator"
-msgstr "administratorius"
-
-msgid "manage their own entries and comments"
-msgstr "tvarkyti savo įrašus ir komentarus"
-
-msgid "publish entries and comments"
-msgstr "publikuoti įrašus ir komentarus"
-
-msgid "delete entries and comments"
-msgstr "trinti įrašus ir komentarus"
-
-msgid "manage all entries and comments"
-msgstr "tvarkyti visus įrašus ir komentarus"
-
-msgid "manage categories"
-msgstr "tvarkyti kategorijas"
-
-msgid "manage their own media items"
-msgstr "tvarkyti savo media elementus"
-
-msgid "manage all media items"
-msgstr "tvarkyti visus media elementus"
-
-msgid "That user does not exist in the database."
-msgstr "Šis dalyvis neegzistuoja duomenų bazėje."
-
-msgid "That key does not exist in the database."
-msgstr "Šis požymis neegzistuoja duomenų bazėje."
-
-msgid "You are not allowed to add categories"
-msgstr "Jums nėra leidžiama pridėti kategorijas"
-
-msgid "You are not allowed to update categories"
-msgstr "Jums nėra leidžiama atnaujinti kategorijų"
-
-msgid "You are not allowed to delete categories"
-msgstr "Jums nėra leidžiama trinti kategorijų"
-
-msgid "This category is not empty."
-msgstr "Ši kategorija nėra tuščia"
-
-msgid "Category URL must be unique."
-msgstr "Kategorijos URL turi būti unikalus"
-
-msgid "You must provide a category title"
-msgstr "Turite nurodyti kategorijos pavadinimą"
-
-msgid "You must provide a category URL"
-msgstr "Turite nurodyti kategorijos URL"
-
-msgid "You are not allowed to create an entry"
-msgstr "Jums neleidžiama kurti įrašų"
-
-msgid "You are not allowed to update entries"
-msgstr "Jums neleidžiama kurti atnaujinti įrašų"
-
-msgid "No such entry ID"
-msgstr "Tokio įrašo ID nėra"
-
-msgid "You are not allowed to edit this entry"
-msgstr "Jums neleidžiama redaguoti šio įrašo"
-
-msgid "You are not allowed to change this entry status"
-msgstr "Jums neleidžiama keisti šio įrašo statuso"
-
-msgid "You are not allowed to change this entry category"
-msgstr "Jums neleidžiama keisti šio įrašo kategorijos"
-
-msgid "You are not allowed to mark this entry as selected"
-msgstr "Jums neleidžiama pažymėti šio įrašo kaip pasirinkto"
-
-msgid "You are not allowed to delete entries"
-msgstr "Jums neleidžiama trinti įrašų"
-
-msgid "You are not allowed to delete this entry"
-msgstr "Jums neleidžiama trinti šio įrašo"
-
-msgid "No entry title"
-msgstr "Nėra įrašo pavadinimo"
-
-msgid "No entry content"
-msgstr "Nėra įrašo turinio"
-
-msgid "Empty entry URL"
-msgstr "Tuščias įrašo URL"
-
-msgid "You are not allowed to update comments"
-msgstr "Jums neleidžiama atnaujinti komentarų"
-
-msgid "No such comment ID"
-msgstr "Tokio komentaro ID nėra"
-
-msgid "You are not allowed to update this comment"
-msgstr "Jums neleidžiama atnaujinti šio komentaro"
-
-msgid "You are not allowed to change this comment's status"
-msgstr "Jums neleidžiama keisti šio komentaro statuso"
-
-msgid "You are not allowed to delete comments"
-msgstr "Jums neleidžiama trinti komentarų"
-
-msgid "You are not allowed to delete this comment"
-msgstr "Jums neleidžiama trinti šio komentaro"
-
-msgid "You must provide a comment"
-msgstr "Turite pateikti komentarą"
-
-msgid "You must provide an author name"
-msgstr "Turite pateikti autoriaus vardą"
-
-msgid "Email address is not valid."
-msgstr "El. pašto adresas negalioja"
-
-msgid "online"
-msgstr "prisijungęs"
-
-msgid "offline"
-msgstr "neprisijungęs"
-
-msgid "removed"
-msgstr "ištrintas"
-
-msgid "You are not an administrator"
-msgstr "Jūs nesate administratorius"
-
-msgid "Invalid user language code"
-msgstr "Negaliojantis dalyvio kalbos kodas"
-
-msgid "Blog ID must contain at least 2 characters using letters, numbers or symbols."
-msgstr "Blogo ID turi sudaryti raidžių, skaičių ir simbolių kombinaciją iš mažiausiai 2 ženklų."
-
-msgid "No blog name"
-msgstr "Nėra blogo pavadinimo"
-
-msgid "No blog URL"
-msgstr "Nėra blogo URL"
-
-msgid "No log message"
-msgstr "Nėra registro žinutės"
-
-msgid "unknown"
-msgstr "nežinoma"
-
-msgid "medium"
-msgstr "Vidutinis:"
-
-msgid "small"
-msgstr "Mažas:"
-
-msgid "thumbnail"
-msgstr "Miniatiūra:"
-
-msgid "square"
-msgstr "kvadratas"
-
-msgid "No blog defined."
-msgstr "Nenurodytas joks blogas"
-
-#, php-format
-msgid "Directory %s does not exist."
-msgstr "Direktorija %s neegzistuoja."
-
-msgid "You are not a super administrator."
-msgstr "Jūs nesate super administratorius."
-
-msgid "Permission denied."
-msgstr "Priėjimas draudžiamas."
-
-msgid "You are not the file owner."
-msgstr "Jūs nesate failo savininkas."
-
-msgid "New file already exists."
-msgstr "Naujas failas jau egzistuoja."
-
-msgid "File does not exist in the database."
-msgstr "Failo nėra duomenų bazėje."
-
-#, php-format
-msgid "Extract destination directory %s already exists."
-msgstr "Išarchyvuojama direktorija %s jau egzistuoja."
-
-msgid "Embedded Audio Player"
-msgstr "Embedded Audio Player"
-
-msgid "Embedded Video Player"
-msgstr "Embedded Video Player"
-
-#, php-format
-msgid "%s: in [%s] and [%s]"
-msgstr "%s: į [%s] ir [%s]"
-
-msgid "Empty module zip file."
-msgstr "Tuščias modulio zip failas"
-
-msgid "The zip file does not appear to be a valid Dotclear module."
-msgstr "Tai nėra tinkamas Dotclear modulio zip failas."
-
-msgid "An error occurred during module deletion."
-msgstr "Modulio trynimo metu įvykl klaida."
-
-#, php-format
-msgid "Unable to upgrade \"%s\". (same version)"
-msgstr "Nepavyko atnaujinti \"%s\". (ta pati versija)"
-
-msgid "Unable to read new _define.php file"
-msgstr "Nepavyko perskaityti naujo _define.php failo"
-
-msgid "No such module."
-msgstr "Nėra tokio modulio."
-
-msgid "Cannot remove module files"
-msgstr "Negalima pašalinti modulio failų"
-
-msgid "Cannot deactivate plugin."
-msgstr "Negalima išjungti plugin'o"
-
-msgid "Cannot activate plugin."
-msgstr "Negalima įjungti plugin'o"
-
-#, php-format
-msgid "Invalid setting dcNamespace: %s"
-msgstr "Negaliojantis nustatymas dcNamespace: %s"
-
-msgid "Unable to retrieve settings:"
-msgstr "Nepavyksta gauti nustatymų:"
-
-#, php-format
-msgid "%s is not a valid setting id"
-msgstr "%s yra negaliojantis nustatymų id"
-
-msgid "No namespace specified"
-msgstr "Namespace nenurodytas."
-
-msgid "Unable to retrieve namespaces:"
-msgstr "Nepavyko gauti namespaces:"
-
-#, php-format
-msgid "Invalid setting namespace: %s"
-msgstr "Negaliojantys nustatymai namespace: %s"
-
-#, php-format
-msgid "%s has still been pinged"
-msgstr "%s vis dar siunčiamas ping"
-
-msgid "Unable to ping URL"
-msgstr "Nepavyksta siųsti ping URL"
-
-#, php-format
-msgid "%s is not a ping URL"
-msgstr "%s nėra ping URL"
-
-#, php-format
-msgid "%s, ping error:"
-msgstr "%s, ping klaida:"
-
-msgid "Digests file not found."
-msgstr "Digests failas nerastas."
-
-msgid "No file to download"
-msgstr "Nėra failo atsisiuntimui"
-
-msgid "Root directory is not writable."
-msgstr "Root direktorijai nesuteiktos rašymo teisės."
-
-msgid "An error occurred while downloading archive."
-msgstr "Atisiunčiant archyvą įvykl klaida."
-
-msgid "Archive not found."
-msgstr "Archyvas nerastas."
-
-msgid "Unable to read current digests file."
-msgstr "Nepavyksta perskaityti dabartinio digests failo."
-
-msgid "Downloaded file does not seem to be a valid archive."
-msgstr "Atsiųstas archyvas yra netinkamo formato."
-
-msgid "Incomplete archive."
-msgstr "Nepilnas archyvas."
-
-msgid "Unable to read digests file."
-msgstr "Nepavyksta perskaityti digests failo."
-
-msgid "Invalid digests file."
-msgstr "Negaliojantis digests failas."
-
-msgid "SQLite Database Schema cannot be upgraded."
-msgstr "SQLite Database Schema negali būti atnaujinta."
-
-msgid "Something went wrong with auto upgrade:"
-msgstr "Automatinio atnaujinimo metu įvyko klaida:"
-
-msgid "Unable to connect to database"
-msgstr "Nepavyksta prisijungti prie duomenų bazės"
-
-#, php-format
-msgid "<p>This either means that the username and password information in your <strong>config.php</strong> file is incorrect or we can't contact the database server at \"<em>%s</em>\". This could mean your host's database server is down.</p> <ul><li>Are you sure you have the correct username and password?</li><li>Are you sure that you have typed the correct hostname?</li><li>Are you sure that the database server is running?</li></ul><p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href=\"http://forum.dotclear.net/\">Dotclear Support Forums</a>.</p>"
-msgstr "<p>Tai reiškia, kad arba username ir slaptažodis jūsų <strong>config.php</strong> faile yra neteisingi arba neįmanoma prisijungti prie duomenų bazės serverio \"<em>%s</em>\". Gali būti kad jūsų hosto duomenų bazės serveris neveikia.</p> <ul><li>Ar esate įsitikinęs, kad duomenų bazės prisijungimo duomenys geri?</li><li>Ar suvedėte teisingą hostname?</li><li>Ar duomenų bazės serveris tikrai veikia?</li></ul><p>Jei nesate tikras ką šie terminai reiškia, patariame susisiekti su hostingo tiekėju. Jei vis dar reikia pagalbos visada galite apsilankyti <a href=\"http://forum.dotclear.net/\">Dotclear Support Forums</a>.</p>"
-
-msgid "The following error was encountered while trying to read the database:"
-msgstr "Bandant nuskaityti duomenų bazę įvyko tokios klaidos:"
-
-#~ msgid "The file <strong>%s</strong> already exists. If you need to reset any of the configuration items in this file, please delete it first or you may <a href=\"%s\">continue to install</a>."
-#~ msgstr "Die Datei <strong>%s</strong> existiert bereits. Willst Du die Einträge in der Konfigurationsdatei zurücksetzen, bitte lösche diese erst oder fahre mit <a href=\"%s\">der Installation fort</a>."
-
-#~ msgid "Login:"
-#~ msgstr "Login:"
-
-#~ msgid "Login and password"
-#~ msgstr "Login und Passwort:"
-
-#~ msgid "User ID"
-#~ msgstr "Benutzer ID"
-
-#~ msgid "Name"
-#~ msgstr "Name"
Index: ocales/lt/plugins.po
===================================================================
--- locales/lt/plugins.po	(revision 813)
+++ 	(revision )
@@ -1,1410 +1,0 @@
-# German translation of DotClear
-# Copyright (C) 2008.
-# Andreas Diller <nendilo@gmail.com>, 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: Dotclear 2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 22:01+0100\n"
-"PO-Revision-Date: 2012-04-19 03:20+0100\n"
-"Last-Translator: Paulius Černakauskas <paulius.cernakauskas@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-msgid "no"
-msgstr "ne"
-
-msgid "Configuration successfully updated"
-msgstr "Nustatymai sėkmingai atnaujinti"
-
-msgid "Settings definition successfully updated"
-msgstr "Nustatymų aprašas sėkmingai atnaujintas"
-
-msgid "blog settings"
-msgstr "blogo nustatymai"
-
-msgid "Value"
-msgstr "Reikšmė"
-
-msgid "Description"
-msgstr "Aprašymas"
-
-msgid "global settings"
-msgstr "bendri nustatymai"
-
-msgid "Akismet spam filter"
-msgstr "Aksimet spamo filtras"
-
-#, php-format
-msgid "Filtered by %s."
-msgstr "Filtruota pagal %s"
-
-msgid "Akismet API key:"
-msgstr "Akismet API raktas:"
-
-msgid "API key verified"
-msgstr "API raktas patvirtintas"
-
-msgid "API key not verified"
-msgstr "API raktas nepatvirtintas"
-
-msgid "Get your own API key"
-msgstr "Gaukite savo API raktą"
-
-msgid "Antispam"
-msgstr "Antispam"
-
-msgid "Delete junk comments older than"
-msgstr "Trinti šiukšlėmis pažymųtus komentarus senesnius nei"
-
-msgid "days"
-msgstr "dienų"
-
-msgid "IP Blacklist / Whitelist Filter"
-msgstr "IP Blacklist sąrašas / Whitelist filtras"
-
-#, php-format
-msgid "Filtered by %1$s with rule %2$s."
-msgstr "Filtruota pagal %1$s taikant taisyklę %2$s."
-
-msgid "IP address has been successfully added."
-msgstr "IP adresas sėkmingai pridėtas."
-
-msgid "IP addresses have been successfully removed."
-msgstr "IP adresas sųkmingai pašalintas."
-
-msgid "Blacklist"
-msgstr "Blacklist"
-
-msgid "Whitelist"
-msgstr "Whitelist"
-
-msgid "Add an IP address"
-msgstr "Pridėti IP adresą"
-
-msgid "Global IP"
-msgstr "Globalus IP"
-
-msgid "Add"
-msgstr "Pridėti"
-
-msgid "No IP address in list."
-msgstr "Sąraše nėra IP adreso"
-
-msgid "IP list"
-msgstr "IP sąrašas"
-
-msgid "Checks sender IP address against DNSBL servers"
-msgstr "Patikrina siuntėjo IP adresą DNSLB serveriuose"
-
-#, php-format
-msgid "Filtered by %1$s with server %2$s."
-msgstr "Filtruota pagal %1$s su %2$s serveriu."
-
-msgid "IP Lookup servers"
-msgstr "IP paieškos serveriai"
-
-msgid "Add here a coma separated list of servers."
-msgstr "Čia pridėkite kableliais atskirtų serverių sąrašą."
-
-msgid "Checks links in comments against surbl.org"
-msgstr "Patikrinkite komentarų nuorodos pagal surbl.org"
-
-msgid "Words Blacklist"
-msgstr "Žodžių Blacklist"
-
-#, php-format
-msgid "Filtered by %1$s with word %2$s."
-msgstr "Filtruota pagal %1$s su žodžiu %2$s."
-
-msgid "Words have been successfully added."
-msgstr "Žodžiai sėkmingai pridėti."
-
-msgid "Word has been successfully added."
-msgstr "Žodžis sėkmingai pridėtas."
-
-msgid "Words have been successfully removed."
-msgstr "Žodžiai sėkmingai pašalinti."
-
-msgid "Add a word"
-msgstr "Pridėti žodį."
-
-msgid "Global word"
-msgstr "Bendras žodis"
-
-msgid "No word in list."
-msgstr "Sąraše žodžių nėra"
-
-msgid "List"
-msgstr "Sąrašas"
-
-msgid "Delete selected words"
-msgstr "Trinti pasirinktus žodžius"
-
-msgid "Create default wordlist"
-msgstr "Sukurti nustatytą žodžių sąrašą"
-
-msgid "This word exists"
-msgstr "Toks žodis yra"
-
-msgid "No description"
-msgstr "Nėra aprašymo"
-
-#, php-format
-msgid "Filtered by %1$s (%2$s)"
-msgstr "Filtruota pagal %1$s (%2$s)"
-
-msgid "Unknown filter."
-msgstr "Nežinomas filtras."
-
-msgid "This comment is a spam:"
-msgstr "Šis komentaras yra spamas:"
-
-#, php-format
-msgid "(including %d spam comment)"
-msgstr "(įskaitant %d spamo komentarą)"
-
-#, php-format
-msgid "(including %d spam comments)"
-msgstr "(įskaitant %d spamo komentarus)"
-
-msgid "Spam moderation"
-msgstr "Spamo tvarkymas"
-
-msgid "Spam"
-msgstr "Spamas"
-
-msgid "Ham"
-msgstr "Hamas"
-
-msgid "Filter does not exist."
-msgstr "Nėra filtro"
-
-msgid "Filter has no user interface."
-msgstr "Filtras neturi vartotojo sąsajos."
-
-msgid "Return to filters"
-msgstr "Grįžti į filtrus"
-
-#, php-format
-msgid "%s configuration"
-msgstr "%s nustatymai"
-
-msgid "Information"
-msgstr "Informacija"
-
-msgid "Spam comments have been successfully deleted."
-msgstr "Spamo komentarai sėkmingai ištrinti."
-
-msgid "Junk comments:"
-msgstr "Komentarų šiukšlės:"
-
-msgid "Published comments:"
-msgstr "Publikuoti komentarai:"
-
-msgid "Delete all spams"
-msgstr "Trinti visą spamą"
-
-#, php-format
-msgid "All spam comments older than %s day(s) will be automatically deleted."
-msgstr "Senesni nei %s dienų spamo komentarai bus automatiškai ištrinami."
-
-msgid "Available spam filters"
-msgstr "Galimi spam filtrai"
-
-msgid "Filters configuration has been successfully saved."
-msgstr "Filtrų nustatymai sėkmingai išsaugoti."
-
-msgid "Order"
-msgstr "Rūšiavimas"
-
-msgid "Active"
-msgstr "Aktyvus"
-
-msgid "Auto Del."
-msgstr "Auto tryn."
-
-msgid "Filter name"
-msgstr "Filtro pavadinimas"
-
-msgid "Filter configuration"
-msgstr "Filtro nustatymai"
-
-msgid "Syndication"
-msgstr "Sindikavimas"
-
-msgid "Junk comments RSS feed"
-msgstr "Šlamšto komentarų RSS "
-
-msgid "Published comments RSS feed"
-msgstr "Publikuotų komentarų RSS"
-
-msgid "Blogroll"
-msgstr "Blogroll"
-
-msgid "manage blogroll"
-msgstr "tvarkyti Bogroll"
-
-msgid "Links"
-msgstr "Nuorodos"
-
-msgid "All categories"
-msgstr "Visos kategorijos"
-
-msgid "Home page only"
-msgstr "Tik namų puslapis"
-
-msgid "You must provide a link title"
-msgstr "Turite įrašyti nuorodos pavadinimą"
-
-msgid "You must provide a link URL"
-msgstr "Turite įrašyti nuorodos URL"
-
-msgid "You need to provide a XBEL or OPML file."
-msgstr "Turite pateikti XBEL arba OPML failą."
-
-msgid "File is not in XML format."
-msgstr "Tai ne XML formato failas."
-
-msgid "No such link or title"
-msgstr "Tokios nuorodos ar pavadinimo nėra"
-
-msgid "Return to blogroll"
-msgstr "Grįžti į Blogroll"
-
-msgid "Category has been successfully updated"
-msgstr "Kategorija sėkmingai atnaujinta"
-
-msgid "Edit category"
-msgstr "Taisyti kategoriją"
-
-msgid "Link has been successfully updated"
-msgstr "Nuoroda sėkmingai atnaujinta"
-
-msgid "Edit link"
-msgstr "Taisyti nuorodą"
-
-msgid "XFN"
-msgstr "XFN"
-
-msgid "_xfn_Me"
-msgstr "Aš"
-
-msgid "_xfn_Another link for myself"
-msgstr "Kita nuoroda man"
-
-msgid "_xfn_Friendship"
-msgstr "Draugystė"
-
-msgid "_xfn_Contact"
-msgstr "Kontaktas"
-
-msgid "_xfn_Acquaintance"
-msgstr "Pažįstamas"
-
-msgid "_xfn_Friend"
-msgstr "Draugas"
-
-msgid "_xfn_Physical"
-msgstr "Fizinis"
-
-msgid "_xfn_Met"
-msgstr "Sutiktas"
-
-msgid "_xfn_Professional"
-msgstr "Profesionalas"
-
-msgid "_xfn_Co-worker"
-msgstr "Bendradarbis"
-
-msgid "_xfn_Colleague"
-msgstr "Kolega"
-
-msgid "_xfn_Geographical"
-msgstr "Geografinis"
-
-msgid "_xfn_Co-resident"
-msgstr "Rezidentas"
-
-msgid "_xfn_Neighbor"
-msgstr "Kaimynas"
-
-msgid "_xfn_Family"
-msgstr "Šeima"
-
-msgid "_xfn_Child"
-msgstr "Vaikas"
-
-msgid "_xfn_Parent"
-msgstr "Tėvas"
-
-msgid "_xfn_Sibling"
-msgstr "Giminaitis"
-
-msgid "_xfn_Spouse"
-msgstr "Sutuoktinis"
-
-msgid "_xfn_Kin"
-msgstr "Giminė"
-
-msgid "_xfn_Romantic"
-msgstr "Romntiškas"
-
-msgid "_xfn_Muse"
-msgstr "Mūza"
-
-msgid "_xfn_Crush"
-msgstr "Meilė"
-
-msgid "_xfn_Date"
-msgstr "Pasimatymas"
-
-msgid "_xfn_Sweetheart"
-msgstr "Mylimas"
-
-msgid "Nothing to import"
-msgstr "Nėra ką įkelti"
-
-msgid "Import operation cancelled."
-msgstr "Įkėlimas atšauktas."
-
-msgid "Items order has been successfully updated"
-msgstr "Išdėstymas sėkmingai atnaujintas."
-
-msgid "Items have been successfully removed."
-msgstr "Sėkmingai pašalinti."
-
-msgid "Link has been successfully created."
-msgstr "Nuoroda sėkmingai sukurta."
-
-msgid "category has been successfully created."
-msgstr "Kategorija sėkmingai sukurta."
-
-msgid "links have been successfully imported."
-msgstr "nuorodos sėkmingai įkeltos."
-
-msgid "URL"
-msgstr "URL"
-
-msgid "Lang"
-msgstr "Kalba"
-
-msgid "Save order"
-msgstr "Išsaugojimo tvarka"
-
-msgid "Delete selected links"
-msgstr "Trinti pasirinktas nuorodas"
-
-msgid "Are you sure you want to delete selected links?"
-msgstr "Ar tikrai norite ištrinti pasirinktas nuorodas?"
-
-msgid "The link list is empty."
-msgstr "Šis nuorodų sąrašas yra tuščias."
-
-msgid "Add a new link"
-msgstr "Pridėti naują nuorodą"
-
-msgid "Add a category"
-msgstr "Pridėti naują kategoriją"
-
-msgid "Import links"
-msgstr "Įkelti nuorodas"
-
-msgid "OPML or XBEL File:"
-msgstr "OPML arba XBEL failas:"
-
-msgid "import"
-msgstr "įkelti"
-
-msgid "Light linear gradient"
-msgstr "Šviesus linijinis gradientas"
-
-msgid "Medium linear gradient"
-msgstr "Vidutinis linijinis gradientas"
-
-msgid "Dark linear gradient"
-msgstr "Tamsus linijinis gradientas"
-
-msgid "Solid color"
-msgstr "Spalva"
-
-msgid "Custom..."
-msgstr "Kitoks…"
-
-msgid "Blowup configuration"
-msgstr "Blowup nustatymai"
-
-msgid "Predefined styles"
-msgstr "Numatyti stiliai"
-
-msgid "Apply code"
-msgstr "Taikyti kodą"
-
-msgid "For the following reasons, images cannot be created. You won't be able to change some background properties."
-msgstr "Dėl šių priežasčių paveikslėliai negali būti sukurti. Nebus galima keisti kai kurių fono nustatymų."
-
-msgid "Theme configuration has been successfully updated."
-msgstr "Nustatymai sėkmingai atnaujiti."
-
-msgid "General"
-msgstr "Bendras"
-
-msgid "Background color:"
-msgstr "Fono spalva:"
-
-msgid "Background color fill:"
-msgstr "Fono spalvos užpildas:"
-
-msgid "Main text font:"
-msgstr "Pagrindinio teksto šriftas:"
-
-msgid "Main text font size:"
-msgstr "Pagrindinio teksto dydis:"
-
-msgid "Main text color:"
-msgstr "Pagrindinio teksto spalva:"
-
-msgid "Text line height:"
-msgstr "Linijos aukštis:"
-
-msgid "Links color:"
-msgstr "Nuorodų spalva:"
-
-msgid "Visited links color:"
-msgstr "Aplankytų nuorodų spalva:"
-
-msgid "Focus links color:"
-msgstr "Fokusuotų nuorodų spalva:"
-
-msgid "Page top"
-msgstr "Puslapio viršus"
-
-msgid "Prelude color:"
-msgstr "Įžangos spalva:"
-
-msgid "Hide main title"
-msgstr "Slėpti pagrindinę antraštę"
-
-msgid "Main title font:"
-msgstr "Pagrindinės antraštės šriftas:"
-
-msgid "Main title font size:"
-msgstr "Pagrindinės antraštės šrifto spalva:"
-
-msgid "Main title color:"
-msgstr "Pagrindinės antraštės spalva:"
-
-msgid "Main title alignment:"
-msgstr "Pagrindinės antraštės lygiavimas:"
-
-msgid "center"
-msgstr "centre"
-
-msgid "left"
-msgstr "kairėje"
-
-msgid "right"
-msgstr "dešinėje"
-
-msgid "Main title position (x:y)"
-msgstr "Pagrindinės antraštės pozicija (x:y):"
-
-msgid "Top image"
-msgstr "Viršutinis paveikslėlis"
-
-msgid "Choose \"Custom...\" to upload your own image."
-msgstr "Pasirinkite \"Kitoks…\" norėdami įkelti savo paveikslėlį."
-
-msgid "Add your image:"
-msgstr "Pridėkite savo paveikslėlį:"
-
-#, php-format
-msgid "JPEG or PNG file, 800 pixels wide, maximum size %s"
-msgstr "800 pikselių pločio, maksimalaus %s dydžio, JPEG arba PNG failas."
-
-msgid "Preview"
-msgstr "Peržiūrėti"
-
-msgid "Sidebar"
-msgstr "Šoninė juosta"
-
-msgid "Sidebar position:"
-msgstr "Šoninės juostos pozicija:"
-
-msgid "Sidebar text font:"
-msgstr "Šoninės juostos teksto šriftas:"
-
-msgid "Sidebar text font size:"
-msgstr "Šoninės juostos teksto šrifto dydis:"
-
-msgid "Sidebar text color:"
-msgstr "Šoninės juostos teksto spalva:"
-
-msgid "Sidebar titles font:"
-msgstr "Šoninės juostos antraštės šriftas:"
-
-msgid "Sidebar titles font size:"
-msgstr "Šoninės juostos antraštės šrifto dydis:"
-
-msgid "Sidebar titles color:"
-msgstr "Šoninės juostos antraštės spalva:"
-
-msgid "Sidebar 2nd level titles font:"
-msgstr "Šoninės juostos 2 eilės antraštės šriftas:"
-
-msgid "Sidebar 2nd level titles font size:"
-msgstr "Šoninės juostos 2 eilės antraštės šrifto dydis:"
-
-msgid "Sidebar 2nd level titles color:"
-msgstr "Šoninės juostos 2 eilės antraštės spalva:"
-
-msgid "Sidebar lines color:"
-msgstr "Šoninės juostos linijų spalva:"
-
-msgid "Sidebar links color:"
-msgstr "Šoninės juostos nuorodų spalva:"
-
-msgid "Sidebar visited links color:"
-msgstr "Šoninės juostos aplankytų nuorodų spalva:"
-
-msgid "Sidebar focus links color:"
-msgstr "Šoninės juostos fokusuotų nuorodų spalva:"
-
-msgid "Date title font:"
-msgstr "Datos antraštės šriftas:"
-
-msgid "Date title font size:"
-msgstr "Datos antraštės šrifto dydis:"
-
-msgid "Date title color:"
-msgstr "Datos antraštės spalva:"
-
-msgid "Entry title font:"
-msgstr "Įrašo antraštės šriftas:"
-
-msgid "Entry title font size:"
-msgstr "Įrašo antraštės šrifto dydis:"
-
-msgid "Entry title color:"
-msgstr "Įrašo antraštės spalva:"
-
-msgid "Comment background color:"
-msgstr "Komentaro fono spalva:"
-
-msgid "Comment text color:"
-msgstr "Komentaro teksto spalva:"
-
-msgid "My comment background color:"
-msgstr "Mano komentaro fono spalva:"
-
-msgid "My comment text color:"
-msgstr "Mao komentaro teksto spalva:"
-
-msgid "Footer"
-msgstr "Apatinė dalis"
-
-msgid "Footer font:"
-msgstr "Apatinės dalies šriftas:"
-
-msgid "Footer font size:"
-msgstr "Apatinės dalies šrifto dydis:"
-
-msgid "Footer color:"
-msgstr "Apatinės dalies spalva:"
-
-msgid "Footer links color:"
-msgstr "Apatinės dalies nuorodų spalva:"
-
-msgid "Footer background color:"
-msgstr "Apatinės dalies fono spalva:"
-
-msgid "Configuration import / export"
-msgstr "Nustatymų importavimas / eksportavimas"
-
-msgid "You can share your configuration using the following code. To apply a configuration, paste the code, click on \"Apply code\" and save."
-msgstr "Galite dalintis savo nustatymai naudodamiesi šiuo kodu. Norėdami pritaikyti nustatymus, ikelkite kodą, paspauskite \"Taikyti kodą\" ir išsaugokite."
-
-msgid "default"
-msgstr "standartinis"
-
-msgid "At least one of the following functions is not available: imagecreatetruecolor, imagepng & imagecreatefrompng."
-msgstr "Negalima bent viena iš šių funkcijų: imagecreatetruecolor, imagepng & imagecreatefrompng."
-
-msgid "The 'public' directory does not exist."
-msgstr "Direktorija 'public' neegzistuoja"
-
-#, php-format
-msgid "The '%s' directory cannot be modified."
-msgstr "Negalima modifikuoti '%s' direktorijos."
-
-msgid "Unable to create images."
-msgstr "Nepavyksta sukurti paveikslėlių."
-
-msgid "Invalid file type."
-msgstr "Netinkamas failo tipas."
-
-msgid "Uploaded image is not 800 pixels wide."
-msgstr "Įkeltas paveikslėlis yra ne 800 pikselių pločio."
-
-msgid "Unable to open image."
-msgstr "Nepavyko atidaryti paveikslėlio."
-
-msgid "Checks trackback source for a link to the post"
-msgstr "Patikrina trackback šaltinio nuorodą į įrašą."
-
-msgid "Import/Export"
-msgstr "Import./Eksport."
-
-msgid "Flat file export"
-msgstr "Paprasto failo eksportavimas"
-
-msgid "Exports a blog or a full Dotclear installation to flat file."
-msgstr "Eksportuoja blogą arba pilną Dotclear instaliaciją į bendrą failą."
-
-msgid "Export file not found."
-msgstr "Eksportuojamas failas nerastas."
-
-msgid "Export a blog"
-msgstr "Eksportuoti blogą"
-
-#, php-format
-msgid "This will create an export of your current blog: %s"
-msgstr "Bus sukurtas eksportuojamas failas jūsų dabartiniam blogui: %s"
-
-msgid "Export"
-msgstr "Eksportavimas"
-
-msgid "You may also want to download your media directory as a zip file"
-msgstr "Tai pat galite parsisiųsti savo media direktoriją kaip zip failą."
-
-msgid "Export all content"
-msgstr "Eksportuoti visą turinį"
-
-msgid "Congratulation!"
-msgstr "Sveikiname!"
-
-msgid "Your blog has been successfully imported. Welcome on Dotclear 2!"
-msgstr "Jūsų blogas sėkmingai importuotas. Sveiki prisijungę prie Dotclear 2!"
-
-msgid "Why don't you blog this now?"
-msgstr "Kodėl jums neparašius apie tai į blogą?"
-
-msgid "or"
-msgstr "arba"
-
-msgid "visit your dashboard"
-msgstr "užeikite į savo nustatymų puslapį"
-
-msgid "Dotclear 1.2 import"
-msgstr "Dotclear 1.2 importavimas"
-
-msgid "Import a Dotclear 1.2 installation into your current blog."
-msgstr "Importuoja Dotclear 1.2 Instaliaciją į dabartinį blogą."
-
-#, php-format
-msgid "This will import your Dotclear 1.2 content as new content in the current blog: %s."
-msgstr "Visas Dotclear 1.2 turinys bus importuotas į dabartinį blogą (%s) kaip naujas turinys."
-
-msgid "Please note that this process will empty your categories, blogroll, entries and comments on the current blog."
-msgstr "Atkreipkite dėmesį, kad šis procesas gali ištrinti jūsų kategorijas, blogroll, įrašus ir komentarus dabartiniame bloge."
-
-msgid "Depending on the size of your blog, it could take a few minutes."
-msgstr "Tai gali užtrukti iki kelių minučių priklausomai nuo jūsų blogo dydžio."
-
-msgid "General information"
-msgstr "Bendra informacija"
-
-msgid "Import my blog now"
-msgstr "Importuoti mano blogą"
-
-msgid "We first need some information about your old Dotclear 1.2 installation."
-msgstr "Pirmiausiai mums reikalinga informacija apie jūsų seną Dotclear 1.2 instaliaciją."
-
-msgid "Entries import options"
-msgstr "Įrašų importavimo pasirinkimai"
-
-msgid "Number of entries to import at once:"
-msgstr "Vienu kartu importuojamų įrašų skaičius:"
-
-msgid "Importing users"
-msgstr "Importuojami dalyviai"
-
-msgid "Importing categories"
-msgstr "Importuojamos kategorijos"
-
-msgid "Importing blogroll"
-msgstr "Importuojamas Blogroll"
-
-#, php-format
-msgid "Importing entries from %d to %d / %d"
-msgstr "Importuojami įrašai iš %d į %d / %d"
-
-msgid "Please read carefully"
-msgstr "Prašome atidžiai perskaityti"
-
-msgid "Every newly imported user has received a random password and will need to ask for a new one by following the \"I forgot my password\" link on the login page (Their registered email address has to be valid.)"
-msgstr "Kiekvienam nauujai importuotam dalyviui suteiktas skirtingas slaptažodis, kuris gali būti pakeistas sekant \"Pamiršau slaptažodį\" instrukcijas prisijungimo puslapyje (Jų el. pašto adresai turi būti galiojantys)."
-
-#, php-format
-msgid "Please note that Dotclear 2 has a new URL layout. You can avoid broken links by installing <a href=\"%s\">DC1 redirect</a> plugin and activate it in your blog configuration."
-msgstr "Atkreipkite dėmesį, kad Dotclear 2 turi naują URL išdėstymą. Galite išvengti neveikiančių nuorodų instaliuodami <a href=\"%s\">DC1 redirect</a> plugin'ą ir aktyvuodami jį savo blogo nustatymuose."
-
-msgid "next step"
-msgstr "kitas žingsnis"
-
-msgid "Dotclear tables not found"
-msgstr "Dotclear lentelės nerastos"
-
-msgid "Feed import"
-msgstr "Feed importas"
-
-msgid "Imports a feed as new entries."
-msgstr "Importuoja rss feed kaip naujus įrašus"
-
-msgid "Cannot retrieve feed URL."
-msgstr "Nepavyksta gauti rss URL."
-
-msgid "No items in feed."
-msgstr "Nėra rss įrašų."
-
-msgid "Content successfully imported."
-msgstr "Turinys sėkmingai importuotas."
-
-msgid "Import from a feed"
-msgstr "Importuoti iš rss"
-
-#, php-format
-msgid "This will import a feed (RSS or Atom) a as new content in the current blog: %s."
-msgstr "Bus importuota RSS arba Atom įrašai kaip nauji įrašai jūsų bloge: %s"
-
-msgid "Feed URL:"
-msgstr "Rss URL:"
-
-msgid "Send"
-msgstr "Siųsti"
-
-msgid "Flat file import"
-msgstr "Paprastas failo importavimas"
-
-msgid "Imports a blog or a full Dotclear installation from flat file."
-msgstr "Importuoja blogą arba pilną Dotclear instaliaciją iš failo."
-
-msgid "Single blog successfully imported."
-msgstr "Vienas blogas sėkmingai importuotas."
-
-msgid "Are you sure you want to import a full backup file?"
-msgstr "Ar tikrai norite importuoti visą atsarginės kopijos failą?"
-
-msgid "Import a single blog"
-msgstr "Importuoti vieną blogą"
-
-#, php-format
-msgid "This will import a single blog backup as new content in the current blog: %s."
-msgstr "Importuojama viena blogo atsarginė kopija kaip naujas turinys jūsų bloge: %s."
-
-msgid "Upload a backup file"
-msgstr "Įkelti atsarginės kopijos failą"
-
-msgid "or pick up a local file in your public directory"
-msgstr "arba pasirinkite vietinį failą iš savo public direktorijos"
-
-msgid "Import a full backup file"
-msgstr "Importuoti visą atsarginės kopijos failą"
-
-msgid "Warning: This will reset all the content of your database, except users."
-msgstr "Dėmesio: Bus ištrintas visas jūsų duomenų bazės turinys išskyrus dalyvius."
-
-msgid "WordPress import"
-msgstr "Wordpress importavimas"
-
-msgid "Import a WordPress installation into your current blog."
-msgstr "Importuoja WordPress instaliaciją į jūsų dabartinį blogą."
-
-#, php-format
-msgid "This will import your WordPress content as new content in the current blog: %s."
-msgstr "WordPress turinys bus importuotas naujo turinio pavidalu į jūsų blogą: %s."
-
-msgid "We first need some information about your old WordPress installation."
-msgstr "Pirmiausiai mums reikalinga tam tikra informacija apie jūsų WordPress instaliaciją."
-
-msgid "WordPress and Dotclear's handling of categories are quite different. You can assign several categories to a single post in WordPress. In the Dotclear world, we see it more like \"One category, several tags.\" Therefore Dotclear can only import one category per post and will chose the lowest numbered one. If you want to keep a trace of every category, you can import them as tags, with an optional prefix."
-msgstr "WordPress ir Dotclear categorijų tvarkymas yra gana skinrtingas. WordPress jūs galite priskirti kelias kategorijas vienam įrašui. Dotclear mes į tai žiūrime labiau kaip \"Viena kategorija, kelios žymos.\". Tokiu būdu Dotclear gali importuoti tik vieną kategoriją kiekvienam įrašui ir pasirinks pirmiausiai įvardintą. Jei norite atkirai atsekti kiekvieną kategoriją, galite jas įkelti kaip žymas, naudodami pasirinktiną prefiksą."
-
-msgid "On the other hand, in WordPress, a post can not be uncategorized, and a default installation has a first category labelised <i>\"Uncategorized\"</i>. If you did not change that category, you can just ignore it while importing your blog, as Dotclear allows you to actually keep your posts uncategorized."
-msgstr "Kita vertus WordPress įrašams kategorijos negai būti atšauktos ir tipinė instaliaciją pirmą kategoriją įvardina <i>\"Uncategorized\"</i>. Jei jūs nekeitėte šios kategorijos, tiesiog ignoruokite tai nes Dotclear leidžia jūsų įrašų nepriskirti jokiai kategorijai."
-
-msgid "Ignore the first category:"
-msgstr "Ignoruoti pirmą kategoriją:"
-
-msgid "Import lowest numbered category on posts:"
-msgstr "Importuoti pirmiausiai įvardintą kategoriją įrašuose:"
-
-msgid "Import all categories as tags:"
-msgstr "Importuoti visas kategorijas kaip žymas."
-
-msgid "Prefix such tags with:"
-msgstr "Tokioms žymoms kurti prefiksus:"
-
-msgid "Content filters"
-msgstr "Turinio filtrai"
-
-msgid "You may want to process your post and/or comment content with the following filters."
-msgstr "Galite taikyti filtrus šiems savo įrašasms ir/arba komentarams."
-
-msgid "Post content formatter:"
-msgstr "Įrašų turinio formatavimas:"
-
-msgid "Comment content formatter:"
-msgstr "Komentarų turinio formatavimas:"
-
-msgid "WordPress tables not found"
-msgstr "Nerastos Wordpress lentelės"
-
-msgid "No file to read."
-msgstr "Nėra skaitomo failo."
-
-msgid "File is not a DotClear backup."
-msgstr "Tai nėra Dotclear atsarginės kopijos failas."
-
-msgid "File is not a single blog export."
-msgstr "Tai nėra vieno blogo eksportuotas failas."
-
-msgid "File is not a full export."
-msgstr "Nepilnai eksportuotas failas."
-
-msgid "The backup file does not appear to be well formed."
-msgstr "Atsarginės kopijos failas yra blogai formatuotas,"
-
-msgid "Please wait..."
-msgstr "Prašome palaukti…"
-
-msgid "Import"
-msgstr "Importuoti"
-
-msgid "Maintenance"
-msgstr "Priežiūra"
-
-msgid "Optimization successful."
-msgstr "Sėkmingai optimizuota."
-
-msgid "Comments and trackback counted."
-msgstr "Komentarai ir trackback suskaičiuoti."
-
-msgid "Templates cache directory emptied."
-msgstr "Šablonų cache direktorija išvalyta."
-
-msgid "Logs deleted."
-msgstr "Registras ištrintas."
-
-#, php-format
-msgid "Indexing entry %d to %d."
-msgstr "Indeksuojami įrašai nuo %d iki %d"
-
-msgid "next"
-msgstr "kitas"
-
-msgid "Entries index done."
-msgstr "Įrašų indeksavimas baigtas."
-
-msgid "Back"
-msgstr "Atgal"
-
-#, php-format
-msgid "Indexing comment %d to %d."
-msgstr "Ineksuojami komentarai nuo %d iki %d."
-
-msgid "Comments index done."
-msgstr "Komentarų indeksavimas baigtas."
-
-msgid "Optimize database room"
-msgstr "Optimizuojama duomenų bazės talpa"
-
-msgid "Vacuum tables"
-msgstr "Vacuum lentelės"
-
-msgid "Counters"
-msgstr "Skaičiuoklės"
-
-msgid "Reset comments and ping counters"
-msgstr "Išvalyti komentarų ir ping skaitiklius"
-
-msgid "Search engine index"
-msgstr "Paieškos variklio indeksas"
-
-msgid "This may take a very long time"
-msgstr "gali ilgai užtrukti"
-
-msgid "Index all posts"
-msgstr "Indeksuoti visus įrašus"
-
-msgid "Index all comments"
-msgstr "Indeksuoti visus komentarus"
-
-msgid "Vacuum logs"
-msgstr "Vacuum registras"
-
-msgid "Delete all logs"
-msgstr "Trinti visus registrus"
-
-msgid "Empty templates cache directory"
-msgstr "Trinti šablonų cache direktoriją"
-
-msgid "Empty directory"
-msgstr "Trinti direktoriją"
-
-msgid "Pages"
-msgstr "Puslapiai"
-
-msgid "manage pages"
-msgstr "tvarkyti puslapius"
-
-msgid "Published on"
-msgstr "Publikuota"
-
-msgid "This page's comments feed"
-msgstr "Šio puslapio komentarų rss"
-
-msgid "You must provide a valid email address."
-msgstr "Turite įrašyti el. pašto adresą."
-
-msgid "Page title"
-msgstr "Puslapio antraštė"
-
-msgid "Page position"
-msgstr "Puslapio pozicija"
-
-msgid "Publication date"
-msgstr "Publikavimo data"
-
-msgid "No page"
-msgstr "Puslapio nėra"
-
-msgid "Are you sure you want to delete selected pages?"
-msgstr "Ar tikrai norite ištrinti pasirinktus puslapius?"
-
-msgid "New page"
-msgstr "Naujas puslapis"
-
-msgid "Selected pages action:"
-msgstr "Veiksmas pasirinktiems puslapiams:"
-
-msgid "This page does not exist."
-msgstr "Šis puslapis neegzistuoja."
-
-msgid "Edit page"
-msgstr "Redaguoti puslapį"
-
-msgid "next page"
-msgstr "kitas puslapis"
-
-msgid "previous page"
-msgstr "ankstesnis puslapis"
-
-msgid "Are you sure you want to delete this page?"
-msgstr "Ar tikrai norite ištrinti šį puslapį?"
-
-msgid "Page has been successfully updated."
-msgstr "Puslapis sėkmingai atnaujintas."
-
-msgid "Page has been successfully created."
-msgstr "Puslapis sėkmingai sukurtas"
-
-msgid "View page"
-msgstr "Žiūrėti puslapį"
-
-msgid "Preview page"
-msgstr "Peržiūrėti puslapį"
-
-msgid "Page status:"
-msgstr "Puslapio statusas:"
-
-msgid "Page position:"
-msgstr "Puslapio pozicija:"
-
-msgid "Page lang:"
-msgstr "Puslapio kalba:"
-
-msgid "Page password:"
-msgstr "Puslapio slaptažodis:"
-
-msgid "Warning: If you set the URL manually, it may conflict with another page."
-msgstr "Dėmesio: gali atsirasti konfliktas su kitu puslapiu, jei URL nustatysite rankiniu būdu."
-
-msgid "Add files to this page"
-msgstr "Pridėti failus prie šio puslapio"
-
-msgid "Pings"
-msgstr "Pingai"
-
-msgid "Pings configuration"
-msgstr "Pings nustatymai"
-
-msgid "Settings have been successfully updated."
-msgstr "Nustatymi sėkmingai atnaujinti."
-
-msgid "Activate pings extension"
-msgstr "Įjungti ping'ų išplėtimus"
-
-msgid "Service name:"
-msgstr "Serviso pavadinimas:"
-
-msgid "Service URI:"
-msgstr "Serviso URI:"
-
-msgid "error"
-msgstr "klaida"
-
-msgid "Test ping services"
-msgstr "Testuoti ping servisus"
-
-msgid "Check all"
-msgstr "Patikrinti visus"
-
-msgid "Pings:"
-msgstr "Ping'ai"
-
-msgid "Tags"
-msgstr "Žymos"
-
-msgid "Tags:"
-msgstr "Žymos:"
-
-#, php-format
-msgid "Are you sure you want to remove this %s?"
-msgstr "Ar tikrai norite pašalinti šį %s?"
-
-#, php-format
-msgid "Add a %s to this entry"
-msgstr "Pridėti %s? prie šio įrašo"
-
-msgid "Choose from list"
-msgstr "Pasirinkite iš sąrašo"
-
-msgid "all"
-msgstr "visi"
-
-msgid "Tag"
-msgstr "Žyma"
-
-msgid "used in %e - frequency %p%"
-msgstr "naudojama %e - dažnumas %p%"
-
-msgid "entry"
-msgstr "įrašas"
-
-msgid "entries"
-msgstr "įrašai"
-
-msgid "Enter tags separated by coma"
-msgstr "Įveslite žymas atskirtas kableliais"
-
-msgid "Add tags"
-msgstr "Pridėti žymėjimą"
-
-msgid "Remove tags"
-msgstr "Naikinti žymėjimą"
-
-msgid "Add tags to entries"
-msgstr "Pridėti žymas prie įrašų"
-
-msgid "Tags to add:"
-msgstr "Pridedamos žymos:"
-
-msgid "Remove selected tags from entries"
-msgstr "Pašalinti pasirinktas žymas nuo įrašų"
-
-msgid "No tags for selected entries"
-msgstr "Pasirinktiems įrašams žymų nėra"
-
-msgid "Following tags have been found in selected entries:"
-msgstr "Pasirinktuose įrašuose rastos tokios žymos:"
-
-msgid "short"
-msgstr "trumpas"
-
-msgid "extended"
-msgstr "išplėstas"
-
-msgid "Tags list format:"
-msgstr "Žymų sąrašo formatas:"
-
-msgid "This tag's comments Atom feed"
-msgstr "Šią žymą turinčių komentarų Atom feed"
-
-msgid "This tag's entries Atom feed"
-msgstr "Šią žymą turinčių įrašų Atom feed"
-
-msgid "Limit (empty means no limit):"
-msgstr "Riboti (jei tuščia - apribojimo nėra)"
-
-msgid "Entries count"
-msgstr "Įrašų skaičius"
-
-msgid "Tag name"
-msgstr "Žymos pavadinimas"
-
-msgid "All tags"
-msgstr "Visos žymos"
-
-msgid "Link to all tags:"
-msgstr "Nuoroda į visas žymas:"
-
-msgid "Edit tag"
-msgstr "Redaguoti žymą"
-
-msgid "Tag has been successfully renamed"
-msgstr "Žyma sėkmingai pervadinta"
-
-msgid "Back to tags list"
-msgstr "Atgal į žymų sąrašą"
-
-msgid "Rename this tag:"
-msgstr "Pervadinti šią žymą:"
-
-msgid "Delete this tag"
-msgstr "Trinti šią žymą"
-
-msgid "Tag has been successfully removed"
-msgstr "Žyma sėkmingai pašalinta"
-
-msgid "No tags on this blog."
-msgstr "Šiame bloge nėra žymų"
-
-msgid "Theme Editor"
-msgstr "Temų redaktorius"
-
-msgid "No file"
-msgstr "Failo nėra"
-
-msgid "File does not exist."
-msgstr "Failas neegzistuoja"
-
-#, php-format
-msgid "File %s is not readable"
-msgstr "Failas %s yra neperskaitomas"
-
-#, php-format
-msgid "Unable to write file %s. Please check your theme files and folders permissions."
-msgstr "Nepavyksta įrašyti %s failo. Patikrinkite savo temų failus ir byloms suteiktas teises."
-
-msgid "Saving document..."
-msgstr "Saugomas dokumentas..."
-
-msgid "Document saved"
-msgstr "Dokumentas išsaugotas"
-
-msgid "An error occurred:"
-msgstr "Įvyko klaida:"
-
-#, php-format
-msgid "Your current theme on this blog is \"%s\"."
-msgstr "Dabartinė jūsų blogo tema yra \"%s\"."
-
-msgid "You can't edit default theme."
-msgstr "Tipinės temos redaguoti negalima."
-
-msgid "Please select a file to edit."
-msgstr "Pasirinkite failą redagavimui."
-
-msgid "File editor"
-msgstr "Failų redagavimas"
-
-#, php-format
-msgid "Editing file %s"
-msgstr "Redaguojamas failas %s"
-
-msgid "This file is not writable. Please check your theme files permissions."
-msgstr "Negalima įrašyti į failą. Patikrinkite temų failams suteiktas teises."
-
-msgid "Templates files"
-msgstr "Šablonų failai"
-
-msgid "CSS files"
-msgstr "CSS failai"
-
-msgid "JavaScript files"
-msgstr "JavaScript failai"
-
-msgid "Presentation widgets"
-msgstr "Vaizdavimo valdikliai"
-
-msgid "Search engine"
-msgstr "Paie.kos variklis"
-
-msgid "Navigation links"
-msgstr "Navigacijos nuorodos"
-
-msgid "Selected entries"
-msgstr "Pasirinkti įrašai"
-
-msgid "Best of me"
-msgstr "Mano geriausia"
-
-msgid "Blog languages"
-msgstr "Blogo kalbos"
-
-msgid "With entries counts"
-msgstr "Su įrašų skaičiumi"
-
-msgid "Subscribe links"
-msgstr "Sekti nuorodas"
-
-msgid "Subscribe"
-msgstr "Sekti naujienas"
-
-msgid "Feeds type:"
-msgstr "Rss tipai:"
-
-msgid "Feed reader"
-msgstr "Rss skaityklė"
-
-msgid "Somewhere else"
-msgstr "Kitur"
-
-msgid "Entries limit:"
-msgstr "Įrašų limitas:"
-
-msgid "Text"
-msgstr "Tekstas"
-
-msgid "Text:"
-msgstr "Tekstas:"
-
-msgid "Last entries"
-msgstr "Paskutiniai įrašai"
-
-msgid "Uncategorized"
-msgstr "Nerūšiuota"
-
-msgid "Tag:"
-msgstr "Žyma:"
-
-msgid "Last comments"
-msgstr "Paskutiniai komentarai"
-
-msgid "Comments limit:"
-msgstr "Komentarų limitas:"
-
-msgid "Home"
-msgstr "Pagrindinis"
-
-msgid "Archives"
-msgstr "Archyvas"
-
-#, php-format
-msgid "This blog's entries %s feed"
-msgstr "Šio blogo įrašų %s rss"
-
-#, php-format
-msgid "This blog's comments %s feed"
-msgstr "Šio blogo komentarų %s rss"
-
-msgid "Entries feed"
-msgstr "Įrašų rss"
-
-msgid "Comments feed"
-msgstr "Komentarų rss"
-
-msgid "navigation"
-msgstr "navigacija"
-
-msgid "extra"
-msgstr "ekstra"
-
-msgid "Widgets"
-msgstr "Valdikliai"
-
-msgid "Are you sure you want to reset sidebars?"
-msgstr "Ar tikrai norite išvalyti šonines juostas?"
-
-msgid "Available widgets"
-msgstr "Galimi valdikliai"
-
-msgid "Append to:"
-msgstr "Pritaikyti:"
-
-msgid "add widgets to sidebars"
-msgstr "pridėti valdiklius prie šoninių juostų"
-
-msgid "Navigation sidebar"
-msgstr "Navigacinė soninė juosta"
-
-msgid "Extra sidebar"
-msgstr "Papildoma šoninė juosta"
-
-msgid "update sidebars"
-msgstr "atnaujinti šonines juostas"
-
-msgid "reset sidebars"
-msgstr "nutrinti šonines juostas"
-
-msgid "Widget templates tags"
-msgstr "Valdiklių šablonų žymės"
-
-msgid "If you are allowed to edit your theme templates, you can directly add widgets as templates tags, with their own configuration."
-msgstr "Jei jums leidžiama redaguoti savo temos šablonus, valdiklius galite pridėti tiesiogiai kaip šablonų žymas su savais nustatymais."
-
-msgid "To add a widget in your template, you need to write code like this:"
-msgstr "Norėdami pridėti valdiklį į savo šabloną, turite šitaip rašyti kodą:"
-
-msgid "Widget ID"
-msgstr "Valdiklio ID"
-
-msgid "Setting name"
-msgstr "Nustatymo pavadinimas"
-
-msgid "Setting value"
-msgstr "Nustatymo reikšmė"
-
-msgid "Here are the following available widgets for your blog:"
-msgstr "Šiuos valdiklius galite naudoti savo bloge:"
-
-msgid "Widget ID:"
-msgstr "Valdiklio ID:"
-
-msgid "No setting for this widget"
-msgstr "Nėra valdiklio nustatymų"
-
-msgid "Setting name:"
-msgstr "Nustatymo pavadiminas:"
-
-msgid "No widget."
-msgstr "Valdiklio nėra."
-
-msgid "order"
-msgstr "rūšiavimas"
-
-msgid "Remove widget"
-msgstr "Pašalinti valdiklį"
-
-#~ msgid "External media"
-#~ msgstr "Externes Medium"
-
-#~ msgid "External media selector"
-#~ msgstr "Externe Medienauswahl"
-
-#~ msgid "Supported media services"
-#~ msgstr "Unterstützte Medienservices"
-
-#~ msgid "Please enter the URL of the page containing the video you want to include in your post."
-#~ msgstr "Bitte gebe einen URL der Seite ein von der Du das Video einfügen willst."
-
-#~ msgid "Page URL:"
-#~ msgstr "URL der Seite:"
-
-#~ msgid "Media alignment"
-#~ msgstr "Ausrichtung des Mediums"
-
-#~ msgid "Media title"
-#~ msgstr "Titel des Mediums"
-
-#~ msgid "Unsupported service"
-#~ msgstr "Nicht unterstützter Service"
-
-#~ msgid "Invalid page URL"
-#~ msgstr "Falscher URL der Seite"
Index: ocales/lt/public.po
===================================================================
--- locales/lt/public.po	(revision 813)
+++ 	(revision )
@@ -1,244 +1,0 @@
-# German translation of DotClear
-# Copyright (C) 2008.
-# Andreas Diller <nendilo@gmail.com>, 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: Dotclear 2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 05:22+0200\n"
-"PO-Revision-Date: 2012-04-18 20:53+0100\n"
-"Last-Translator: Paulius Černakauskas <paulius.cernakauskas@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Lithuanian\n"
-"X-Poedit-Country: LITHUANIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-# Not found strings
-msgid "To content"
-msgstr "Į turinį"
-
-msgid "To menu"
-msgstr "Į meniu"
-
-msgid "To search"
-msgstr "Į paiešką"
-
-msgid "By"
-msgstr "Įrašė"
-
-msgid "by"
-msgstr "įrašė"
-
-msgid "on"
-msgstr ", "
-
-msgid "On"
-msgstr ", "
-
-msgid "Continue reading"
-msgstr "Skaityti toliau"
-
-msgid "no comment"
-msgstr "komentarų nėra"
-
-msgid "one comment"
-msgstr "vienas komentaras"
-
-msgid "%d comments"
-msgstr "%d komentarai"
-
-msgid "no trackback"
-msgstr "trackback nėra"
-
-msgid "one trackback"
-msgstr "vienas trackback"
-
-msgid "%d trackbacks"
-msgstr "%d trackback"
-
-msgid "no attachment"
-msgstr "prisegimų nėra"
-
-msgid "one attachment"
-msgstr "vienas prisegimas"
-
-msgid "%d attachments"
-msgstr "%d prisegimai"
-
-msgid "previous entries"
-msgstr "ankstesni įrašai"
-
-msgid "page"
-msgstr "puslapis"
-
-msgid "of"
-msgstr "iš"
-
-msgid "next entries"
-msgstr "sekantys įrašai"
-
-msgid "Search"
-msgstr "Paieška"
-
-msgid "Your search for <em>%1$s</em> returned no result."
-msgstr "Jūsų <em>%1$s</em> paieška nieko nerado."
-
-msgid "Your search for <em>%1$s</em> returned <strong>%2$s</strong> result."
-msgstr "Jūsų <em>%1$s</em> paieška atitiko <strong>%2$s</strong> įrašą."
-
-msgid "Your search for <em>%1$s</em> returned <strong>%2$s</strong> results."
-msgstr "Jūsų <em>%1$s</em> paieška atitiko <strong>%2$s</strong> įrašus."
-
-msgid "Home"
-msgstr "Pradžia"
-
-msgid "All keywords"
-msgstr "Visi raktažodžiai"
-
-msgid "Best of me"
-msgstr "Mano geriausia"
-
-msgid "Languages"
-msgstr "Kalbos"
-
-msgid "Categories"
-msgstr "Kategorijos"
-
-msgid "Subcategories"
-msgstr "Subkategorijos"
-
-msgid "Archives"
-msgstr "Archyvai"
-
-msgid "Links"
-msgstr "Nuorodos"
-
-msgid "Subscribe"
-msgstr "Prenumeruoti"
-
-msgid "Entries feed"
-msgstr "Įrašų rss feed"
-
-msgid "Comments feed"
-msgstr "Komentarų rss feed"
-
-msgid "This blog's comments Atom feed"
-msgstr "Šio blogo komentarų Atom feed"
-
-msgid "This category's entries Atom feed"
-msgstr "Šios kategorijos įrašų Atom feed"
-
-msgid "This category's comments Atom feed"
-msgstr "Šios kategorijos komentarų Atom feed"
-
-msgid "This post's comments feed"
-msgstr "Šios įrašo komentarų rss feed"
-
-msgid "This post's comments Atom feed"
-msgstr "Šios įrašo komentarų Atom feed"
-
-msgid "Attachments"
-msgstr "Prisegimai"
-
-msgid "Permalink"
-msgstr "nuoroda"
-
-msgid "Comments"
-msgstr "Komentarai"
-
-msgid "Your comment"
-msgstr "Jūsų komentaras"
-
-msgid "Your comment has been published."
-msgstr "Jūsų komentaras paskelbtas."
-
-msgid "Your comment has been submitted and will be reviewed for publication."
-msgstr "Jūsų komentaras priimtas ir bus peržiūrėtas prieš skelbiant."
-
-msgid "Add a comment"
-msgstr "Pridėti komentarą"
-
-msgid "Name or nickname"
-msgstr "Vardas ar slapyvardis"
-
-msgid "Email address"
-msgstr "El. pašto adresas"
-
-msgid "Website"
-msgstr "Tinklapis"
-
-msgid "optional"
-msgstr "pasirinktinai"
-
-msgid "Comment"
-msgstr "Komentaras"
-
-msgid "Comments can be formatted using a simple wiki syntax."
-msgstr ""
-
-msgid "HTML code is displayed as text and web addresses are automatically converted."
-msgstr "HTML kodas yra rodomas kaip tekstas ir internetiniai adresai yra automatiškai konvertuojami."
-
-msgid "Remember me on this blog"
-msgstr "Prisiminti mane šiame bloge"
-
-msgid "preview"
-msgstr "peržiūrėti"
-
-msgid "send"
-msgstr "siųsti"
-
-msgid "They posted on the same topic"
-msgstr "Jie parašė ta pačia tema"
-
-msgid "Trackback URL"
-msgstr "Trackback URL"
-
-msgid "You must provide an author name"
-msgstr "Turite nurodyti autoriaus vardą"
-
-msgid "You must provide a comment"
-msgstr "Turite parašyti komentarą"
-
-msgid "Email address is not valid"
-msgstr "El. pašto adresas netinkamas"
-
-msgid "Document not found"
-msgstr "Dokumentas nerastas"
-
-msgid "The document you are looking for does not exist."
-msgstr "Dokumentas kurio ieškote neegzistuoja"
-
-msgid "Powered by %s"
-msgstr "bogą gamina %s"
-
-msgid "Subscribe to"
-msgstr "Prenumeruoti"
-
-msgid "What is an RSS feed?"
-msgstr "Kas yra RSS feed?"
-
-msgid "RSS feed is a free blog summary. It provides content (either posts or comments) or summaries of content, together with links to the full versions, and other metadata. The last published items may then be read by your favorite RSS <a href=\"http://en.wikipedia.org/wiki/Aggregator\">aggregator</a>."
-msgstr "RSS yra nemokama interneto naujienų suvestinė. RSS pateikiamos naujienos ar naujienų komentarai, kartu su nuorodomis į pilną turinį ir kita. Tokiu būdu naujausius publikuotus įrašus tuomet galite perskaityti savo pasirinkta <a href=\"http://en.wikipedia.org/wiki/Aggregator\">priemone</a>."
-
-msgid "Simply copy the following URL into your aggregator:"
-msgstr "Paprasčiausiai nukopijuokite URL nuorodą į savo RSS programą."
-
-msgid "Password needed"
-msgstr "Reikalingas slaptažodis"
-
-msgid "You must give a password to access this area."
-msgstr "Norėdami čia apsilankyti turite nurodyti slaptažodį."
-
-msgid "Password:"
-msgstr "Slaptažodis:"
-
-msgid "You must provide a valid email address."
-msgstr "Turite nurodyti teisingą el. pašto adresą."
-
-msgid "Read"
-msgstr "Skaityti"
-
Index: locales/nl/public.po
===================================================================
--- locales/nl/public.po	(revision 820)
+++ locales/nl/public.po	(revision 221)
@@ -29,5 +29,5 @@
 
 msgid "By"
-msgstr "Door"
+msgstr "Doord"
 
 msgid "by"
Index: locales/po_update.sh
===================================================================
--- locales/po_update.sh	(revision 959)
+++ locales/po_update.sh	(revision 750)
@@ -172,5 +172,5 @@
 	find $PO_MODULE -name '*.html' -exec grep -o '{{tpl:lang [^}]*}}' {} \; | sed 's/{{tpl:lang \(.*\)}}$/__\("\1")/' | sort -u \
 		>> $PO_MODULE/__html_tpl_dummy.php
-	sed -i "" 's/\$/\\\$/g' $PO_MODULE/__html_tpl_dummy.php 
+	sed -i 's/\$/\\\$/g' $PO_MODULE/__html_tpl_dummy.php 
 	
 	find $PO_MODULE -name '*.php' -print | \
Index: locales/ro/date.po
===================================================================
--- locales/ro/date.po	(revision 834)
+++ locales/ro/date.po	(revision 221)
@@ -1,136 +1,134 @@
-# Romanian translation for dotclear
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the dotclear package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dotclear\n"
+"Project-Id-Version: Dotclear 2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-04-15 16:27+0200\n"
-"PO-Revision-Date: 2011-09-02 22:03+0000\n"
-"Last-Translator: transla73436 <Unknown>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"Language: ro\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-27 15:39+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
 
 msgid "%Y-%m-%d %H:%M"
-msgstr "%Y-%m-%d %H:%M"
+msgstr ""
 
 msgid "_Jan"
-msgstr "_Ian"
+msgstr ""
 
 msgid "_Feb"
-msgstr "_Feb"
+msgstr ""
 
 msgid "_Mar"
-msgstr "_Mar"
+msgstr ""
 
 msgid "_Apr"
-msgstr "_Apr"
+msgstr ""
 
 msgid "_May"
-msgstr "_Mai"
+msgstr ""
 
 msgid "_Jun"
-msgstr "_Iun"
+msgstr ""
 
 msgid "_Jul"
-msgstr "_Iul"
+msgstr ""
 
 msgid "_Aug"
-msgstr "_Aug"
+msgstr ""
 
 msgid "_Sep"
-msgstr "_Sep"
+msgstr ""
 
 msgid "_Oct"
-msgstr "_Oct"
+msgstr ""
 
 msgid "_Nov"
-msgstr "_Noi"
+msgstr ""
 
 msgid "_Dec"
-msgstr "_Dec"
+msgstr ""
 
 msgid "January"
-msgstr "Ianuarie"
+msgstr ""
 
 msgid "February"
-msgstr "Februarie"
+msgstr ""
 
 msgid "March"
-msgstr "Martie"
+msgstr ""
 
 msgid "April"
-msgstr "Aprilie"
+msgstr ""
 
 msgid "May"
-msgstr "Mai"
+msgstr ""
 
 msgid "June"
-msgstr "Iunie"
+msgstr ""
 
 msgid "July"
-msgstr "Iulie"
+msgstr ""
 
 msgid "August"
-msgstr "August"
+msgstr ""
 
 msgid "September"
-msgstr "Septembrie"
+msgstr ""
 
 msgid "October"
-msgstr "Octombrie"
+msgstr ""
 
 msgid "November"
-msgstr "Noiembrie"
+msgstr ""
 
 msgid "December"
-msgstr "Decembrie"
+msgstr ""
 
 msgid "_Mon"
-msgstr "_Lun"
+msgstr ""
 
 msgid "_Tue"
-msgstr "_Mar"
+msgstr ""
 
 msgid "_Wed"
-msgstr "_Mie"
+msgstr ""
 
 msgid "_Thu"
-msgstr "_Joi"
+msgstr ""
 
 msgid "_Fri"
-msgstr "_Vin"
+msgstr ""
 
 msgid "_Sat"
-msgstr "_Sâm"
+msgstr ""
 
 msgid "_Sun"
-msgstr "_Dum"
+msgstr ""
 
 msgid "Monday"
-msgstr "Luni"
+msgstr ""
 
 msgid "Tuesday"
-msgstr "Marţi"
+msgstr ""
 
 msgid "Wednesday"
-msgstr "Miercuri"
+msgstr ""
 
 msgid "Thursday"
-msgstr "Joi"
+msgstr ""
 
 msgid "Friday"
-msgstr "Vineri"
+msgstr ""
 
 msgid "Saturday"
-msgstr "Sâmbătă"
+msgstr ""
 
 msgid "Sunday"
-msgstr "Duminică"
+msgstr ""
Index: locales/ro/main.po
===================================================================
--- locales/ro/main.po	(revision 835)
+++ locales/ro/main.po	(revision 759)
@@ -1,21 +1,19 @@
-# Romanian translation for dotclear
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the dotclear package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dotclear\n"
+"Project-Id-Version: Dotclear 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-28 07:53+0200\n"
-"PO-Revision-Date: 2012-05-27 11:38+0000\n"
+"POT-Creation-Date: 2011-11-06 18:09+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"Language: ro\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-27 15:39+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
 
 msgid "Dotclear has been upgraded."
@@ -1779,7 +1777,4 @@
 msgstr ""
 
-msgid "Hide My favorites menu"
-msgstr ""
-
 msgid "Iconset:"
 msgstr ""
@@ -2040,10 +2035,4 @@
 msgstr ""
 
-msgid "Go to the content"
-msgstr ""
-
-msgid "Go to the menu"
-msgstr ""
-
 msgid "Go to site"
 msgstr ""
@@ -2405,7 +2394,4 @@
 msgstr ""
 
-msgid "You are not allowed to reset categories order"
-msgstr ""
-
 msgid "Category URL must be unique."
 msgstr ""
Index: locales/ro/plugins.po
===================================================================
--- locales/ro/plugins.po	(revision 835)
+++ locales/ro/plugins.po	(revision 759)
@@ -1,24 +1,22 @@
-# Romanian translation for dotclear
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the dotclear package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dotclear\n"
+"Project-Id-Version: Dotclear 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-28 07:53+0200\n"
-"PO-Revision-Date: 2011-09-03 00:21+0000\n"
-"Last-Translator: transla73436 <Unknown>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"Language: ro\n"
+"POT-Creation-Date: 2011-11-06 18:09+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-27 15:39+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
 
 msgid "no"
-msgstr "nu"
+msgstr ""
 
 msgid "yes"
@@ -26,17 +24,17 @@
 
 msgid "Configuration successfully updated"
-msgstr "Configurație actualizată cu succes"
+msgstr ""
 
 msgid "Settings definition successfully updated"
-msgstr "Definiția setărilor a fost actualizată cu succes"
+msgstr ""
 
 msgid "blog settings"
-msgstr "setări blog"
+msgstr ""
 
 msgid "Value"
-msgstr "Valoare"
+msgstr ""
 
 msgid "Description"
-msgstr "Descriere"
+msgstr ""
 
 msgid "Goto:"
@@ -47,110 +45,108 @@
 
 msgid "global settings"
-msgstr "setări globale"
+msgstr ""
 
 msgid "Akismet spam filter"
-msgstr "Filtru de spam Akismet"
+msgstr ""
 
 #, php-format
 msgid "Filtered by %s."
-msgstr "Filtrat de %s."
+msgstr ""
 
 msgid "Akismet API key:"
-msgstr "Cheie API de Akismet"
+msgstr ""
 
 msgid "API key verified"
-msgstr "Cheie API verificată"
+msgstr ""
 
 msgid "API key not verified"
-msgstr "Cheia API nu a fost verificată"
+msgstr ""
 
 msgid "Get your own API key"
-msgstr "Obțineți-vă propia cheie API"
+msgstr ""
 
 msgid "Antispam"
-msgstr "Antispam"
+msgstr ""
 
 msgid "Delete junk comments older than"
-msgstr "Șterge comentariile din folderul junk mai vechi de"
+msgstr ""
 
 msgid "days"
-msgstr "zile"
+msgstr ""
 
 msgid "IP Blacklist / Whitelist Filter"
-msgstr "IP Blacklist / Filtru Whitelist"
+msgstr ""
 
 #, php-format
 msgid "Filtered by %1$s with rule %2$s."
-msgstr "Filtrat de %1$s cu regula %2$s."
+msgstr ""
 
 msgid "IP address has been successfully added."
-msgstr "Adresa IP a fost adăugată cu succes."
+msgstr ""
 
 msgid "IP addresses have been successfully removed."
-msgstr "Adresele IP au fost șterse cu succes."
+msgstr ""
 
 msgid "Blacklist"
-msgstr "Lista neagră"
+msgstr ""
 
 msgid "Whitelist"
-msgstr "Listă excepții"
-
-#, fuzzy
+msgstr ""
+
 msgid "Add an IP address: "
-msgstr "Adaugă o adresă IP"
+msgstr ""
 
 msgid "Global IP"
-msgstr "IP global"
+msgstr ""
 
 msgid "Add"
-msgstr "Inserare"
+msgstr ""
 
 msgid "No IP address in list."
-msgstr "Nicio adresă IP în listă"
+msgstr ""
 
 msgid "IP list"
-msgstr "Lista cu IP"
+msgstr ""
 
 msgid "Checks sender IP address against DNSBL servers"
-msgstr "Verifică adresa IP a utilizatorului cu serverele DNSB"
+msgstr ""
 
 #, php-format
 msgid "Filtered by %1$s with server %2$s."
-msgstr "Filtrat de %1$s cu serverul %2$s."
+msgstr ""
 
 msgid "IP Lookup servers"
-msgstr "Servere de căutare IP"
+msgstr ""
 
 msgid "Add here a coma separated list of servers."
-msgstr "Adaugă aici o listă de servere separate prin virgulă"
+msgstr ""
 
 msgid "Checks links in comments against surbl.org"
-msgstr "Verifică legăturile în comentarii cu surbl.org"
+msgstr ""
 
 msgid "Words Blacklist"
-msgstr "Listă de cuvinte interzise"
+msgstr ""
 
 #, php-format
 msgid "Filtered by %1$s with word %2$s."
-msgstr "Filtrat de %1$s prin cuvântul %2$s."
+msgstr ""
 
 msgid "Words have been successfully added."
-msgstr "Cuvintele au fost adăugate cu succes."
+msgstr ""
 
 msgid "Word has been successfully added."
-msgstr "Cuvântul a fost adăugat cu succes."
+msgstr ""
 
 msgid "Words have been successfully removed."
-msgstr "Cuvintele au fost retrase cu succes."
-
-#, fuzzy
+msgstr ""
+
 msgid "Add a word "
-msgstr "Adaugă un cuvânt"
+msgstr ""
 
 msgid "Global word"
-msgstr "Cuvânt global"
+msgstr ""
 
 msgid "No word in list."
-msgstr "Niciun cuvânt în listă."
+msgstr ""
 
 msgid "List of bad words"
@@ -158,70 +154,70 @@
 
 msgid "Delete selected words"
-msgstr "Șterge cuvintele selectate"
+msgstr ""
 
 msgid "Create default wordlist"
-msgstr "Verifică lista implicită de cuvinte"
+msgstr ""
 
 msgid "This word exists"
-msgstr "Acest cuvânt (deja) există"
+msgstr ""
 
 msgid "No description"
-msgstr "Fără descriere"
+msgstr ""
 
 #, php-format
 msgid "Filtered by %1$s (%2$s)"
-msgstr "Filtrat de %1$s (%2$s)"
+msgstr ""
 
 msgid "Unknown filter."
-msgstr "Filtru necunoscut"
+msgstr ""
 
 msgid "This comment is a spam:"
-msgstr "Acest comentariu este spam:"
+msgstr ""
 
 #, php-format
 msgid "(including %d spam comment)"
-msgstr "(incluzând %d comentariu spam)"
+msgstr ""
 
 #, php-format
 msgid "(including %d spam comments)"
-msgstr "(incluzând %d comentarii spam)"
+msgstr ""
 
 msgid "Spam moderation"
-msgstr "Moderare spam"
+msgstr ""
 
 msgid "Spam"
-msgstr "Spam"
+msgstr ""
 
 msgid "Ham"
-msgstr "Ham"
+msgstr ""
 
 msgid "Filter does not exist."
-msgstr "Filtru nu există"
+msgstr ""
 
 msgid "Filter has no user interface."
-msgstr "Filtru nu are interfață de utilizator."
+msgstr ""
 
 #, php-format
 msgid "%s configuration"
-msgstr "configuratia %s"
+msgstr ""
 
 msgid "Information"
-msgstr "Informații"
+msgstr ""
 
 msgid "Spam comments have been successfully deleted."
-msgstr "Comentariile spam au fost șterse."
+msgstr ""
 
 msgid "Junk comments:"
-msgstr "Comentarii junk:"
+msgstr ""
 
 msgid "Published comments:"
-msgstr "Comentarii publicate:"
+msgstr ""
 
 msgid "Delete all spams"
-msgstr "Șterge tot spam-ul"
+msgstr ""
 
 #, php-format
 msgid "All spam comments older than %s day(s) will be automatically deleted."
-msgstr "Toate comentariile spam mai vechi de %s zile vor fi șterse automat."
+msgstr ""
 
 msgid "You can modify this duration in "
@@ -232,36 +228,35 @@
 
 msgid "Filters configuration has been successfully saved."
-msgstr "Configurația filtrelor a fost salvată."
+msgstr ""
 
 msgid "Available spam filters"
-msgstr "Filtre de spam disponibile."
+msgstr ""
 
 msgid "Order"
-msgstr "Comandă"
+msgstr ""
 
 msgid "Active"
-msgstr "Activ"
+msgstr ""
 
 msgid "Auto Del."
-msgstr "Ștergere auto."
+msgstr ""
 
 msgid "Filter name"
-msgstr "Nume filtru"
+msgstr ""
 
 msgid "Filter configuration"
-msgstr "Configurare filtru"
-
-#, fuzzy
+msgstr ""
+
 msgid "position"
-msgstr "Poziția barei laterale:"
+msgstr ""
 
 msgid "Syndication"
-msgstr "Abonare distribuită (syndication)"
+msgstr ""
 
 msgid "Junk comments RSS feed"
-msgstr "Abonare RSS de comentarii junk"
+msgstr ""
 
 msgid "Published comments RSS feed"
-msgstr "Abonare RSS de comentarii publicate"
+msgstr ""
 
 msgid "Attachments"
@@ -278,53 +273,53 @@
 
 msgid "Blogroll"
-msgstr "Blogroll"
+msgstr ""
 
 msgid "manage blogroll"
-msgstr "administrare blogroll"
+msgstr ""
 
 msgid "Links"
-msgstr "Legături"
+msgstr ""
 
 msgid "All categories"
-msgstr "Toate categoriile"
+msgstr ""
 
 msgid "Home page only"
-msgstr "Doar pagina de start"
+msgstr ""
 
 msgid "You must provide a link title"
-msgstr "Trebuie să inserezi un titlu al legăturii"
+msgstr ""
 
 msgid "You must provide a link URL"
-msgstr "Trebuie să inserezi o legătură web"
+msgstr ""
 
 msgid "You need to provide a XBEL or OPML file."
-msgstr "Trebuie să furnizezi un fișier XBEL sau OPML."
+msgstr ""
 
 msgid "File is not in XML format."
-msgstr "Fișierul nu este XML."
+msgstr ""
 
 msgid "No such link or title"
-msgstr "Nu există legătura/titlul"
+msgstr ""
 
 msgid "Return to blogroll"
-msgstr "Înapoi la blogroll"
+msgstr ""
 
 msgid "Category has been successfully updated"
-msgstr "Categoria a fost actualizată cu succes"
+msgstr ""
 
 msgid "Edit category"
-msgstr "Editează categoria"
+msgstr ""
 
 msgid "Link has been successfully updated"
-msgstr "Legătura a fost actualizată cu succes"
+msgstr ""
 
 msgid "Edit link"
-msgstr "Modifică legătura"
+msgstr ""
 
 msgid "XFN"
-msgstr "XFN"
+msgstr ""
 
 msgid "_xfn_Me"
-msgstr "_xfn_Me"
+msgstr ""
 
 msgid "_xfn_Another link for myself"
@@ -401,29 +396,29 @@
 
 msgid "Nothing to import"
-msgstr "Nimic a se importa"
+msgstr ""
 
 msgid "Import operation cancelled."
-msgstr "Execuția de import a fost anulată."
+msgstr ""
 
 msgid "Items order has been successfully updated"
-msgstr "Lista de elements a fost actualizată"
+msgstr ""
 
 msgid "Items have been successfully removed."
-msgstr "Elementele au fost eliminate"
+msgstr ""
 
 msgid "Link has been successfully created."
-msgstr "Legătura a fost creată."
+msgstr ""
 
 msgid "category has been successfully created."
-msgstr "categoria a fost creată."
+msgstr ""
 
 msgid "links have been successfully imported."
-msgstr "legături au fost importate."
+msgstr ""
 
 msgid "URL"
-msgstr "URL"
+msgstr ""
 
 msgid "Lang"
-msgstr "Limbă"
+msgstr ""
 
 msgid "select this link"
@@ -431,9 +426,8 @@
 
 msgid "Delete selected links"
-msgstr "Șterge legăturile selectate"
-
-#, fuzzy
+msgstr ""
+
 msgid "Are you sure you want to delete selected links?"
-msgstr "Sigur dorești a șterge legăturile selectate?"
+msgstr ""
 
 msgid "The link list is empty."
@@ -441,14 +435,14 @@
 
 msgid "Add a new link"
-msgstr "Adaugă o nouă legătură"
+msgstr ""
 
 msgid "Add a category"
-msgstr "Adaugă o categorie"
+msgstr ""
 
 msgid "Import links"
-msgstr "Importă legături"
+msgstr ""
 
 msgid "OPML or XBEL File:"
-msgstr "Fișier OPML sau XBEL:"
+msgstr ""
 
 msgid "Import"
@@ -456,65 +450,62 @@
 
 msgid "Light linear gradient"
-msgstr "Gradient linear deschis"
+msgstr ""
 
 msgid "Medium linear gradient"
-msgstr "Gradient linear mediu"
+msgstr ""
 
 msgid "Dark linear gradient"
-msgstr "Gradient linear închis"
+msgstr ""
 
 msgid "Solid color"
-msgstr "Culoare solidă"
+msgstr ""
 
 msgid "Custom..."
-msgstr "Personalizat..."
+msgstr ""
 
 msgid "Blowup configuration"
-msgstr "Aruncă configurația"
+msgstr ""
 
 msgid "Predefined styles"
-msgstr "Stil predefinit"
+msgstr ""
 
 msgid "Apply code"
-msgstr "Aplică cod"
-
-#, fuzzy
+msgstr ""
+
 msgid "Choose a predefined style"
-msgstr "Stil predefinit"
-
-#, fuzzy
+msgstr ""
+
 msgid "For the following reasons, images cannot be created. You won't be able to change some background properties."
-msgstr "Cum imaginile nu pot fi create, nu vei putea fi capabil a schimba anume propietăți de fundal."
-
-#, fuzzy
+msgstr ""
+
 msgid "Theme configuration has been successfully updated."
-msgstr "Configurația șablonului a fost actualizată."
+msgstr ""
 
 msgid "General"
-msgstr "General"
+msgstr ""
 
 msgid "Background color:"
-msgstr "Culoare de fundal:"
+msgstr ""
 
 msgid "Background color fill:"
-msgstr "Culoarea de umplere fundal:"
+msgstr ""
 
 msgid "Main text font:"
-msgstr "Fontul principal de text:"
+msgstr ""
 
 msgid "Main text font size:"
-msgstr "Mărimea de text principală:"
+msgstr ""
 
 msgid "Main text color:"
-msgstr "Culoarea de text principală:"
+msgstr ""
 
 msgid "Text line height:"
-msgstr "Înălțimea liniei de text:"
+msgstr ""
 
 msgid "Links color:"
-msgstr "Culoarea legăturilor:"
+msgstr ""
 
 msgid "Visited links color:"
-msgstr "Culoarea legăturilor vizitate:"
+msgstr ""
 
 msgid "Focus links color:"
@@ -522,5 +513,5 @@
 
 msgid "Page top"
-msgstr "Începutul paginii"
+msgstr ""
 
 msgid "Prelude color:"
@@ -528,51 +519,51 @@
 
 msgid "Hide main title"
-msgstr "Ascunde titlul principal"
+msgstr ""
 
 msgid "Main title font:"
-msgstr "Fontul principal de titlu:"
+msgstr ""
 
 msgid "Main title font size:"
-msgstr "Mărimea de titlu principală:"
+msgstr ""
 
 msgid "Main title color:"
-msgstr "Culoarea principală de titlu:"
+msgstr ""
 
 msgid "Main title alignment:"
-msgstr "Aranjamentul în pagină de titlu:"
+msgstr ""
 
 msgid "center"
-msgstr "centru"
+msgstr ""
 
 msgid "left"
-msgstr "la stânga"
+msgstr ""
 
 msgid "right"
-msgstr "la dreapta"
+msgstr ""
 
 msgid "Main title position (x:y)"
-msgstr "Poziția principală de titlu (x:y)"
+msgstr ""
 
 msgid "Top image"
-msgstr "Imagine principală"
+msgstr ""
 
 msgid "Choose \"Custom...\" to upload your own image."
-msgstr "Alege personalizat pentru a urca propia imagine."
+msgstr ""
 
 msgid "Add your image:"
-msgstr "Adaugă-ți imaginea:"
+msgstr ""
 
 #, php-format
 msgid "JPEG or PNG file, 800 pixels wide, maximum size %s"
-msgstr "JPEG sau PNG, lat de 800 pixeli, mărimea maximă de %s"
+msgstr ""
 
 msgid "Sidebar"
-msgstr "Bară laterală"
+msgstr ""
 
 msgid "Sidebar position:"
-msgstr "Poziția barei laterale:"
+msgstr ""
 
 msgid "Sidebar text font:"
-msgstr "Fontul barei laterale:"
+msgstr ""
 
 msgid "Sidebar text font size:"
@@ -678,7 +669,6 @@
 msgstr ""
 
-#, fuzzy
 msgid "The 'public' directory does not exist."
-msgstr "Filtru nu există"
+msgstr ""
 
 #, php-format
@@ -891,7 +881,6 @@
 msgstr ""
 
-#, fuzzy
 msgid "Content filters"
-msgstr "Întoarce-te la filtre"
+msgstr ""
 
 msgid "You may want to process your post and/or comment content with the following filters."
@@ -987,7 +976,6 @@
 msgstr ""
 
-#, fuzzy
 msgid "Delete all logs"
-msgstr "Șterge tot spam-ul"
+msgstr ""
 
 msgid "Empty templates cache directory"
@@ -1134,7 +1122,6 @@
 msgstr ""
 
-#, fuzzy
 msgid "Page"
-msgstr "Începutul paginii"
+msgstr ""
 
 msgid "Tags"
@@ -1180,15 +1167,12 @@
 msgstr ""
 
-#, fuzzy
 msgid "Menu item has been successfully added."
-msgstr "Cuvântul a fost adăugat cu succes."
-
-#, fuzzy
+msgstr ""
+
 msgid "Menu items have been successfully removed."
-msgstr "Elementele au fost eliminate"
-
-#, fuzzy
+msgstr ""
+
 msgid "Menu items have been successfully updated."
-msgstr "Lista de elements a fost actualizată"
+msgstr ""
 
 msgid "Add item"
@@ -1207,7 +1191,6 @@
 msgstr ""
 
-#, fuzzy
 msgid "Select category:"
-msgstr "Editează categoria"
+msgstr ""
 
 msgid "Select month (if necessary):"
@@ -1223,7 +1206,6 @@
 msgstr ""
 
-#, fuzzy
 msgid "Description of item menu:"
-msgstr "Descriere"
+msgstr ""
 
 msgid "URL of item menu:"
@@ -1233,7 +1215,6 @@
 msgstr ""
 
-#, fuzzy
 msgid "Add an item"
-msgstr "Adaugă o nouă legătură"
+msgstr ""
 
 msgid "Menu items list"
@@ -1243,11 +1224,9 @@
 msgstr ""
 
-#, fuzzy
 msgid "Delete selected menu items"
-msgstr "Șterge legăturile selectate"
-
-#, fuzzy
+msgstr ""
+
 msgid "Are you sure you want to remove selected menu items?"
-msgstr "Sigur dorești a șterge legăturile selectate?"
+msgstr ""
 
 msgid "Currently no menu items"
@@ -1419,18 +1398,15 @@
 msgstr ""
 
-#, fuzzy
 msgid "Preferences successfully updated"
-msgstr "Configurație actualizată cu succes"
-
-#, fuzzy
+msgstr ""
+
 msgid "Preferences definition successfully updated"
-msgstr "Definiția setărilor a fost actualizată cu succes"
+msgstr ""
 
 msgid "user preferences"
 msgstr ""
 
-#, fuzzy
 msgid "global preferences"
-msgstr "setări globale"
+msgstr ""
 
 msgid "Presentation widgets"
@@ -1514,7 +1490,6 @@
 msgstr ""
 
-#, fuzzy
 msgid "custom"
-msgstr "Personalizat..."
+msgstr ""
 
 msgid "Widgets"
@@ -1598,14 +1573,2 @@
 msgid "Remove widget"
 msgstr ""
-
-#~ msgid "List"
-#~ msgstr "Listă"
-
-#~ msgid "Save order"
-#~ msgstr "Salvează ordinea"
-
-#~ msgid "import"
-#~ msgstr "Import"
-
-#~ msgid "Preview"
-#~ msgstr "Previzualizare"
Index: locales/ro/public.po
===================================================================
--- locales/ro/public.po	(revision 834)
+++ locales/ro/public.po	(revision 221)
@@ -1,180 +1,179 @@
-# Romanian translation for dotclear
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the dotclear package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dotclear\n"
+"Project-Id-Version: Dotclear 2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-10-13 05:22+0200\n"
-"PO-Revision-Date: 2011-09-02 22:34+0000\n"
-"Last-Translator: transla73436 <Unknown>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"Language: ro\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-27 15:39+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
-
+
+# Not found strings
 msgid "To content"
-msgstr "Mergi la conținut"
+msgstr ""
 
 msgid "To menu"
-msgstr "Mergi la meniu"
+msgstr ""
 
 msgid "To search"
-msgstr "Mergi la căutare"
+msgstr ""
 
 msgid "By"
-msgstr "De"
+msgstr ""
 
 msgid "by"
-msgstr "de"
+msgstr ""
 
 msgid "on"
-msgstr "activat"
+msgstr ""
 
 msgid "On"
-msgstr "Activat"
+msgstr ""
 
 msgid "Continue reading"
-msgstr "Citește în continuare"
+msgstr ""
 
 msgid "no comment"
-msgstr "niciun comentariu"
+msgstr ""
 
 msgid "one comment"
-msgstr "un comentariu"
+msgstr ""
 
 msgid "%d comments"
-msgstr "%d comentarii"
+msgstr ""
 
 msgid "no trackback"
-msgstr "fără trackback"
+msgstr ""
 
 msgid "one trackback"
-msgstr "un trackback"
+msgstr ""
 
 msgid "%d trackbacks"
-msgstr "%d trackback-uri"
+msgstr ""
 
 msgid "no attachment"
-msgstr "niciun atașament"
+msgstr ""
 
 msgid "one attachment"
-msgstr "un atașament"
+msgstr ""
 
 msgid "%d attachments"
-msgstr "%d atașamente"
+msgstr ""
 
 msgid "previous entries"
-msgstr "postări anterioare"
+msgstr ""
 
 msgid "page"
-msgstr "pagină"
+msgstr ""
 
 msgid "of"
-msgstr "de"
+msgstr ""
 
 msgid "next entries"
-msgstr "următoarele postări"
+msgstr ""
 
 msgid "Search"
-msgstr "Căutare"
+msgstr ""
 
 msgid "Your search for <em>%1$s</em> returned no result."
-msgstr "Căutarea dvs după <em>%1$s</em> nu are rezultate."
+msgstr ""
 
 msgid "Your search for <em>%1$s</em> returned <strong>%2$s</strong> result."
-msgstr "Căutate dvs după <em>%1$s</em> are următorul <strong>%2$s</strong> rezultat"
+msgstr ""
 
 msgid "Your search for <em>%1$s</em> returned <strong>%2$s</strong> results."
-msgstr "Căutate dvs după <em>%1$s</em> are următoarele <strong>%2$s</strong> rezultate"
+msgstr ""
 
 msgid "Home"
-msgstr "Pagină de pornire"
+msgstr ""
 
 msgid "All keywords"
-msgstr "Toate cuvintele-cheie"
+msgstr ""
 
 msgid "Best of me"
-msgstr "Cel mai bun din mine"
+msgstr ""
 
 msgid "Languages"
-msgstr "Limbi"
+msgstr ""
 
 msgid "Categories"
-msgstr "Categorii"
+msgstr ""
 
 msgid "Subcategories"
-msgstr "Subcategorii"
+msgstr ""
 
 msgid "Archives"
-msgstr "Arhive"
+msgstr ""
 
 msgid "Links"
-msgstr "Legături"
+msgstr ""
 
 msgid "Subscribe"
-msgstr "Abonare"
+msgstr ""
 
 msgid "Entries feed"
-msgstr "Abonament de postări"
+msgstr ""
 
 msgid "Comments feed"
-msgstr "Abonament de comentarii"
+msgstr ""
 
 msgid "This blog's comments Atom feed"
-msgstr "Abonamentul Atom al acestui blog"
+msgstr ""
 
 msgid "This category's entries Atom feed"
-msgstr "Abonamentul Atom al postărilor din această categorie"
+msgstr ""
 
 msgid "This category's comments Atom feed"
-msgstr "Abonamentul Atom al comentarilor din această categorie"
+msgstr ""
 
 msgid "This post's comments feed"
-msgstr "Abonamentul comentarilor postării acesteia"
+msgstr ""
 
 msgid "This post's comments Atom feed"
-msgstr "Abonamentul Atom de comentarii al acestei postări"
+msgstr ""
 
 msgid "Attachments"
-msgstr "Atașamente"
+msgstr ""
 
 msgid "Permalink"
-msgstr "Permalink"
+msgstr ""
 
 msgid "Comments"
-msgstr "Comentarii"
+msgstr ""
 
 msgid "Your comment"
-msgstr "Comentariul dvs"
+msgstr ""
 
 msgid "Your comment has been published."
-msgstr "Comentariul dvs a fost publicat."
+msgstr ""
 
 msgid "Your comment has been submitted and will be reviewed for publication."
-msgstr "Comentariul dvs a fost trimis și va fi revizuit înainte de publicare."
+msgstr ""
 
 msgid "Add a comment"
-msgstr "Adaugă un comentariu"
+msgstr ""
 
 msgid "Name or nickname"
-msgstr "Nume sau poreclă"
+msgstr ""
 
 msgid "Email address"
-msgstr "Adresă de contact"
+msgstr ""
 
 msgid "Website"
-msgstr "Sit web"
+msgstr ""
 
 msgid "optional"
-msgstr "opțional"
+msgstr ""
 
 msgid "Comment"
-msgstr "Comentariu"
+msgstr ""
 
 msgid "Comments can be formatted using a simple wiki syntax."
@@ -182,63 +181,63 @@
 
 msgid "HTML code is displayed as text and web addresses are automatically converted."
-msgstr "Codul html este afișat ca text iar adresele web sunt procesate automat."
+msgstr ""
 
 msgid "Remember me on this blog"
-msgstr "Ține-mă minte pe acest blog."
+msgstr ""
 
 msgid "preview"
-msgstr "previzualizare"
+msgstr ""
 
 msgid "send"
-msgstr "trimite"
+msgstr ""
 
 msgid "They posted on the same topic"
-msgstr "Și ei au postat pe același subiect"
+msgstr ""
 
 msgid "Trackback URL"
-msgstr "Trackback URL"
+msgstr ""
 
 msgid "You must provide an author name"
-msgstr "Trebuie să specifici un nume de autor"
+msgstr ""
 
 msgid "You must provide a comment"
-msgstr "Trebuie să scrii un comentariu"
+msgstr ""
 
 msgid "Email address is not valid"
-msgstr "Adresa de contact nu este valabilă"
+msgstr ""
 
 msgid "Document not found"
-msgstr "Documentul nu a fost găsit"
+msgstr ""
 
 msgid "The document you are looking for does not exist."
-msgstr "Documentul pe care îl căutați nu există"
+msgstr ""
 
 msgid "Powered by %s"
-msgstr "Creat de %s"
+msgstr ""
 
 msgid "Subscribe to"
-msgstr "Abonează-te la"
+msgstr ""
 
 msgid "What is an RSS feed?"
-msgstr "Ce este un abonament RSS?"
+msgstr ""
 
 msgid "RSS feed is a free blog summary. It provides content (either posts or comments) or summaries of content, together with links to the full versions, and other metadata. The last published items may then be read by your favorite RSS <a href=\"http://en.wikipedia.org/wiki/Aggregator\">aggregator</a>."
-msgstr "Abonamentul RSS este un sumar de blog gratuit. Oferă conținut (fie postări sau comentarii) sau un sumar de conținut, împreună cu legături web către versiunea completă a conținutului respectiv, și alte metadate. Ultimele conținuturi publicate pot fi citite de către <a href=\"http://en.wikipedia.org/wiki/Aggregator\">abonatorul</a> dvs favorit."
+msgstr ""
 
 msgid "Simply copy the following URL into your aggregator:"
-msgstr "Pur și simplu copiați următoarea legătură web în abonatorul dvs"
+msgstr ""
 
 msgid "Password needed"
-msgstr "Parola este necesară"
+msgstr ""
 
 msgid "You must give a password to access this area."
-msgstr "Trebuie să inserați o parolă pentru a accesa această zonă."
+msgstr ""
 
 msgid "Password:"
-msgstr "Parolă:"
+msgstr ""
 
 msgid "You must provide a valid email address."
-msgstr "Trebuie să furnizați o adresă email validă."
+msgstr ""
 
 msgid "Read"
-msgstr "Citeşte"
+msgstr ""
Index: plugins/aboutConfig/_define.php
===================================================================
--- plugins/aboutConfig/_define.php	(revision 967)
+++ plugins/aboutConfig/_define.php	(revision 589)
@@ -16,5 +16,5 @@
 	/* Description*/		"Manage every blog configuration directive",
 	/* Author */			"Olivier Meunier",
-	/* Version */			'0.5'
+	/* Version */			'0.4'
 );
 ?>
Index: plugins/aboutConfig/index.php
===================================================================
--- plugins/aboutConfig/index.php	(revision 907)
+++ plugins/aboutConfig/index.php	(revision 782)
@@ -121,9 +121,9 @@
 <?php
 if (!empty($_GET['upd'])) {
-	dcPage::message(__('Configuration successfully updated'));
+	echo '<p class="message">'.__('Configuration successfully updated').'</p>';
 }
 
 if (!empty($_GET['upda'])) {
-	dcPage::message(__('Settings definition successfully updated'));
+	echo '<p class="message">'.__('Settings definition successfully updated').'</p>';
 }
 ?>
@@ -132,5 +132,5 @@
 <div id="local" class="multi-part" title="<?php echo __('blog settings'); ?>">
 
-<?php 
+<?php
 $table_header = '<table class="settings" id="%s"><caption>%s</caption>'.
 '<thead>'.
@@ -146,4 +146,5 @@
 
 $settings = array();
+
 foreach ($core->blog->settings->dumpNamespaces() as $ns => $namespace) {
 	foreach ($namespace->dumpSettings() as $k => $v) {
Index: plugins/antispam/_define.php
===================================================================
--- plugins/antispam/_define.php	(revision 967)
+++ plugins/antispam/_define.php	(revision 464)
@@ -16,5 +16,5 @@
 	/* Description*/		"Generic antispam plugin for Dotclear",
 	/* Author */			"Alain Vagner",
-	/* Version */			'1.4',
+	/* Version */			'1.3.1',
 	array(
 		'permissions' =>	'usage,contentadmin',
Index: plugins/antispam/_prepend.php
===================================================================
--- plugins/antispam/_prepend.php	(revision 920)
+++ plugins/antispam/_prepend.php	(revision 270)
@@ -24,5 +24,5 @@
 $__autoload['dcFilterWords'] = dirname(__FILE__).'/filters/class.dc.filter.words.php';
 
-$core->spamfilters = array('dcFilterIP','dcFilterIpLookup','dcFilterWords','dcFilterLinksLookup');
+$core->spamfilters = array('dcFilterIP','dcFilterWords','dcFilterIpLookup','dcFilterLinksLookup');
 
 $core->url->register('spamfeed','spamfeed','^spamfeed/(.+)$',array('dcAntispamURL','spamFeed'));
Index: plugins/antispam/filters/class.dc.filter.ip.php
===================================================================
--- plugins/antispam/filters/class.dc.filter.ip.php	(revision 907)
+++ plugins/antispam/filters/class.dc.filter.ip.php	(revision 782)
@@ -103,8 +103,8 @@
 
 		if (!empty($_GET['added'])) {
-			$res .= dcPage::message(__('IP address has been successfully added.'),true,false,false);
+			$res .= '<p class="message">'.__('IP address has been successfully added.').'</p>';
 		}
 		if (!empty($_GET['removed'])) {
-			$res .= dcPage::message(__('IP addresses have been successfully removed.'),true,false,false);
+			$res .= '<p class="message">'.__('IP addresses have been successfully removed.').'</p>';
 		}
 
@@ -130,5 +130,5 @@
 		if ($core->auth->isSuperAdmin()) {
 			$res .= '<label class="classic" for="globalip_'.$type.'">'.form::checkbox(array('globalip', 'globalip_'.$type),1).' '.
-			__('Global IP (used for all blogs)').'</label> ';
+			__('Global IP').'</label> ';
 		}
 
@@ -152,6 +152,4 @@
 			'<div style="'.$this->style_list.'">';
 
-			$res_global = '';
-			$res_local = '';
 			while ($rs->fetch())
 			{
@@ -168,26 +166,10 @@
 				}
 
-				$item =
+				$res .=
 				'<p style="'.$p_style.'"><label class="classic" for="'.$type.'-ip-'.$rs->rule_id.'">'.
 				form::checkbox(array('delip[]',$type.'-ip-'.$rs->rule_id),$rs->rule_id,false,'','',$disabled_ip).' '.
 				html::escapeHTML($pattern).
 				'</label></p>';
-
-				if ($rs->blog_id) {
-					// local list
-					if ($res_local == '') {
-						$res_local = '<h4>'.__('Local IPs (used only for this blog)').'</h4>';
-					}
-					$res_local .= $item;
-				} else {
-					// global list
-					if ($res_global == '') {
-						$res_global = '<h4>'.__('Global IPs (used for all blogs)').'</h4>';
-					}
-					$res_global .= $item;
-				}
-			}
-			$res .= $res_local.$res_global;
-
+			}
 			$res .=
 			'</div>'.
Index: plugins/antispam/filters/class.dc.filter.linkslookup.php
===================================================================
--- plugins/antispam/filters/class.dc.filter.linkslookup.php	(revision 913)
+++ plugins/antispam/filters/class.dc.filter.linkslookup.php	(revision 270)
@@ -43,20 +43,12 @@
 				continue;
 			}
-
-			$domain = preg_replace('/^[\w]{2,6}:\/\/([\w\d\.\-]+).*$/','$1',$b['host']);
-			$domain_elem = explode(".",$domain);
-
-			$i = count($domain_elem) - 1;
-			$host = $domain_elem[$i];
-			do
-			{
-				$host = $domain_elem[$i - 1].'.'.$host;
-				$i--;
-				if (substr(gethostbyname($host.'.'.$this->server),0,3) == "127" ) 
-				{
-					$status = substr($domain,0,128);
-					return true;
-				}				
-			} while ($i > 0);
+			
+			$domain = preg_replace('/^(.*\.)([^.]+\.[^.]+)$/','$2',$b['host']);
+			$host = $domain.'.'.$this->server;
+			
+			if (gethostbyname($host) != $host) {
+				$status = substr($domain,0,128);
+				return true;
+			}
 		}
 	}
Index: plugins/antispam/filters/class.dc.filter.words.php
===================================================================
--- plugins/antispam/filters/class.dc.filter.words.php	(revision 907)
+++ plugins/antispam/filters/class.dc.filter.words.php	(revision 536)
@@ -109,11 +109,11 @@
 
 		if (!empty($_GET['list'])) {
-			$res .= dcPage::message(__('Words have been successfully added.'),true,false,false);
+			$res .= '<p class="message">'.__('Words have been successfully added.').'</p>';
 		}
 		if (!empty($_GET['added'])) {
-			$res .= dcPage::message(__('Word has been successfully added.'),true,false,false);
+			$res .= '<p class="message">'.__('Word has been successfully added.').'</p>';
 		}
 		if (!empty($_GET['removed'])) {
-			$res .= dcPage::message(__('Words have been successfully removed.'),true,false,false);
+			$res .= '<p class="message">'.__('Words have been successfully removed.').'</p>';
 		}
 
@@ -124,5 +124,5 @@
 		if ($core->auth->isSuperAdmin()) {
 			$res .= '<label class="classic" for="globalsw">'.form::checkbox('globalsw',1).' '.
-			__('Global word (used for all blogs)').'</label> ';
+			__('Global word').'</label> ';
 		}
 
@@ -145,6 +145,4 @@
 			'<div style="'.$this->style_list.'">';
 
-			$res_global = '';
-			$res_local = '';
 			while ($rs->fetch())
 			{
@@ -156,24 +154,10 @@
 				}
 
-				$item = '<p style="'.$p_style.'"><label class="classic" for="word-'.$rs->rule_id.'">'.
-					form::checkbox(array('swd[]', 'word-'.$rs->rule_id),$rs->rule_id,false,'','',$disabled_word).' '.
-					html::escapeHTML($rs->rule_content).
-					'</label></p>';
-
-				if ($rs->blog_id) {
-					// local list
-					if ($res_local == '') {
-						$res_local = '<h4>'.__('Local words (used only for this blog)').'</h4>';
-					}
-					$res_local .= $item;
-				} else {
-					// global list
-					if ($res_global == '') {
-						$res_global = '<h4>'.__('Global words (used for all blogs)').'</h4>';
-					}
-					$res_global .= $item;
-				}
-			}
-			$res .= $res_local.$res_global;
+				$res .=
+				'<p style="'.$p_style.'"><label class="classic" for="word-'.$rs->rule_id.'">'.
+				form::checkbox(array('swd[]', 'word-'.$rs->rule_id),$rs->rule_id,false,'','',$disabled_word).' '.
+				html::escapeHTML($rs->rule_content).
+				'</label></p>';
+			}
 
 			$res .=
Index: plugins/antispam/index.php
===================================================================
--- plugins/antispam/index.php	(revision 907)
+++ plugins/antispam/index.php	(revision 782)
@@ -99,5 +99,5 @@
 <html>
 <head>
-  <title><?php echo ($filter_gui !== false ? sprintf(__('%s configuration'),$filter->name).' - ' : '').$page_name; ?></title>
+  <title><?php echo $page_name; ?></title>
   <?php
   echo
@@ -121,5 +121,4 @@
 {
 	echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.$page_name.'</span></h2>';
-
 	# Information
 	$spam_count = dcAntispam::countSpam($core);
@@ -132,5 +131,5 @@
 
 	if (!empty($_GET['del'])) {
-		dcPage::message(__('Spam comments have been successfully deleted.'));
+		echo '<p class="message">'.__('Spam comments have been successfully deleted.').'</p>';
 	}
 
@@ -163,5 +162,5 @@
 
 	if (!empty($_GET['upd'])) {
-		dcPage::message(__('Filters configuration has been successfully saved.'));
+		echo '<p class="message">'.__('Filters configuration has been successfully saved.').'</p>';
 	}
 
@@ -232,2 +231,3 @@
 </body>
 </html>
+
Index: plugins/attachments/_define.php
===================================================================
--- plugins/attachments/_define.php	(revision 967)
+++ plugins/attachments/_define.php	(revision 464)
@@ -16,7 +16,7 @@
 	/* Description*/	"Manage post attachments",
 	/* Author */		"Dotclear Team",
-	/* Version */		'1.1',
+	/* Version */		'1.0',
 	array(
-		'permissions' =>	'usage,contentadmin,pages',
+		'permissions' =>	'contentadmin,pages',
 		'priority' =>		999
 	)
Index: plugins/attachments/_public.php
===================================================================
--- plugins/attachments/_public.php	(revision 944)
+++ plugins/attachments/_public.php	(revision 464)
@@ -89,5 +89,5 @@
 		$if = array();
 		
-		$operator = isset($attr['operator']) ? dcTemplate::getOperator($attr['operator']) : '&&';
+		$operator = isset($attr['operator']) ? $this->getOperator($attr['operator']) : '&&';
 		
 		if (isset($attr['is_image'])) {
Index: plugins/blogroll/_define.php
===================================================================
--- plugins/blogroll/_define.php	(revision 965)
+++ plugins/blogroll/_define.php	(revision 464)
@@ -16,5 +16,5 @@
 	/* Description*/		"Manage your blogroll",
 	/* Author */			"Olivier Meunier",
-	/* Version */			'1.3',
+	/* Version */			'1.2',
 	array(
 		'permissions' =>	'blogroll'
Index: plugins/blogroll/_public.php
===================================================================
--- plugins/blogroll/_public.php	(revision 945)
+++ plugins/blogroll/_public.php	(revision 776)
@@ -140,6 +140,5 @@
 		global $core;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
+		if ($w->homeonly && $core->url->type != 'default') {
 			return;
 		}
@@ -152,5 +151,5 @@
 		
 		return
-		'<div class="links'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">'.
+		'<div class="links">'.
 		($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
 		$links.
Index: plugins/blogroll/_widgets.php
===================================================================
--- plugins/blogroll/_widgets.php	(revision 954)
+++ plugins/blogroll/_widgets.php	(revision 270)
@@ -19,5 +19,5 @@
 	public static function initWidgets($w)
 	{
-		$w->create('links',__('Blogroll'),array('tplBlogroll','linksWidget'),null,'Blogroll list');
+		$w->create('links',__('Blogroll'),array('tplBlogroll','linksWidget'));
 		$w->links->setting('title',__('Title:'),__('Links'));
 		
@@ -34,12 +34,5 @@
 		$w->links->setting('category',__('Category'),'','combo',$categories);
 		
-		$w->links->setting('homeonly',__('Display on:'),1,'combo',
-			array(
-				__('All pages') => 0,
-				__('Home page only') => 1,
-				__('Except on home page') => 2
-				)
-		);
-		$w->links->setting('class',__('CSS class:'),'');
+		$w->links->setting('homeonly',__('Home page only'),1,'check');
 	}
 	
Index: plugins/blogroll/edit.php
===================================================================
--- plugins/blogroll/edit.php	(revision 907)
+++ plugins/blogroll/edit.php	(revision 270)
@@ -101,5 +101,5 @@
 {
 	if (!empty($_GET['upd'])) {
-		dcPage::message(__('Category has been successfully updated'));
+		echo '<p class="message">'.__('Category has been successfully updated').'</p>';
 	}
 	
@@ -121,5 +121,5 @@
 {
 	if (!empty($_GET['upd'])) {
-		dcPage::message(__('Link has been successfully updated'));
+		echo '<p class="message">'.__('Link has been successfully updated').'</p>';
 	}
 	
Index: plugins/blogroll/index.php
===================================================================
--- plugins/blogroll/index.php	(revision 907)
+++ plugins/blogroll/index.php	(revision 782)
@@ -219,21 +219,21 @@
 <?php
 if (!empty($_GET['neworder'])) {
-	dcPage::message(__('Items order has been successfully updated'));
+	echo '<p class="message">'.__('Items order has been successfully updated').'</p>';
 }
 
 if (!empty($_GET['removed'])) {
-	dcPage::message(__('Items have been successfully removed.'));
+		echo '<p class="message">'.__('Items have been successfully removed.').'</p>';
 }
 
 if (!empty($_GET['addlink'])) {
-	dcPage::message(__('Link has been successfully created.'));
+		echo '<p class="message">'.__('Link has been successfully created.').'</p>';
 }
 
 if (!empty($_GET['addcat'])) {
-	dcPage::message(__('category has been successfully created.'));
+		echo '<p class="message">'.__('category has been successfully created.').'</p>';
 }
 
 if (!empty($_GET['importlinks'])) {
-	dcPage::message(__('links have been successfully imported.'));
+		echo '<p class="message">'.__('links have been successfully imported.').'</p>';
 }
 ?>
@@ -242,10 +242,11 @@
 <form action="plugin.php" method="post" id="links-form">
 <table class="maximal dragable">
+<caption><?php echo __('Links list'); ?></caption>
 <thead>
 <tr>
-  <th colspan="3"><?php echo __('Title'); ?></th>
-  <th><?php echo __('Description'); ?></th>
-  <th><?php echo __('URL'); ?></th>
-  <th><?php echo __('Lang'); ?></th>
+  <th scope="col" colspan="3"><?php echo __('Title'); ?></th>
+  <th scope="col"><?php echo __('Description'); ?></th>
+  <th scope="col"><?php echo __('URL'); ?></th>
+  <th scope="col"><?php echo __('Lang'); ?></th>
 </tr>
 </thead>
@@ -265,12 +266,12 @@
 	{
 		echo
-		'<td colspan="5"><strong><a href="'.$p_url.'&amp;edit=1&amp;id='.$rs->link_id.'">'.
-		html::escapeHTML($rs->link_desc).'</a></strong></td>';
+		'<th scope="row" colspan="5"><strong><a href="'.$p_url.'&amp;edit=1&amp;id='.$rs->link_id.'">'.
+		html::escapeHTML($rs->link_desc).'</a></strong></th>';
 	}
 	else
 	{
 		echo
-		'<td><a href="'.$p_url.'&amp;edit=1&amp;id='.$rs->link_id.'">'.
-		html::escapeHTML($rs->link_title).'</a></td>'.
+		'<th scope="row"><a href="'.$p_url.'&amp;edit=1&amp;id='.$rs->link_id.'">'.
+		html::escapeHTML($rs->link_title).'</a></th>'.
 		'<td>'.html::escapeHTML($rs->link_desc).'</td>'.
 		'<td>'.html::escapeHTML($rs->link_href).'</td>'.
Index: plugins/blowupConfig/_define.php
===================================================================
--- plugins/blowupConfig/_define.php	(revision 967)
+++ plugins/blowupConfig/_define.php	(revision 464)
@@ -16,5 +16,5 @@
 	/* Description*/		"Configure your Blowup Theme",
 	/* Author */			"Olivier Meunier",
-	/* Version */			'1.2',
+	/* Version */			'1.1',
 	array(
 		'permissions' =>	'admin'
Index: plugins/blowupConfig/index.php
===================================================================
--- plugins/blowupConfig/index.php	(revision 907)
+++ plugins/blowupConfig/index.php	(revision 683)
@@ -228,10 +228,11 @@
 
 if (!$can_write_images) {
-	dcPage::message(__('For the following reasons, images cannot be created. You won\'t be able to change some background properties.').
-		$notices,false,true);
+	echo '<div class="message">'.
+		__('For the following reasons, images cannot be created. You won\'t be able to change some background properties.').
+		$notices.'</div>';
 }
 
 if (!empty($_GET['upd'])) {
-	dcPage::message(__('Theme configuration has been successfully updated.'));
+	echo '<p class="message">'.__('Theme configuration has been successfully updated.').'</p>';
 }
 
Index: plugins/fairTrackbacks/_prepend.php
===================================================================
--- plugins/fairTrackbacks/_prepend.php	(revision 857)
+++ plugins/fairTrackbacks/_prepend.php	(revision 270)
@@ -12,6 +12,4 @@
 if (!defined('DC_RC_PATH')) { return; }
 
-global $__autoload;
-
 if (!defined('DC_FAIRTRACKBACKS_FORCE')) {
 	define('DC_FAIRTRACKBACKS_FORCE',false);
Index: plugins/importExport/_admin.php
===================================================================
--- plugins/importExport/_admin.php	(revision 840)
+++ plugins/importExport/_admin.php	(revision 324)
@@ -2,7 +2,7 @@
 # -- BEGIN LICENSE BLOCK ---------------------------------------
 #
-# This file is part of importExport, a plugin for DotClear2.
+# This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -12,11 +12,12 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-$_menu['Plugins']->addItem(
-	__('Import/Export'),
-	'plugin.php?p=importExport',
-	'index.php?pf=importExport/icon.png',
-	preg_match('/plugin.php\?p=importExport(&.*)?$/',$_SERVER['REQUEST_URI']),
-	$core->auth->check('admin',$core->blog->id)
-);
+$_menu['Plugins']->addItem(__('Import/Export'),'plugin.php?p=importExport','index.php?pf=importExport/icon.png',
+		preg_match('/plugin.php\?p=importExport(&.*)?$/',$_SERVER['REQUEST_URI']),
+		$core->auth->check('admin',$core->blog->id));
+
+# Files needed by flat files import / export
+$__autoload['backupFile'] = dirname(__FILE__).'/inc/flat/class.backupFile.php';
+$__autoload['dcImport'] = dirname(__FILE__).'/inc/flat/class.dc.import.php';
+$__autoload['dbExport'] = dirname(__FILE__).'/inc/flat/class.db.export.php';
 
 $core->addBehavior('adminDashboardFavs','importExportDashboardFavs');
@@ -24,12 +25,7 @@
 function importExportDashboardFavs($core,$favs)
 {
-	$favs['importExport'] = new ArrayObject(array(
-		'importExport',
-		__('Import/Export'),
-		'plugin.php?p=importExport',
-		'index.php?pf=importExport/icon.png',
-		'index.php?pf=importExport/icon-big.png',
-		'admin',null,null
-	));
+	$favs['importExport'] = new ArrayObject(array('importExport','Import/Export','plugin.php?p=importExport',
+		'index.php?pf=importExport/icon.png','index.php?pf=importExport/icon-big.png',
+		'admin',null,null));
 }
 ?>
Index: plugins/importExport/_define.php
===================================================================
--- plugins/importExport/_define.php	(revision 967)
+++ plugins/importExport/_define.php	(revision 464)
@@ -2,7 +2,7 @@
 # -- BEGIN LICENSE BLOCK ---------------------------------------
 #
-# This file is part of importExport, a plugin for DotClear2.
+# This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -15,7 +15,10 @@
 	/* Name */			"Import / Export",
 	/* Description*/		"Import and Export your blog",
-	/* Author */			"Olivier Meunier & Contributors",
-	/* Version */			'3.2',
-	/* Perm */			'admin'
+	/* Author */			"Olivier Meunier",
+	/* Version */			'2.4',
+	array(
+		'permissions' => 'admin',
+		'priority' => 10
+	)
 );
 ?>
Index: lugins/importExport/_prepend.php
===================================================================
--- plugins/importExport/_prepend.php	(revision 891)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?php
-# -- BEGIN LICENSE BLOCK ---------------------------------------
-#
-# This file is part of importExport, a plugin for DotClear2.
-#
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
-# Licensed under the GPL version 2.0 license.
-# See LICENSE file or
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-#
-# -- END LICENSE BLOCK -----------------------------------------
-if (!defined('DC_RC_PATH')) { return; }
-
-global $__autoload,$core;
-
-$__autoload['dcIeModule'] = 	dirname(__FILE__).'/inc/class.dc.ieModule.php';
-
-$__autoload['dcImportFlat'] = 	dirname(__FILE__).'/inc/class.dc.import.flat.php';
-$__autoload['dcImportFeed'] = 	dirname(__FILE__).'/inc/class.dc.import.feed.php';
-
-$__autoload['dcExportFlat'] = 	dirname(__FILE__).'/inc/class.dc.export.flat.php';
-
-$__autoload['dcImportDC1'] = 	dirname(__FILE__).'/inc/class.dc.import.dc1.php';
-$__autoload['dcImportWP'] = 	dirname(__FILE__).'/inc/class.dc.import.wp.php';
-
-$__autoload['flatBackup'] = 	dirname(__FILE__).'/inc/flat/class.flat.backup.php';
-$__autoload['flatImport'] = 	dirname(__FILE__).'/inc/flat/class.flat.import.php';
-$__autoload['flatExport'] = 	dirname(__FILE__).'/inc/flat/class.flat.export.php';
-
-$core->addBehavior('importExportModules','registerIeModules');
-
-function registerIeModules($modules)
-{
-	$modules['import'] = array_merge($modules['import'],array('dcImportFlat'));
-	$modules['import'] = array_merge($modules['import'],array('dcImportFeed'));
-	
-	$modules['export'] = array_merge($modules['export'],array('dcExportFlat'));
-	
-	if ($GLOBALS['core']->auth->isSuperAdmin()) {
-		$modules['import'] = array_merge($modules['import'],array('dcImportDC1'));
-		$modules['import'] = array_merge($modules['import'],array('dcImportWP'));
-	}
-}
-?>
Index: plugins/importExport/inc/class.dc.export.flat.php
===================================================================
--- plugins/importExport/inc/class.dc.export.flat.php	(revision 840)
+++ plugins/importExport/inc/class.dc.export.flat.php	(revision 557)
@@ -2,7 +2,7 @@
 # -- BEGIN LICENSE BLOCK ---------------------------------------
 #
-# This file is part of importExport, a plugin for DotClear2.
+# This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -16,5 +16,5 @@
 	public function setInfo()
 	{
-		$this->type = 'export';
+		$this->type = 'e';
 		$this->name = __('Flat file export');
 		$this->description = __('Exports a blog or a full Dotclear installation to flat file.');
@@ -31,5 +31,5 @@
 			try
 			{
-				$exp = new flatExport($this->core->con,$fullname,$this->core->prefix);
+				$exp = new dbExport($this->core->con,$fullname,$this->core->prefix);
 				fwrite($exp->fp,'///DOTCLEAR|'.DC_VERSION."|single\n");
 				
@@ -84,5 +84,4 @@
 				$_SESSION['export_file'] = $fullname;
 				$_SESSION['export_filename'] = $_POST['file_name'];
-				$_SESSION['export_filezip'] = !empty($_POST['file_zip']);
 				http::redirect($this->getURL().'&do=ok');
 			}
@@ -100,5 +99,5 @@
 			try
 			{
-				$exp = new flatExport($this->core->con,$fullname,$this->core->prefix);
+				$exp = new dbExport($this->core->con,$fullname,$this->core->prefix);
 				fwrite($exp->fp,'///DOTCLEAR|'.DC_VERSION."|full\n");
 				$exp->exportTable('blog');
@@ -124,5 +123,4 @@
 				$_SESSION['export_file'] = $fullname;
 				$_SESSION['export_filename'] = $_POST['file_name'];
-				$_SESSION['export_filezip'] = !empty($_POST['file_zip']);
 				http::redirect($this->getURL().'&do=ok');
 			}
@@ -142,47 +140,11 @@
 			
 			ob_end_clean();
-			
-			if (substr($_SESSION['export_filename'],-4) == '.zip') {
-				$_SESSION['export_filename'] = substr($_SESSION['export_filename'],0,-4);//.'.txt';
-			}
-			
-			# Flat export
-			if (empty($_SESSION['export_filezip'])) {
-			
-				header('Content-Disposition: attachment;filename='.$_SESSION['export_filename']);
-				header('Content-Type: text/plain; charset=UTF-8');
-				readfile($_SESSION['export_file']);
-				
-				unlink($_SESSION['export_file']);
-				unset($_SESSION['export_file'],$_SESSION['export_filename'],$_SESSION['export_filezip']);
-				exit;
-			}
-			# Zip export
-			else {
-				try
-				{
-					$file_zipname = $_SESSION['export_filename'].'.zip';
-					
-					$fp = fopen('php://output','wb');
-					$zip = new fileZip($fp);
-					$zip->addFile($_SESSION['export_file'],$_SESSION['export_filename']);
-					
-					header('Content-Disposition: attachment;filename='.$file_zipname);
-					header('Content-Type: application/x-zip');
-					
-					$zip->write();
-					
-					unlink($_SESSION['export_file']);
-					unset($zip,$_SESSION['export_file'],$_SESSION['export_filename'],$file_zipname);
-					exit;
-				}
-				catch (Exception $e)
-				{
-					unset($zip,$_SESSION['export_file'],$_SESSION['export_filename'],$file_zipname);
-					@unlink($_SESSION['export_file']);
-					
-					throw new Exception(__('Failed to compress export file.'));
-				}
-			}
+			header('Content-Disposition: attachment;filename='.$_SESSION['export_filename']);
+			header('Content-Type: text/plain; charset=UTF-8');
+			readfile($_SESSION['export_file']);
+			unlink($_SESSION['export_file']);
+			unset($_SESSION['export_file']);
+			unset($_SESSION['export_filename']);
+			exit;
 		}
 	}
@@ -192,25 +154,15 @@
 		echo
 		'<form action="'.$this->getURL(true).'" method="post">'.
-		'<fieldset><legend>'.__('Single blog').'</legend>'.
-		'<p>'.sprintf(__('This will create an export of your current blog: %s'),html::escapeHTML($this->core->blog->name)).'</p>'.
-		
-		'<p><label for="file_name">'.__('File name:').'</label>'.
-		form::field(array('file_name','file_name'),50,255,date('Y-m-d-').html::escapeHTML($this->core->blog->id.'-backup.txt')).
-		'</p>'.
-		
-		'<p><label for="file_zip" class="classic">'.
-		form::checkbox(array('file_zip','file_zip'),1).' '.
-		__('Compress file').'</label>'.
-		'</p>'.
-		
+		'<fieldset><legend>'.__('Export a blog').'</legend>'.
+		'<p>'.sprintf(__('This will create an export of your current blog: %s'),
+		'<strong>'.html::escapeHTML($this->core->blog->name).'</strong>').'</p>'.
+		'<p><label for="file_name" class="classic">'.__('File name:').'</label>'.
+		form::field(array('file_name','file_name'),25,255,date('Y-m-d-').html::escapeHTML($this->core->blog->id.'-backup.txt')).
+		'<input type="submit" value="'.__('Export').'" />'.
+		form::hidden(array('do'),'export_blog').
+		$this->core->formNonce().'</p>'.
 		'<p class="zip-dl"><a href="media.php?d=&amp;zipdl=1">'.
 		__('You may also want to download your media directory as a zip file').'</a></p>'.
-		
-		'<p><input type="submit" value="'.__('Export').'" />'.
-		form::hidden(array('do'),'export_blog').
-		$this->core->formNonce().'</p>'.
-		
-		'</fieldset>'.
-		'</form>';
+		'</fieldset></form>';
 		
 		if ($this->core->auth->isSuperAdmin())
@@ -218,22 +170,11 @@
 			echo
 			'<form action="'.$this->getURL(true).'" method="post">'.
-			'<fieldset><legend>'.__('Multiple blogs').'</legend>'.
-			'<p>'.__('This will create an export of all the content of your database.').'</p>'.
-			
-			'<p><label for="file_name2">'.__('File name:').'</label>'.
-			form::field(array('file_name','file_name2'),50,255,date('Y-m-d-').'dotclear-backup.txt').
-			'</p>'.
-			
-			'<p><label for="file_zip2" class="classic">'.
-			form::checkbox(array('file_zip','file_zip2'),1).' '.
-			__('Compress file').'</label>'.
-			'</p>'.
-			
-			'<p><input type="submit" value="'.__('Export').'" />'.
+			'<fieldset><legend>'.__('Export all content').'</legend>'.
+			'<p><label for="file_name2" class="classic">'.__('File name:').'</label>'.
+			form::field(array('file_name','file_name2'),25,255,date('Y-m-d-').'dotclear-backup.txt').
+			'<input type="submit" value="'.__('Export all content').'" />'.
 			form::hidden(array('do'),'export_all').
 			$this->core->formNonce().'</p>'.
-			
-			'</fieldset>'.
-			'</form>';
+			'</fieldset></form>';
 		}
 	}
Index: plugins/importExport/inc/class.dc.ieModule.php
===================================================================
--- plugins/importExport/inc/class.dc.ieModule.php	(revision 840)
+++ plugins/importExport/inc/class.dc.ieModule.php	(revision 270)
@@ -2,7 +2,7 @@
 # -- BEGIN LICENSE BLOCK ---------------------------------------
 #
-# This file is part of importExport, a plugin for DotClear2.
+# This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -12,5 +12,5 @@
 if (!defined('DC_RC_PATH')) { return; }
 
-abstract class dcIeModule
+class dcIeModule
 {
 	public $type;
@@ -28,14 +28,14 @@
 		$this->setInfo();
 		
-		if (!in_array($this->type,array('import','export'))) {
-			throw new Exception(sprintf('Unknow type for module %s',get_class($this)));
+		$this->id = get_class($this);
+		if (!$this->type) {
+			throw new Exception('No type for module'.$this->id);
 		}
+		
+		$this->url = 'plugin.php?p=importExport&t='.$this->type.'&f='.$this->id;
 		
 		if (!$this->name) {
 			$this->name = get_class($this);
 		}
-		
-		$this->id = get_class($this);
-		$this->url = sprintf('plugin.php?p=importExport&type=%s&module=%s',$this->type,$this->id);
 	}
 	
@@ -44,14 +44,23 @@
 	}
 	
-	abstract protected function setInfo();
+	protected function setInfo()
+	{
+	}
 	
 	final public function getURL($escape=false)
 	{
-		return $escape ? html::escapeHTML($this->url) : $this->url;
+		if ($escape) {
+			return html::escapeHTML($this->url);
+		}
+		return $this->url;
 	}
 	
-	abstract public function process($do);
+	public function process($do)
+	{
+	}
 	
-	abstract public function gui();
+	public function gui()
+	{
+	}
 	
 	protected function progressBar($percent)
Index: plugins/importExport/inc/class.dc.import.dc1.php
===================================================================
--- plugins/importExport/inc/class.dc.import.dc1.php	(revision 840)
+++ plugins/importExport/inc/class.dc.import.dc1.php	(revision 270)
@@ -2,7 +2,7 @@
 # -- BEGIN LICENSE BLOCK ---------------------------------------
 #
-# This file is part of importExport, a plugin for DotClear2.
+# This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -40,5 +40,5 @@
 	protected function setInfo()
 	{
-		$this->type = 'import';
+		$this->type = 'i';
 		$this->name = __('Dotclear 1.2 import');
 		$this->description = __('Import a Dotclear 1.2 installation into your current blog.');
Index: plugins/importExport/inc/class.dc.import.feed.php
===================================================================
--- plugins/importExport/inc/class.dc.import.feed.php	(revision 907)
+++ plugins/importExport/inc/class.dc.import.feed.php	(revision 557)
@@ -2,7 +2,7 @@
 # -- BEGIN LICENSE BLOCK ---------------------------------------
 #
-# This file is part of importExport, a plugin for DotClear2.
+# This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -19,5 +19,5 @@
 	public function setInfo()
 	{
-		$this->type = 'import';
+		$this->type = 'i';
 		$this->name = __('Feed import');
 		$this->description = __('Imports a feed as new entries.');
@@ -77,21 +77,20 @@
 	{
 		if ($this->status) {
-			dcPage::message(__('Content successfully imported.'));
+			echo '<p class="message">'.__('Content successfully imported.').'</p>';
 		}
 		
 		echo
+		'<h3>'.__('Import from a feed').'</h3>'.
+		'<p>'.sprintf(__('This will import a feed (RSS or Atom) a as new content in the current blog: %s.'),
+		'<strong>'.html::escapeHTML($this->core->blog->name).'</strong>').'</p>'.
 		'<form action="'.$this->getURL(true).'" method="post">'.
-		'<fieldset><legend>'.__('Single blog').'</legend>'.
-		'<p>'.sprintf(__('This will import a feed (RSS or Atom) a as new content in the current blog: %s.'),html::escapeHTML($this->core->blog->name)).'</p>'.
 		
-		'<p><label for="feed_url">'.__('Feed URL:').'</label>'.
-		form::field('feed_url',50,300,html::escapeHTML($this->feed_url)).'</p>'.
-		
-		'<p>'.
+		'<div class="fieldset">'.
 		$this->core->formNonce().
 		form::hidden(array('do'),1).
-		'<input type="submit" value="'.__('Import').'" /></p>'.
-		
-		'</fieldset>'.
+		'<p><label for="feed_url">'.__('Feed URL:').'</label>'.
+		form::field('feed_url',40,300,html::escapeHTML($this->feed_url)).'</p>'.
+		'<p><input type="submit" value="'.__('Import').'" /></p>'.
+		'</div>'.
 		'</form>';
 	}
Index: plugins/importExport/inc/class.dc.import.flat.php
===================================================================
--- plugins/importExport/inc/class.dc.import.flat.php	(revision 939)
+++ plugins/importExport/inc/class.dc.import.flat.php	(revision 557)
@@ -2,7 +2,7 @@
 # -- BEGIN LICENSE BLOCK ---------------------------------------
 #
-# This file is part of importExport, a plugin for DotClear2.
+# This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -18,5 +18,5 @@
 	public function setInfo()
 	{
-		$this->type = 'import';
+		$this->type = 'i';
 		$this->name = __('Flat file import');
 		$this->description = __('Imports a blog or a full Dotclear installation from flat file.');
@@ -55,17 +55,7 @@
 			
 			try {
-				# Try to unzip file
-				$unzip_file = $this->unzip($file);
-				if (false !== $unzip_file) {
-					$bk = new flatImport($this->core,$unzip_file);
-				}
-				# Else this is a normal file
-				else {
-					$bk = new flatImport($this->core,$file);
-				}
-				
+				$bk = new dcImport($this->core,$file);
 				$bk->importSingle();
 			} catch (Exception $e) {
-				@unlink($unzip_file);
 				if ($to_unlink) {
 					@unlink($file);
@@ -73,5 +63,4 @@
 				throw $e;
 			}
-			@unlink($unzip_file);
 			if ($to_unlink) {
 				@unlink($file);
@@ -106,17 +95,7 @@
 			
 			try {
-				# Try to unzip file
-				$unzip_file = $this->unzip($file);
-				if (false !== $unzip_file) {
-					$bk = new flatImport($this->core,$unzip_file);
-				}
-				# Else this is a normal file
-				else {
-					$bk = new flatImport($this->core,$file);
-				}
-				
+				$bk = new dcImport($this->core,$file);
 				$bk->importFull();
 			} catch (Exception $e) {
-				@unlink($unzip_file);
 				if ($to_unlink) {
 					@unlink($file);
@@ -124,5 +103,4 @@
 				throw $e;
 			}
-			@unlink($unzip_file);
 			if ($to_unlink) {
 				@unlink($file);
@@ -142,15 +120,12 @@
 		if ($this->status == 'single')
 		{
-			dcPage::message(__('Single blog successfully imported.'));
+			echo '<p class="message">'.__('Single blog successfully imported.').'</p>';
 			return;
 		}
 		if ($this->status == 'full')
 		{
-			dcPage::message(__('Content successfully imported.'));
+			echo '<p class="message">'.__('Content successfully imported.').'</p>';
 			return;
 		}
-		
-		$public_files = array_merge(array('-' => ''),$this->getPublicFiles());
-		$has_files = (boolean) (count($public_files) - 1);
 		
 		echo
@@ -180,28 +155,29 @@
 		
 		echo
+		'<h3>'.__('Import a single blog').'</h3>'.
+		'<p>'.sprintf(__('This will import a single blog backup as new content in the current blog: %s.'),
+		'<strong>'.html::escapeHTML($this->core->blog->name).'</strong>').'</p>'.
 		'<form action="'.$this->getURL(true).'" method="post" enctype="multipart/form-data">'.
-		'<fieldset><legend>'.__('Single blog').'</legend>'.
-		'<p>'.sprintf(__('This will import a single blog backup as new content in the current blog: %s.'),html::escapeHTML($this->core->blog->name)).'</p>'.
-		
-		'<p><label for="up_single_file">'.__('Upload a backup file').
-		' ('.sprintf(__('Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.'</label>'.
-		'<input type="file" id="up_single_file" name="up_single_file" size="20" />'.
-		'</p>';
-		
-		if ($has_files) {
-			echo 
-			'<p><label for="public_single_file">'.__('or pick up a local file in your public directory').' '.
-			form::combo('public_single_file',$public_files).
-			'</label></p>';
-		}
-		
-		echo 
-		'<p>'.
+		
+		'<div class="fieldset">'.
 		$this->core->formNonce().
 		form::hidden(array('do'),1).
 		form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).
-		'<input type="submit" value="'.__('Import').'" /></p>'.
-		
-		'</fieldset>'.
+		'<p><label for="up_single_file">'.__('Upload a backup file').'</label>'.
+		'<input type="file" id="up_single_file" name="up_single_file" size="20" />'.
+		'</p>';
+		
+		$public_files = $this->getPublicFiles();
+		
+		$empty = empty($public_files);
+		$public_files = array_merge(array('-' => ''),$public_files);
+		echo
+		'<p><label for="public_single_file">'.__('or pick up a local file in your public directory').' '.
+		form::combo('public_single_file',$public_files, '', '', '', $empty).
+		'</label></p>';
+		
+		echo
+		'<p><input type="submit" value="'.__('Import').'" /></p>'.
+		'</div>'.
 		'</form>';
 		
@@ -209,31 +185,29 @@
 		{
 			echo
+			'<h3>'.__('Import a full backup file').'</h3>'.
 			'<form action="'.$this->getURL(true).'" method="post" enctype="multipart/form-data" id="formfull">'.
-			'<fieldset><legend>'.__('Multiple blogs').'</legend>'.
-			'<p>'.__('This will reset all the content of your database, except users.').'</p>'.
-			
-			'<p><label for="up_full_file">'.__('Upload a backup file').
-			' ('.sprintf(__('Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.'</label>'.
-			'<input type="file" id="up_full_file" name="up_full_file" size="20" />'.
-			'</p>';
-			
-			if ($has_files) {
-				echo 
-				'<p><label for="public_full_file">'.__('or pick up a local file in your public directory').'</label>'.
-				form::combo('public_full_file',$public_files).
-				'</p>';
-			}
-			
-			echo
-			'<p><label for="your_pwd" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label>'.
-			form::password('your_pwd',20,255).'</p>'.
-			
-			'<p>'.
+			'<div>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).'</div>'.
+			
+			'<div class="fieldset">'.
 			$this->core->formNonce().
 			form::hidden(array('do'),1).
 			form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).
-			'<input type="submit" value="'.__('Import').'" /></p>'.
-			
-			'</fieldset>'.
+			'<p><label for="up_full_file">'.__('Upload a backup file').'</label>'.
+			'<input type="file" id="up_full_file" name="up_full_file" size="20" />'.
+			'</p>';
+			
+			echo
+			'<p><label for="public_full_file">'.__('or pick up a local file in your public directory').'</label>'.
+			form::combo('public_full_file',$public_files, '', '', '', $empty).
+			'</p>';
+			
+			echo
+			'<p class="form-note warning"><strong>'.__('Warning: This will reset all the content of your database, except users.').'</strong></p>'.
+			
+			'<p><label for="your_pwd" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label>'.
+			form::password('your_pwd',20,255).'</p>'.
+			
+			'<p><input type="submit" value="'.__('Import').'" /></p>'.
+			'</div>'.
 			'</form>';
 		}
@@ -251,76 +225,13 @@
 				if (is_file($entry_path) && is_readable($entry_path))
 				{
-					# Do not test each zip file content here, its too long
-					if (substr($entry_path,-4) == '.zip') {
-							$public_files[$entry] = $entry_path;
-					}
-					elseif (self::checkFileContent($entry_path)) {
+					$fp = fopen($entry_path,'rb');
+					if (strpos(fgets($fp),'///DOTCLEAR|') === 0) {
 						$public_files[$entry] = $entry_path;
 					}
+					fclose($fp);
 				}
 			}
 		}
 		return $public_files;
-	}
-	
-	protected static function checkFileContent($entry_path)
-	{
-		$ret = false;
-		
-		$fp = fopen($entry_path,'rb');
-		$ret = strpos(fgets($fp),'///DOTCLEAR|') === 0;
-		fclose($fp);
-		
-		return $ret;
-	}
-	
-	private function unzip($file)
-	{
-		$zip = new fileUnzip($file);
-		
-		if ($zip->isEmpty()) {
-			$zip->close();
-			return false;//throw new Exception(__('File is empty or not a compressed file.'));
-		}
-		
-		foreach($zip->getFilesList() as $zip_file)
-		{
-			# Check zipped file name
-			if (substr($zip_file,-4) != '.txt') {
-				continue;
-			}
-			
-			# Check zipped file contents
-			$content = $zip->unzip($zip_file);
-			if (strpos($content,'///DOTCLEAR|') !== 0) {
-				unset($content);
-				continue;
-			}
-			
-			$target = path::fullFromRoot($zip_file,dirname($file));
-			
-			# Check existing files with same name
-			if (file_exists($target)) {
-				$zip->close();
-				unset($content);
-				throw new Exception(__('Another file with same name exists.'));
-			}
-			
-			# Extract backup content
-			if (file_put_contents($target,$content) === false) {
-				$zip->close();
-				unset($content);
-				throw new Exception(__('Failed to extract backup file.'));
-			}
-			
-			$zip->close();
-			unset($content);
-			
-			# Return extracted file name
-			return $target;
-		}
-		
-		$zip->close();
-		throw new Exception(__('No backup in compressed file.'));
 	}
 }
Index: plugins/importExport/inc/class.dc.import.wp.php
===================================================================
--- plugins/importExport/inc/class.dc.import.wp.php	(revision 840)
+++ plugins/importExport/inc/class.dc.import.wp.php	(revision 270)
@@ -2,7 +2,7 @@
 # -- BEGIN LICENSE BLOCK ---------------------------------------
 #
-# This file is part of importExport, a plugin for DotClear2.
+# This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -61,5 +61,5 @@
 	protected function setInfo()
 	{
-		$this->type = 'import';
+		$this->type = 'i';
 		$this->name = __('WordPress import');
 		$this->description = __('Import a WordPress installation into your current blog.');
@@ -621,12 +621,6 @@
 		
 		$cur->post_format = $this->vars['post_formater'];
-		$_post_content = explode('<!--more-->',$rs->post_content,2);
-		if (count($_post_content) == 1) {
-			$cur->post_excerpt = NULL;
-			$cur->post_content = $this->cleanStr(array_shift($_post_content));
-		} else {
-			$cur->post_excerpt = $this->cleanStr(array_shift($_post_content));
-			$cur->post_content = $this->cleanStr(array_shift($_post_content));
-		}
+		$cur->post_content = $this->cleanStr($rs->post_content);
+		$cur->post_excerpt = $this->cleanStr($rs->post_excerpt);
 		
 		$cur->post_content_xhtml = $this->core->callFormater($this->vars['post_formater'],$cur->post_content);
@@ -702,5 +696,5 @@
 			$cur->comment_trackback       = $rs->comment_type == 'trackback' ? 1 : 0;
 			$cur->comment_site = substr($this->cleanStr($rs->comment_author_url),0,255);
-			if ($cur->comment_site == '') $cur->comment_site = NULL;
+			if (!isset($cur->comment_site)) $cur->comment_site = NULL;
 			
 			if ($rs->comment_approved == 'spam') {
Index: plugins/importExport/inc/flat/class.backupFile.php
===================================================================
--- plugins/importExport/inc/flat/class.backupFile.php	(revision 270)
+++ plugins/importExport/inc/flat/class.backupFile.php	(revision 270)
@@ -0,0 +1,133 @@
+<?php
+# -- BEGIN LICENSE BLOCK ---------------------------------------
+#
+# This file is part of Dotclear 2.
+#
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
+# Licensed under the GPL version 2.0 license.
+# See LICENSE file or
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
+# -- END LICENSE BLOCK -----------------------------------------
+if (!defined('DC_RC_PATH')) { return; }
+
+class backupFile
+{
+	protected $fp;
+	private $line_cols = array();
+	private $line_name;
+	
+	private $replacement = array(
+		'/(?<!\\\\)(?>(\\\\\\\\)*+)(\\\\n)/u' => "\$1\n",
+		'/(?<!\\\\)(?>(\\\\\\\\)*+)(\\\\r)/u' => "\$1\r",
+		'/(?<!\\\\)(?>(\\\\\\\\)*+)(\\\\")/u' => '$1"',
+		'/(\\\\\\\\)/' => '\\'
+	);
+	
+	public function __construct($file)
+	{
+		if (file_exists($file) && is_readable($file)) {
+			$this->fp = fopen($file,'rb');
+		} else {
+			throw new Exception(__('No file to read.'));
+		}
+	}
+	
+	public function __destruct()
+	{
+		if ($this->fp) {
+			fclose($this->fp);
+		}
+	}
+	
+	public function getLine()
+	{
+		if (feof($this->fp)) {
+			return false;
+		}
+		
+		$line = trim(fgets($this->fp));
+		
+		if (substr($line,0,1) == '[')
+		{
+			$this->line_name = substr($line,1,strpos($line,' ')-1);
+			
+			$line = substr($line,strpos($line,' ')+1,-1);
+			$this->line_cols = explode(',',$line);
+			
+			return $this->getLine();
+		}
+		elseif (substr($line,0,1) == '"')
+		{
+			$line = preg_replace('/^"|"$/','',$line);
+			$line = preg_split('/(^"|","|"$)/m',$line);
+			
+			if (count($this->line_cols) != count($line)) {
+				throw new Exception('Invalid row count');
+			}
+			
+			$res = array();
+			
+			for ($i=0; $i<count($line); $i++) {
+				$res[$this->line_cols[$i]] =
+				preg_replace(array_keys($this->replacement),array_values($this->replacement),$line[$i]);
+			}
+			
+			return new backupFileItem($this->line_name,$res);
+		}
+		else
+		{
+			return $this->getLine();
+		}
+	}
+}
+
+class backupFileItem
+{
+	public $__name;
+	private $__data = array();
+	
+	public function __construct($name,$data)
+	{
+		$this->__name = $name;
+		$this->__data = $data;
+	}
+	
+	public function f($name)
+	{
+		return iconv('UTF-8','UTF-8//IGNORE',$this->__data[$name]);
+	}
+	
+	public function __get($name)
+	{
+		return $this->f($name);
+	}
+	
+	public function __set($n,$v)
+	{
+		$this->__data[$n] = $v;
+	}
+	
+	public function exists($n)
+	{
+		return isset($this->__data[$n]);
+	}
+	
+	public function drop()
+	{
+		foreach (func_get_args() as $n) {
+			if (isset($this->__data[$n])) {
+				unset($this->__data[$n]);
+			}
+		}
+	}
+	
+	public function substitute($old,$new)
+	{
+		if (isset($this->__data[$old])) {
+			$this->__data[$new] = $this->__data[$old];
+			unset($this->__data[$old]);
+		}
+	}
+}
+?>
Index: plugins/importExport/inc/flat/class.db.export.php
===================================================================
--- plugins/importExport/inc/flat/class.db.export.php	(revision 270)
+++ plugins/importExport/inc/flat/class.db.export.php	(revision 270)
@@ -0,0 +1,106 @@
+<?php
+# -- BEGIN LICENSE BLOCK ---------------------------------------
+#
+# This file is part of Dotclear 2.
+#
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
+# Licensed under the GPL version 2.0 license.
+# See LICENSE file or
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
+# -- END LICENSE BLOCK -----------------------------------------
+if (!defined('DC_RC_PATH')) { return; }
+
+class dbExport
+{
+	private $con;
+	private $prefix;
+	
+	private $line_reg = array('/\\\\/u',  '/\n/u','/\r/u','/"/u');
+	private $line_rep = array('\\\\\\\\', '\n'   ,'\r'   ,'\"');
+	
+	public $fp;
+	
+	function __construct($con,$out='php://output',$prefix=null)
+	{
+		$this->con =& $con;
+		$this->prefix = $prefix;
+		
+		if (($this->fp = fopen($out,'w')) === false) {
+			return false;
+		}
+		@set_time_limit(300);
+	}
+	
+	function __destruct()
+	{
+		if (is_resource($this->fp)) {
+			fclose($this->fp);
+		}
+	}
+	
+	function export($name,$sql)
+	{
+		$rs = $this->con->select($sql);
+		
+		if (!$rs->isEmpty())
+		{
+			fwrite($this->fp,"\n[".$name.' '.implode(',',$rs->columns())."]\n");
+			while ($rs->fetch()) {
+				fwrite($this->fp,$this->getLine($rs));
+			}
+			fflush($this->fp);
+		}
+	}
+	
+	function exportAll()
+	{
+		$tables = $this->getTables();
+		
+		foreach ($tables as $table)
+		{
+			$this->exportTable($table);
+		}
+	}
+	
+	function exportTable($table)
+	{
+		$req = 'SELECT * FROM '.$this->con->escapeSystem($this->prefix.$table);
+		
+		$this->export($table,$req);
+	}
+	
+	function getTables()
+	{
+		$schema = dbSchema::init($this->con);
+		$db_tables = $schema->getTables();
+		
+		$tables = array();
+		foreach ($db_tables as $t)
+		{
+			if ($this->prefix) {
+				if (strpos($t,$this->prefix) === 0) {
+					$tables[] = $t;
+				}
+			} else {
+				$tables[] = $t;
+			}
+		}
+		
+		return $tables;
+	}
+	
+	function getLine($rs)
+	{
+		$l = array();
+		$cols = $rs->columns();
+		foreach ($cols as $i => &$c) {
+			$s = $rs->f($c);
+			$s = preg_replace($this->line_reg,$this->line_rep,$s);
+			$s = '"'.$s.'"';
+			$l[$i] = $s;
+		}
+		return implode(',',$l)."\n";
+	}
+}
+?>
Index: plugins/importExport/inc/flat/class.dc.import.php
===================================================================
--- plugins/importExport/inc/flat/class.dc.import.php	(revision 298)
+++ plugins/importExport/inc/flat/class.dc.import.php	(revision 298)
@@ -0,0 +1,857 @@
+<?php
+# -- BEGIN LICENSE BLOCK ---------------------------------------
+#
+# This file is part of Dotclear 2.
+#
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
+# Licensed under the GPL version 2.0 license.
+# See LICENSE file or
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
+# -- END LICENSE BLOCK -----------------------------------------
+if (!defined('DC_RC_PATH')) { return; }
+
+class dcImport extends backupFile
+{
+	private $core;
+	private $con;
+	private $prefix;
+	
+	private $dc_version;
+	private $dc_major;
+	private $mode;
+	
+	private $blog_url;
+	private $blog_name;
+	private $blog_desc;
+	
+	private $users = array();
+	
+	public $old_ids = array(
+		'category' => array(),
+		'post' => array(),
+		'media' => array()
+	);
+	
+	public $stack = array(
+		'categories'=>null,
+		'cat_id'=>1,
+		'cat_lft'=>array(),
+		'post_id'=>1,
+		'media_id'=>1,
+		'comment_id'=>1,
+		'link_id'=>1
+	);
+	
+	public $has_categories = false;
+	
+	public function __construct($core,$file)
+	{
+		parent::__construct($file);
+		
+		$first_line = fgets($this->fp);
+		if (strpos($first_line,'///DOTCLEAR|') !== 0) {
+			throw new Exception(__('File is not a DotClear backup.'));
+		}
+		
+		@set_time_limit(300);
+		
+		$l = explode('|',$first_line);
+		
+		if (isset($l[1])) {
+			$this->dc_version = $l[1];
+		}
+		
+		$this->mode = isset($l[2]) ? strtolower(trim($l[2])) : 'single';
+		if ($this->mode != 'full' && $this->mode != 'single') {
+			$this->mode = 'single';
+		}
+		
+		if (version_compare('1.2',$this->dc_version,'<=') &&
+		version_compare('1.3',$this->dc_version,'>')) {
+			$this->dc_major_version = '1.2';
+		} else {
+			$this->dc_major_version = '2.0';
+		}
+		
+		$this->core =& $core;
+		$this->con =& $core->con;
+		$this->prefix = $core->prefix;
+		
+		$this->cur_blog        = $this->con->openCursor($this->prefix.'blog');
+		$this->cur_category    = $this->con->openCursor($this->prefix.'category');
+		$this->cur_link        = $this->con->openCursor($this->prefix.'link');
+		$this->cur_setting     = $this->con->openCursor($this->prefix.'setting');
+		$this->cur_user        = $this->con->openCursor($this->prefix.'user');
+		$this->cur_pref        = $this->con->openCursor($this->prefix.'pref');
+		$this->cur_permissions = $this->con->openCursor($this->prefix.'permissions');
+		$this->cur_post        = $this->con->openCursor($this->prefix.'post');
+		$this->cur_meta        = $this->con->openCursor($this->prefix.'meta');
+		$this->cur_media       = $this->con->openCursor($this->prefix.'media');
+		$this->cur_post_media  = $this->con->openCursor($this->prefix.'post_media');
+		$this->cur_log         = $this->con->openCursor($this->prefix.'log');
+		$this->cur_ping        = $this->con->openCursor($this->prefix.'ping');
+		$this->cur_comment     = $this->con->openCursor($this->prefix.'comment');
+		$this->cur_spamrule    = $this->con->openCursor($this->prefix.'spamrule');
+		$this->cur_version     = $this->con->openCursor($this->prefix.'version');
+		
+		# --BEHAVIOR-- importInit
+		$this->core->callBehavior('importInit',$this,$this->core);
+	}
+	
+	public function importSingle()
+	{
+		if ($this->mode != 'single') {
+			throw new Exception(__('File is not a single blog export.'));
+		}
+		
+		if (!$this->core->auth->check('admin',$this->core->blog->id)) {
+			throw new Exception(__('Permission denied.'));
+		}
+		
+		$this->blog_id = $this->core->blog->id;
+		
+		$this->stack['categories'] = $this->con->select(
+			'SELECT cat_id, cat_title, cat_url '.
+			'FROM '.$this->prefix.'category '.
+			"WHERE blog_id = '".$this->con->escape($this->blog_id)."' "
+		);
+		
+		$rs = $this->con->select('SELECT MAX(cat_id) FROM '.$this->prefix.'category');
+		$this->stack['cat_id'] = ((integer) $rs->f(0))+1;
+		
+		$rs = $this->con->select('SELECT MAX(link_id) FROM '.$this->prefix.'link');
+		$this->stack['link_id'] = ((integer) $rs->f(0))+1;
+		
+		$rs = $this->con->select('SELECT MAX(post_id) FROM '.$this->prefix.'post');
+		$this->stack['post_id'] = ((integer) $rs->f(0))+1;
+		
+		$rs = $this->con->select('SELECT MAX(media_id) FROM '.$this->prefix.'media');
+		$this->stack['media_id'] = ((integer) $rs->f(0))+1;
+		
+		$rs = $this->con->select('SELECT MAX(comment_id) FROM '.$this->prefix.'comment');
+		$this->stack['comment_id'] = ((integer) $rs->f(0))+1;
+		
+		$rs = $this->con->select(
+			'SELECT MAX(cat_rgt) AS cat_rgt FROM '.$this->prefix.'category '.
+			"WHERE blog_id = '".$this->con->escape($this->core->blog->id)."'"
+		);
+		
+		if ((integer) $rs->cat_rgt > 0) {
+			$this->has_categories = true;
+			$this->stack['cat_lft'][$this->core->blog->id] = (integer) $rs->cat_rgt + 1;
+		}
+		
+		$this->con->begin();
+		
+		try
+		{
+			$last_line_name = '';
+			$constrained = array('post', 'meta', 'post_media', 'ping', 'comment');
+			
+			while (($line = $this->getLine()) !== false)
+			{
+				# import DC 1.2.x, we fix lines before insert
+				if ($this->dc_major_version == '1.2') {
+					$this->prepareDC12line($line);
+				}
+				
+				if ($last_line_name != $line->__name) {
+					if (in_array($last_line_name,$constrained)) {
+						# UNDEFER
+						if ($this->con->driver() == 'mysql') $this->con->execute('SET foreign_key_checks = 1');
+						if ($this->con->driver() == 'pgsql') $this->con->execute('SET CONSTRAINTS ALL DEFERRED');
+					}
+					
+					if (in_array($line->__name,$constrained)) {
+						# DEFER
+						if ($this->con->driver() == 'mysql') $this->con->execute('SET foreign_key_checks = 0');
+						if ($this->con->driver() == 'pgsql') $this->con->execute('SET CONSTRAINTS ALL IMMEDIATE');
+					}
+					
+					$last_line_name = $line->__name;
+				}
+				
+				switch ($line->__name)
+				{
+					case 'category':
+						$this->insertCategorySingle($line);
+						break;
+					case 'link':
+						$this->insertLinkSingle($line);
+						break;
+					case 'post':
+						$this->insertPostSingle($line);
+						break;
+					case 'meta':
+						$this->insertMetaSingle($line);
+						break;
+					case 'media':
+						$this->insertMediaSingle($line);
+						break;
+					case 'post_media':
+						$this->insertPostMediaSingle($line);
+						break;
+					case 'ping':
+						$this->insertPingSingle($line);
+						break;
+					case 'comment':
+						$this->insertCommentSingle($line);
+						break;
+				}
+				
+				# --BEHAVIOR-- importSingle
+				$this->core->callBehavior('importSingle',$line,$this,$this->core);
+			}
+			
+			if ($this->con->driver() == 'mysql') $this->con->execute('SET foreign_key_checks = 1');
+			if ($this->con->driver() == 'pgsql') $this->con->execute('SET CONSTRAINTS ALL DEFERRED');
+		}
+		catch (Exception $e)
+		{
+			$this->con->rollback();
+			throw $e;
+		}
+		
+		$this->con->commit();
+	}
+	
+	public function importFull()
+	{
+		if ($this->mode != 'full') {
+			throw new Exception(__('File is not a full export.'));
+		}
+		
+		if (!$this->core->auth->isSuperAdmin()) {
+			throw new Exception(__('Permission denied.'));
+		}
+		
+		$this->con->begin();
+		$this->con->execute('DELETE FROM '.$this->prefix.'blog');
+		$this->con->execute('DELETE FROM '.$this->prefix.'media');
+		$this->con->execute('DELETE FROM '.$this->prefix.'spamrule');
+		$this->con->execute('DELETE FROM '.$this->prefix.'setting');
+		
+		try
+		{
+			while (($line = $this->getLine()) !== false)
+			{
+				switch ($line->__name)
+				{
+					case 'blog':
+						$this->insertBlog($line);
+						break;
+					case 'category':
+						$this->insertCategory($line);
+						break;
+					case 'link':
+						$this->insertLink($line);
+						break;
+					case 'setting':
+						$this->insertSetting($line);
+						break;
+					case 'user':
+						$this->insertUser($line);
+						break;
+					case 'pref':
+						$this->insertPref($line);
+						break;
+					case 'permissions':
+						$this->insertPermissions($line);
+						break;
+					case 'post':
+						$this->insertPost($line);
+						break;
+					case 'meta':
+						$this->insertMeta($line);
+						break;
+					case 'media':
+						$this->insertMedia($line);
+						break;
+					case 'post_media':
+						$this->insertPostMedia($line);
+						break;
+					case 'log';
+						$this->insertLog($line);
+						break;
+					case 'ping':
+						$this->insertPing($line);
+						break;
+					case 'comment':
+						$this->insertComment($line);
+						break;
+					case 'spamrule':
+						$this->insertSpamRule($line);
+						break;
+				}
+				# --BEHAVIOR-- importFull
+				$this->core->callBehavior('importFull',$line,$this,$this->core);
+			}
+		}
+		catch (Exception $e)
+		{
+			$this->con->rollback();
+			throw $e;
+		}
+		
+		$this->con->commit();
+	}
+	
+	private function insertBlog($blog)
+	{
+		$this->cur_blog->clean();
+		
+		$this->cur_blog->blog_id     = (string) $blog->blog_id;
+		$this->cur_blog->blog_uid    = (string) $blog->blog_uid;
+		$this->cur_blog->blog_creadt = (string) $blog->blog_creadt;
+		$this->cur_blog->blog_upddt  = (string) $blog->blog_upddt;
+		$this->cur_blog->blog_url    = (string) $blog->blog_url;
+		$this->cur_blog->blog_name   = (string) $blog->blog_name;
+		$this->cur_blog->blog_desc   = (string) $blog->blog_desc;
+		
+		$this->cur_blog->blog_status = $blog->exists('blog_status') ? (integer) $blog->blog_status : 1;
+		
+		$this->cur_blog->insert();
+	}
+	
+	private function insertCategory($category)
+	{
+		$this->cur_category->clean();
+		
+		$this->cur_category->cat_id       = (string) $category->cat_id;
+		$this->cur_category->blog_id      = (string) $category->blog_id;
+		$this->cur_category->cat_title    = (string) $category->cat_title;
+		$this->cur_category->cat_url      = (string) $category->cat_url;
+		$this->cur_category->cat_desc     = (string) $category->cat_desc;
+		
+		if (!$this->has_categories && $category->exists('cat_lft') && $category->exists('cat_rgt')) {
+			$this->cur_category->cat_lft = (integer) $category->cat_lft;
+			$this->cur_category->cat_rgt = (integer) $category->cat_rgt;
+		} else {
+			if (!isset($this->stack['cat_lft'][$category->blog_id])) {
+				$this->stack['cat_lft'][$category->blog_id] = 2;
+			}
+			$this->cur_category->cat_lft = $this->stack['cat_lft'][$category->blog_id]++;
+			$this->cur_category->cat_rgt = $this->stack['cat_lft'][$category->blog_id]++;
+		}
+		
+		$this->cur_category->insert();
+	}
+	
+	private function insertLink($link)
+	{
+		$this->cur_link->clean();
+		
+		$this->cur_link->link_id       = (integer) $link->link_id;
+		$this->cur_link->blog_id       = (string) $link->blog_id;
+		$this->cur_link->link_href     = (string) $link->link_href;
+		$this->cur_link->link_title    = (string) $link->link_title;
+		$this->cur_link->link_desc     = (string) $link->link_desc;
+		$this->cur_link->link_lang     = (string) $link->link_lang;
+		$this->cur_link->link_xfn      = (string) $link->link_xfn;
+		$this->cur_link->link_position = (integer) $link->link_position;
+		
+		$this->cur_link->insert();
+	}
+	
+	private function insertSetting($setting)
+	{
+		$this->cur_setting->clean();
+		
+		$this->cur_setting->setting_id    = (string) $setting->setting_id;
+		$this->cur_setting->blog_id       = !$setting->blog_id ? null : (string) $setting->blog_id;
+		$this->cur_setting->setting_ns    = (string) $setting->setting_ns;
+		$this->cur_setting->setting_value = (string) $setting->setting_value;
+		$this->cur_setting->setting_type  = (string) $setting->setting_type;
+		$this->cur_setting->setting_label = (string) $setting->setting_label;
+		
+		$this->cur_setting->insert();
+	}
+	
+	private function insertPref($pref)
+	{
+		if ($this->prefExists($pref->pref_ws,$pref->pref_id,$pref->user_id)) {
+			return;
+		}
+		
+		$this->cur_pref->clean();
+		
+		$this->cur_pref->pref_id    = (string) $pref->pref_id;
+		$this->cur_pref->user_id    = !$pref->user_id ? null : (string) $pref->user_id;
+		$this->cur_pref->pref_ws    = (string) $pref->pref_ws;
+		$this->cur_pref->pref_value = (string) $pref->pref_value;
+		$this->cur_pref->pref_type  = (string) $pref->pref_type;
+		$this->cur_pref->pref_label = (string) $pref->pref_label;
+		
+		$this->cur_pref->insert();
+	}
+	
+	private function insertUser($user)
+	{
+		if ($this->userExists($user->user_id)) {
+			return;
+		}
+		
+		$this->cur_user->clean();
+		
+		$this->cur_user->user_id           = (string) $user->user_id;
+		$this->cur_user->user_super        = (integer) $user->user_super;
+		$this->cur_user->user_pwd          = (string) $user->user_pwd;
+		$this->cur_user->user_recover_key  = (string) $user->user_recover_key;
+		$this->cur_user->user_name         = (string) $user->user_name;
+		$this->cur_user->user_firstname    = (string) $user->user_firstname;
+		$this->cur_user->user_displayname  = (string) $user->user_displayname;
+		$this->cur_user->user_email        = (string) $user->user_email;
+		$this->cur_user->user_url          = (string) $user->user_url;
+		$this->cur_user->user_default_blog = !$user->user_default_blog ? null : (string) $user->user_default_blog;
+		$this->cur_user->user_lang         = (string) $user->user_lang;
+		$this->cur_user->user_tz           = (string) $user->user_tz;
+		$this->cur_user->user_post_status  = (integer) $user->user_post_status;
+		$this->cur_user->user_creadt       = (string) $user->user_creadt;
+		$this->cur_user->user_upddt        = (string) $user->user_upddt;
+		
+		$this->cur_user->user_desc = $user->exists('user_desc') ? (string) $user->user_desc : null;
+		$this->cur_user->user_options = $user->exists('user_options') ? (string) $user->user_options : null;
+		$this->cur_user->user_status = $user->exists('user_status') ? (integer) $user->user_status : 1;
+		
+		$this->cur_user->insert();
+		
+		$this->stack['users'][$user->user_id] = true;
+	}
+	
+	private function insertPermissions($permissions)
+	{
+		$this->cur_permissions->clean();
+		
+		$this->cur_permissions->user_id     = (string) $permissions->user_id;
+		$this->cur_permissions->blog_id     = (string) $permissions->blog_id;
+		$this->cur_permissions->permissions = (string) $permissions->permissions;
+		
+		$this->cur_permissions->insert();
+	}
+	
+	private function insertPost($post)
+	{
+		$this->cur_post->clean();
+		
+		$cat_id = (integer) $post->cat_id;
+		if (!$cat_id) {
+			$cat_id = null;
+		}
+		
+		$post_password = $post->post_password ? (string) $post->post_password : null;
+		
+		$this->cur_post->post_id            = (integer) $post->post_id;
+		$this->cur_post->blog_id            = (string) $post->blog_id;
+		$this->cur_post->user_id            = (string) $this->getUserId($post->user_id);
+		$this->cur_post->cat_id             = $cat_id;
+		$this->cur_post->post_dt            = (string) $post->post_dt;
+		$this->cur_post->post_creadt        = (string) $post->post_creadt;
+		$this->cur_post->post_upddt         = (string) $post->post_upddt;
+		$this->cur_post->post_password      = $post_password;
+		$this->cur_post->post_type          = (string) $post->post_type;
+		$this->cur_post->post_format        = (string) $post->post_format;
+		$this->cur_post->post_url           = (string) $post->post_url;
+		$this->cur_post->post_lang          = (string) $post->post_lang;
+		$this->cur_post->post_title         = (string) $post->post_title;
+		$this->cur_post->post_excerpt       = (string) $post->post_excerpt;
+		$this->cur_post->post_excerpt_xhtml = (string) $post->post_excerpt_xhtml;
+		$this->cur_post->post_content       = (string) $post->post_content;
+		$this->cur_post->post_content_xhtml = (string) $post->post_content_xhtml;
+		$this->cur_post->post_notes         = (string) $post->post_notes;
+		$this->cur_post->post_words         = (string) $post->post_words;
+		$this->cur_post->post_meta          = (string) $post->post_meta;
+		$this->cur_post->post_status        = (integer) $post->post_status;
+		$this->cur_post->post_selected      = (integer) $post->post_selected;
+		$this->cur_post->post_open_comment  = (integer) $post->post_open_comment;
+		$this->cur_post->post_open_tb       = (integer) $post->post_open_tb;
+		$this->cur_post->nb_comment         = (integer) $post->nb_comment;
+		$this->cur_post->nb_trackback       = (integer) $post->nb_trackback;
+		
+		$this->cur_post->post_tz = $post->exists('post_tz') ? (string) $post->post_tz : 'UTC';
+		
+		$this->cur_post->insert();
+	}
+	
+	private function insertMeta($meta)
+	{
+		$this->cur_meta->clean();
+		
+		$this->cur_meta->meta_id   = (string) $meta->meta_id;
+		$this->cur_meta->meta_type = (string) $meta->meta_type;
+		$this->cur_meta->post_id   = (integer) $meta->post_id;
+		
+		$this->cur_meta->insert();
+	}
+	
+	private function insertMedia($media)
+	{
+		$this->cur_media->clean();
+		
+		$this->cur_media->media_id      = (integer) $media->media_id;
+		$this->cur_media->user_id       = (string) $media->user_id;
+		$this->cur_media->media_path    = (string) $media->media_path;
+		$this->cur_media->media_title   = (string) $media->media_title;
+		$this->cur_media->media_file    = (string) $media->media_file;
+		$this->cur_media->media_meta    = (string) $media->media_meta;
+		$this->cur_media->media_dt      = (string) $media->media_dt;
+		$this->cur_media->media_creadt  = (string) $media->media_creadt;
+		$this->cur_media->media_upddt   = (string) $media->media_upddt;
+		$this->cur_media->media_private = (integer) $media->media_private;
+		
+		$this->cur_media->media_dir = $media->exists('media_dir') ? (string) $media->media_dir : dirname($media->media_file);
+		
+		if (!$this->mediaExists()) {
+			$this->cur_media->insert();
+		}
+	}
+	
+	private function insertPostMedia($post_media)
+	{
+		$this->cur_post_media->clean();
+		
+		$this->cur_post_media->media_id = (integer) $post_media->media_id;
+		$this->cur_post_media->post_id  = (integer) $post_media->post_id;
+		
+		$this->cur_post_media->insert();
+	}
+	
+	private function insertLog($log)
+	{
+		$this->cur_log->clean();
+		
+		$this->cur_log->log_id    = (integer) $log->log_id;
+		$this->cur_log->user_id   = (string) $log->user_id;
+		$this->cur_log->log_table = (string) $log->log_table;
+		$this->cur_log->log_dt    = (string) $log->log_dt;
+		$this->cur_log->log_ip    = (string) $log->log_ip;
+		$this->cur_log->log_msg   = (string) $log->log_msg;
+		
+		$this->cur_log->insert();
+	}
+	
+	private function insertPing($ping)
+	{
+		$this->cur_ping->clean();
+		
+		$this->cur_ping->post_id  = (integer) $ping->post_id;
+		$this->cur_ping->ping_url = (string) $ping->ping_url;
+		$this->cur_ping->ping_dt  = (string) $ping->ping_dt;
+		
+		$this->cur_ping->insert();
+	}
+	
+	private function insertComment($comment)
+	{
+		$this->cur_comment->clean();
+		
+		$this->cur_comment->comment_id          = (integer) $comment->comment_id;
+		$this->cur_comment->post_id             = (integer) $comment->post_id;
+		$this->cur_comment->comment_dt          = (string) $comment->comment_dt;
+		$this->cur_comment->comment_upddt       = (string) $comment->comment_upddt;
+		$this->cur_comment->comment_author      = (string) $comment->comment_author;
+		$this->cur_comment->comment_email       = (string) $comment->comment_email;
+		$this->cur_comment->comment_site        = (string) $comment->comment_site;
+		$this->cur_comment->comment_content     = (string) $comment->comment_content;
+		$this->cur_comment->comment_words       = (string) $comment->comment_words;
+		$this->cur_comment->comment_ip          = (string) $comment->comment_ip;
+		$this->cur_comment->comment_status      = (integer) $comment->comment_status;
+		$this->cur_comment->comment_spam_status = (integer) $comment->comment_spam_status;
+		$this->cur_comment->comment_trackback   = (integer) $comment->comment_trackback;
+		
+		$this->cur_comment->comment_tz = $comment->exists('comment_tz') ? (string) $comment->comment_tz : 'UTC';
+		$this->cur_comment->comment_spam_filter = $comment->exists('comment_spam_filter') ? (integer) $comment->comment_spam_filter : null;
+		
+		$this->cur_comment->insert();
+	}
+	
+	private function insertSpamRule($spamrule)
+	{
+		$this->cur_spamrule->clean();
+		
+		$this->cur_spamrule->rule_id      = (integer) $spamrule->rule_id;
+		$this->cur_spamrule->blog_id      = !$spamrule->blog_id ? null : (string) $spamrule->blog_id;
+		$this->cur_spamrule->rule_type    = (string) $spamrule->rule_type;
+		$this->cur_spamrule->rule_content = (string) $spamrule->rule_content;
+		
+		$this->cur_spamrule->insert();
+	}
+	
+	private function insertCategorySingle($category)
+	{
+		$this->cur_category->clean();
+		
+		$m = $this->searchCategory($this->stack['categories'],$category->cat_url);
+		
+		$old_id = $category->cat_id;
+		if ($m !== false)
+		{
+			$cat_id = $m;
+		}
+		else
+		{
+			$cat_id = $this->stack['cat_id'];
+			$category->cat_id = $cat_id;
+			$category->blog_id = $this->blog_id;
+			
+			$this->insertCategory($category);
+			$this->stack['cat_id']++;
+		}
+		
+		$this->old_ids['category'][(integer) $old_id] = $cat_id;
+	}
+	
+	private function insertLinkSingle($link)
+	{
+		$link->blog_id = $this->blog_id;
+		$link->link_id = $this->stack['link_id'];
+		
+		$this->insertLink($link);
+		$this->stack['link_id']++;
+	}
+	
+	private function insertPostSingle($post)
+	{
+		if (!$post->cat_id || isset($this->old_ids['category'][(integer) $post->cat_id])) {
+			$post_id = $this->stack['post_id'];
+			$this->old_ids['post'][(integer) $post->post_id] = $post_id;
+			
+			$cat_id = $post->cat_id ? $this->old_ids['category'][(integer) $post->cat_id] : null;
+			
+			$post->post_id = $post_id;
+			$post->cat_id = $cat_id;
+			$post->blog_id = $this->blog_id;
+			
+			$post->post_url = $this->core->blog->getPostURL(
+				$post->post_url,$post->post_dt,$post->post_title,$post->post_id
+			);
+			
+			$this->insertPost($post);
+			$this->stack['post_id']++;
+		} else {
+			throw new Exception(__('The backup file does not appear to be well formed.'));
+		}
+	}
+	
+	private function insertMetaSingle($meta)
+	{
+		if (isset($this->old_ids['post'][(integer) $meta->post_id])) {
+			$meta->post_id = $this->old_ids['post'][(integer) $meta->post_id];
+			$this->insertMeta($meta);
+		} else {
+			throw new Exception(__('The backup file does not appear to be well formed.'));
+		}
+	}
+	
+	private function insertMediaSingle($media)
+	{
+		$media_id = $this->stack['media_id'];
+		$old_id = $media->media_id;
+		
+		$media->media_id = $media_id;
+		$media->media_path = $this->core->blog->settings->system->public_path;
+		$media->user_id = $this->getUserId($media->user_id);
+		
+		$this->insertMedia($media);
+		$this->stack['media_id']++;
+		$this->old_ids['media'][(integer) $old_id] = $media_id;
+	}
+	
+	private function insertPostMediaSingle($post_media)
+	{
+		if (isset($this->old_ids['media'][(integer) $post_media->media_id]) &&
+			isset($this->old_ids['post'][(integer) $post_media->post_id])) {
+			$post_media->media_id = $this->old_ids['media'][(integer) $post_media->media_id];
+			$post_media->post_id = $this->old_ids['post'][(integer) $post_media->post_id];
+			
+			$this->insertPostMedia($post_media);
+		} else {
+			throw new Exception(__('The backup file does not appear to be well formed.'));
+		}
+	}
+	
+	private function insertPingSingle($ping)
+	{
+		if (isset($this->old_ids['post'][(integer) $ping->post_id])) {
+			$ping->post_id = $this->old_ids['post'][(integer) $ping->post_id];
+			
+			$this->insertPing($ping);
+		} else {
+			throw new Exception(__('The backup file does not appear to be well formed.'));
+		}
+	}
+	
+	private function insertCommentSingle($comment)
+	{
+		if (isset($this->old_ids['post'][(integer) $comment->post_id])) {
+			$comment_id = $this->stack['comment_id'];
+			
+			$comment->comment_id = $comment_id;
+			$comment->post_id = $this->old_ids['post'][(integer) $comment->post_id];
+			
+			$this->insertComment($comment);
+			$this->stack['comment_id']++;
+		} else {
+			throw new Exception(__('The backup file does not appear to be well formed.'));
+		}
+	}
+	
+	public function searchCategory($rs,$url)
+	{
+		while ($rs->fetch())
+		{
+			if ($rs->cat_url == $url) {
+				return $rs->cat_id;
+			}
+		}
+		
+		return false;
+	}
+	
+	public function getUserId($user_id)
+	{
+		if (!$this->userExists($user_id))
+		{
+			if ($this->core->auth->isSuperAdmin())
+			{
+				# Sanitizes user_id and create a lambda user
+				$user_id = preg_replace('/[^A-Za-z0-9]$/','',$user_id);
+				$user_id .= strlen($user_id) < 2 ? '-a' : '';
+				
+				# We change user_id, we need to check again
+				if (!$this->userExists($user_id))
+				{
+					$this->cur_user->clean();
+					$this->cur_user->user_id = (string) $user_id;
+					$this->cur_user->user_pwd = md5(uniqid());
+					
+					$this->core->addUser($this->cur_user);
+					
+					$this->stack['users'][$user_id] = true;
+				}
+			}
+			else
+			{
+				# Returns current user id
+				$user_id = $this->core->auth->userID();
+			}
+		}
+		
+		return $user_id;
+	}
+	
+	private function userExists($user_id)
+	{
+		if (isset($this->stack['users'][$user_id])) {
+			return $this->stack['users'][$user_id];
+		}
+		
+		$strReq = 'SELECT user_id '.
+				'FROM '.$this->prefix.'user '.
+				"WHERE user_id = '".$this->con->escape($user_id)."' ";
+		
+		$rs = $this->con->select($strReq);
+		
+		$this->stack['users'][$user_id] = !$rs->isEmpty();
+		return $this->stack['users'][$user_id];
+	}
+	
+	private function prefExists($pref_ws,$pref_id,$user_id)
+	{
+		$strReq = 'SELECT pref_id,pref_ws,user_id '.
+				'FROM '.$this->prefix.'pref '.
+				"WHERE pref_id = '".$this->con->escape($pref_id)."' ".
+				"AND pref_ws = '".$this->con->escape($pref_ws)."' ";
+		if (!$user_id) {
+			$strReq .= "AND user_id IS NULL ";
+		} else {
+			$strReq .= "AND user_id = '".$this->con->escape($user_id)."' ";
+		}
+		
+		$rs = $this->con->select($strReq);
+		
+		return !$rs->isEmpty();
+	}
+	
+	private function mediaExists()
+	{
+		$strReq = 'SELECT media_id '.
+				'FROM '.$this->prefix.'media '.
+				"WHERE media_path = '".$this->cur_media->media_path."' ".
+				"AND media_file = '".$this->cur_media->media_file."' ";
+		
+		$rs = $this->con->select($strReq);
+		
+		return !$rs->isEmpty();
+	}
+	
+	private function prepareDC12line(&$line)
+	{
+		$settings = array('dc_theme','dc_nb_post_per_page','dc_allow_comments',
+		'dc_allow_trackbacks','dc_comment_pub','dc_comments_ttl',
+		'dc_wiki_comments','dc_use_smilies','dc_date_format','dc_time_format',
+		'dc_url_scan');
+		
+		switch ($line->__name)
+		{
+			case 'categorie':
+				$line->substitute('cat_libelle','cat_title');
+				$line->substitute('cat_libelle_url','cat_url');
+				$line->__name = 'category';
+				$line->blog_id = 'default';
+				break;
+			case 'link':
+				$line->substitute('href','link_href');
+				$line->substitute('label','link_title');
+				$line->substitute('title','link_desc');
+				$line->substitute('lang','link_lang');
+				$line->substitute('rel','link_xfn');
+				$line->substitute('position','link_position');
+				$line->blog_id = 'default';
+				break;
+			case 'post':
+				$line->substitute('post_titre','post_title');
+				$line->post_title = html::decodeEntities($line->post_title);
+				$line->post_url = date('Y/m/d/',strtotime($line->post_dt)).$line->post_id.'-'.$line->post_titre_url;
+				$line->post_url = substr($line->post_url,0,255);
+				$line->post_format = $line->post_content_wiki == '' ? 'xhtml' : 'wiki';
+				$line->post_content_xhtml = $line->post_content;
+				$line->post_excerpt_xhtml = $line->post_chapo;
+				
+				if ($line->post_format == 'wiki') {
+					$line->post_content = $line->post_content_wiki;
+					$line->post_excerpt = $line->post_chapo_wiki;
+				} else {
+					$line->post_content = $line->post_content;
+					$line->post_excerpt = $line->post_chapo;
+				}
+				
+				$line->post_status = (integer) $line->post_pub;
+				$line->post_type = 'post';
+				$line->blog_id = 'default';
+				
+				$line->drop('post_titre_url','post_content_wiki','post_chapo','post_chapo_wiki','post_pub');
+				
+				break;
+			case 'post_meta':
+				$line->drop('meta_id');
+				$line->substitute('meta_key','meta_type');
+				$line->substitute('meta_value','meta_id');
+				$line->__name = 'meta';
+				$line->blog_id = 'default';
+				break;
+			case 'comment':
+				$line->substitute('comment_auteur','comment_author');
+				if ($line->comment_site != '' && !preg_match('!^http://.*$!', $line->comment_site,$m)) {
+					$line->comment_site = 'http://'.$line->comment_site;
+				}
+				$line->comment_status = (integer) $line->comment_pub;
+				$line->drop('comment_pub');
+				break;
+		}
+		
+		# --BEHAVIOR-- importPrepareDC12
+		$this->core->callBehavior('importPrepareDC12',$line,$this,$this->core);
+	}
+}
+?>
Index: lugins/importExport/inc/flat/class.flat.backup.php
===================================================================
--- plugins/importExport/inc/flat/class.flat.backup.php	(revision 894)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?php
-# -- BEGIN LICENSE BLOCK ---------------------------------------
-#
-# This file is part of importExport, a plugin for DotClear2.
-#
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
-# Licensed under the GPL version 2.0 license.
-# See LICENSE file or
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-#
-# -- END LICENSE BLOCK -----------------------------------------
-if (!defined('DC_RC_PATH')) { return; }
-
-class flatBackup
-{
-	protected $fp;
-	private $line_cols = array();
-	private $line_name;
-	private $line_num;
-	
-	private $replacement = array(
-		'/(?<!\\\\)(?>(\\\\\\\\)*+)(\\\\n)/u' => "\$1\n",
-		'/(?<!\\\\)(?>(\\\\\\\\)*+)(\\\\r)/u' => "\$1\r",
-		'/(?<!\\\\)(?>(\\\\\\\\)*+)(\\\\")/u' => '$1"',
-		'/(\\\\\\\\)/' => '\\'
-	);
-	
-	public function __construct($file)
-	{
-		if (file_exists($file) && is_readable($file)) {
-			$this->fp = fopen($file,'rb');
-			$this->line_num = 1;
-		} else {
-			throw new Exception(__('No file to read.'));
-		}
-	}
-	
-	public function __destruct()
-	{
-		if ($this->fp) {
-			fclose($this->fp);
-		}
-	}
-	
-	public function getLine()
-	{
-		if (($line = $this->nextLine()) === false) {
-			return false;
-		}
-		
-		if (substr($line,0,1) == '[')
-		{
-			$this->line_name = substr($line,1,strpos($line,' ')-1);
-			
-			$line = substr($line,strpos($line,' ')+1,-1);
-			$this->line_cols = explode(',',$line);
-			
-			return $this->getLine();
-		}
-		elseif (substr($line,0,1) == '"')
-		{
-			$line = preg_replace('/^"|"$/','',$line);
-			$line = preg_split('/(^"|","|(?<!\\\)\"$)/m',$line);
-			
-			if (count($this->line_cols) != count($line)) {
-				throw new Exception(sprintf('Invalid row count at line %s',$this->line_num));
-			}
-			
-			$res = array();
-			
-			for ($i=0; $i<count($line); $i++) {
-				$res[$this->line_cols[$i]] =
-				preg_replace(array_keys($this->replacement),array_values($this->replacement),$line[$i]);
-			}
-			
-			return new flatBackupItem($this->line_name,$res,$this->line_num);
-		}
-		else
-		{
-			return $this->getLine();
-		}
-	}
-	
-	private function nextLine()
-	{
-		if (feof($this->fp)) {
-			return false;
-		}
-		$this->line_num++;
-		
-		$line = fgets($this->fp);
-		$line = trim($line);
-		
-		return empty($line) ? $this->nextLine() : $line;
-	}
-}
-
-class flatBackupItem
-{
-	public $__name;
-	public $__line;
-	private $__data = array();
-	
-	public function __construct($name,$data,$line)
-	{
-		$this->__name = $name;
-		$this->__data = $data;
-		$this->__line = $line;
-	}
-	
-	public function f($name)
-	{
-		return iconv('UTF-8','UTF-8//IGNORE',$this->__data[$name]);
-	}
-	
-	public function __get($name)
-	{
-		return $this->f($name);
-	}
-	
-	public function __set($n,$v)
-	{
-		$this->__data[$n] = $v;
-	}
-	
-	public function exists($n)
-	{
-		return isset($this->__data[$n]);
-	}
-	
-	public function drop()
-	{
-		foreach (func_get_args() as $n) {
-			if (isset($this->__data[$n])) {
-				unset($this->__data[$n]);
-			}
-		}
-	}
-	
-	public function substitute($old,$new)
-	{
-		if (isset($this->__data[$old])) {
-			$this->__data[$new] = $this->__data[$old];
-			unset($this->__data[$old]);
-		}
-	}
-}
-?>
Index: lugins/importExport/inc/flat/class.flat.export.php
===================================================================
--- plugins/importExport/inc/flat/class.flat.export.php	(revision 840)
+++ 	(revision )
@@ -1,106 +1,0 @@
-<?php
-# -- BEGIN LICENSE BLOCK ---------------------------------------
-#
-# This file is part of importExport, a plugin for DotClear2.
-#
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
-# Licensed under the GPL version 2.0 license.
-# See LICENSE file or
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-#
-# -- END LICENSE BLOCK -----------------------------------------
-if (!defined('DC_RC_PATH')) { return; }
-
-class flatExport
-{
-	private $con;
-	private $prefix;
-	
-	private $line_reg = array('/\\\\/u',  '/\n/u','/\r/u','/"/u');
-	private $line_rep = array('\\\\\\\\', '\n'   ,'\r'   ,'\"');
-	
-	public $fp;
-	
-	function __construct($con,$out='php://output',$prefix=null)
-	{
-		$this->con =& $con;
-		$this->prefix = $prefix;
-		
-		if (($this->fp = fopen($out,'w')) === false) {
-			return false;
-		}
-		@set_time_limit(300);
-	}
-	
-	function __destruct()
-	{
-		if (is_resource($this->fp)) {
-			fclose($this->fp);
-		}
-	}
-	
-	function export($name,$sql)
-	{
-		$rs = $this->con->select($sql);
-		
-		if (!$rs->isEmpty())
-		{
-			fwrite($this->fp,"\n[".$name.' '.implode(',',$rs->columns())."]\n");
-			while ($rs->fetch()) {
-				fwrite($this->fp,$this->getLine($rs));
-			}
-			fflush($this->fp);
-		}
-	}
-	
-	function exportAll()
-	{
-		$tables = $this->getTables();
-		
-		foreach ($tables as $table)
-		{
-			$this->exportTable($table);
-		}
-	}
-	
-	function exportTable($table)
-	{
-		$req = 'SELECT * FROM '.$this->con->escapeSystem($this->prefix.$table);
-		
-		$this->export($table,$req);
-	}
-	
-	function getTables()
-	{
-		$schema = dbSchema::init($this->con);
-		$db_tables = $schema->getTables();
-		
-		$tables = array();
-		foreach ($db_tables as $t)
-		{
-			if ($this->prefix) {
-				if (strpos($t,$this->prefix) === 0) {
-					$tables[] = $t;
-				}
-			} else {
-				$tables[] = $t;
-			}
-		}
-		
-		return $tables;
-	}
-	
-	function getLine($rs)
-	{
-		$l = array();
-		$cols = $rs->columns();
-		foreach ($cols as $i => &$c) {
-			$s = $rs->f($c);
-			$s = preg_replace($this->line_reg,$this->line_rep,$s);
-			$s = '"'.$s.'"';
-			$l[$i] = $s;
-		}
-		return implode(',',$l)."\n";
-	}
-}
-?>
Index: lugins/importExport/inc/flat/class.flat.import.php
===================================================================
--- plugins/importExport/inc/flat/class.flat.import.php	(revision 841)
+++ 	(revision )
@@ -1,869 +1,0 @@
-<?php
-# -- BEGIN LICENSE BLOCK ---------------------------------------
-#
-# This file is part of importExport, a plugin for DotClear2.
-#
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
-# Licensed under the GPL version 2.0 license.
-# See LICENSE file or
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-#
-# -- END LICENSE BLOCK -----------------------------------------
-if (!defined('DC_RC_PATH')) { return; }
-
-class flatImport extends flatBackup
-{
-	private $core;
-	private $con;
-	private $prefix;
-	
-	private $dc_version;
-	private $dc_major;
-	private $mode;
-	
-	private $blog_url;
-	private $blog_name;
-	private $blog_desc;
-	
-	private $users = array();
-	
-	public $old_ids = array(
-		'category' => array(),
-		'post' => array(),
-		'media' => array()
-	);
-	
-	public $stack = array(
-		'categories'=>null,
-		'cat_id'=>1,
-		'cat_lft'=>array(),
-		'post_id'=>1,
-		'media_id'=>1,
-		'comment_id'=>1,
-		'link_id'=>1
-	);
-	
-	public $has_categories = false;
-	
-	public function __construct($core,$file)
-	{
-		parent::__construct($file);
-		
-		$first_line = fgets($this->fp);
-		if (strpos($first_line,'///DOTCLEAR|') !== 0) {
-			throw new Exception(__('File is not a DotClear backup.'));
-		}
-		
-		@set_time_limit(300);
-		
-		$l = explode('|',$first_line);
-		
-		if (isset($l[1])) {
-			$this->dc_version = $l[1];
-		}
-		
-		$this->mode = isset($l[2]) ? strtolower(trim($l[2])) : 'single';
-		if ($this->mode != 'full' && $this->mode != 'single') {
-			$this->mode = 'single';
-		}
-		
-		if (version_compare('1.2',$this->dc_version,'<=') &&
-		version_compare('1.3',$this->dc_version,'>')) {
-			$this->dc_major_version = '1.2';
-		} else {
-			$this->dc_major_version = '2.0';
-		}
-		
-		$this->core =& $core;
-		$this->con =& $core->con;
-		$this->prefix = $core->prefix;
-		
-		$this->cur_blog        = $this->con->openCursor($this->prefix.'blog');
-		$this->cur_category    = $this->con->openCursor($this->prefix.'category');
-		$this->cur_link        = $this->con->openCursor($this->prefix.'link');
-		$this->cur_setting     = $this->con->openCursor($this->prefix.'setting');
-		$this->cur_user        = $this->con->openCursor($this->prefix.'user');
-		$this->cur_pref        = $this->con->openCursor($this->prefix.'pref');
-		$this->cur_permissions = $this->con->openCursor($this->prefix.'permissions');
-		$this->cur_post        = $this->con->openCursor($this->prefix.'post');
-		$this->cur_meta        = $this->con->openCursor($this->prefix.'meta');
-		$this->cur_media       = $this->con->openCursor($this->prefix.'media');
-		$this->cur_post_media  = $this->con->openCursor($this->prefix.'post_media');
-		$this->cur_log         = $this->con->openCursor($this->prefix.'log');
-		$this->cur_ping        = $this->con->openCursor($this->prefix.'ping');
-		$this->cur_comment     = $this->con->openCursor($this->prefix.'comment');
-		$this->cur_spamrule    = $this->con->openCursor($this->prefix.'spamrule');
-		$this->cur_version     = $this->con->openCursor($this->prefix.'version');
-		
-		# --BEHAVIOR-- importInit
-		$this->core->callBehavior('importInit',$this,$this->core);
-	}
-	
-	public function importSingle()
-	{
-		if ($this->mode != 'single') {
-			throw new Exception(__('File is not a single blog export.'));
-		}
-		
-		if (!$this->core->auth->check('admin',$this->core->blog->id)) {
-			throw new Exception(__('Permission denied.'));
-		}
-		
-		$this->blog_id = $this->core->blog->id;
-		
-		$this->stack['categories'] = $this->con->select(
-			'SELECT cat_id, cat_title, cat_url '.
-			'FROM '.$this->prefix.'category '.
-			"WHERE blog_id = '".$this->con->escape($this->blog_id)."' "
-		);
-		
-		$rs = $this->con->select('SELECT MAX(cat_id) FROM '.$this->prefix.'category');
-		$this->stack['cat_id'] = ((integer) $rs->f(0))+1;
-		
-		$rs = $this->con->select('SELECT MAX(link_id) FROM '.$this->prefix.'link');
-		$this->stack['link_id'] = ((integer) $rs->f(0))+1;
-		
-		$rs = $this->con->select('SELECT MAX(post_id) FROM '.$this->prefix.'post');
-		$this->stack['post_id'] = ((integer) $rs->f(0))+1;
-		
-		$rs = $this->con->select('SELECT MAX(media_id) FROM '.$this->prefix.'media');
-		$this->stack['media_id'] = ((integer) $rs->f(0))+1;
-		
-		$rs = $this->con->select('SELECT MAX(comment_id) FROM '.$this->prefix.'comment');
-		$this->stack['comment_id'] = ((integer) $rs->f(0))+1;
-		
-		$rs = $this->con->select(
-			'SELECT MAX(cat_rgt) AS cat_rgt FROM '.$this->prefix.'category '.
-			"WHERE blog_id = '".$this->con->escape($this->core->blog->id)."'"
-		);
-		
-		if ((integer) $rs->cat_rgt > 0) {
-			$this->has_categories = true;
-			$this->stack['cat_lft'][$this->core->blog->id] = (integer) $rs->cat_rgt + 1;
-		}
-		
-		$this->con->begin();
-		
-		try
-		{
-			$last_line_name = '';
-			$constrained = array('post', 'meta', 'post_media', 'ping', 'comment');
-			
-			while (($line = $this->getLine()) !== false)
-			{
-				# import DC 1.2.x, we fix lines before insert
-				if ($this->dc_major_version == '1.2') {
-					$this->prepareDC12line($line);
-				}
-				
-				if ($last_line_name != $line->__name) {
-					if (in_array($last_line_name,$constrained)) {
-						# UNDEFER
-						if ($this->con->driver() == 'mysql') $this->con->execute('SET foreign_key_checks = 1');
-						if ($this->con->driver() == 'pgsql') $this->con->execute('SET CONSTRAINTS ALL DEFERRED');
-					}
-					
-					if (in_array($line->__name,$constrained)) {
-						# DEFER
-						if ($this->con->driver() == 'mysql') $this->con->execute('SET foreign_key_checks = 0');
-						if ($this->con->driver() == 'pgsql') $this->con->execute('SET CONSTRAINTS ALL IMMEDIATE');
-					}
-					
-					$last_line_name = $line->__name;
-				}
-				
-				switch ($line->__name)
-				{
-					case 'category':
-						$this->insertCategorySingle($line);
-						break;
-					case 'link':
-						$this->insertLinkSingle($line);
-						break;
-					case 'post':
-						$this->insertPostSingle($line);
-						break;
-					case 'meta':
-						$this->insertMetaSingle($line);
-						break;
-					case 'media':
-						$this->insertMediaSingle($line);
-						break;
-					case 'post_media':
-						$this->insertPostMediaSingle($line);
-						break;
-					case 'ping':
-						$this->insertPingSingle($line);
-						break;
-					case 'comment':
-						$this->insertCommentSingle($line);
-						break;
-				}
-				
-				# --BEHAVIOR-- importSingle
-				$this->core->callBehavior('importSingle',$line,$this,$this->core);
-			}
-			
-			if ($this->con->driver() == 'mysql') $this->con->execute('SET foreign_key_checks = 1');
-			if ($this->con->driver() == 'pgsql') $this->con->execute('SET CONSTRAINTS ALL DEFERRED');
-		}
-		catch (Exception $e)
-		{
-			$this->con->rollback();
-			throw $e;
-		}
-		
-		$this->con->commit();
-	}
-	
-	public function importFull()
-	{
-		if ($this->mode != 'full') {
-			throw new Exception(__('File is not a full export.'));
-		}
-		
-		if (!$this->core->auth->isSuperAdmin()) {
-			throw new Exception(__('Permission denied.'));
-		}
-		
-		$this->con->begin();
-		$this->con->execute('DELETE FROM '.$this->prefix.'blog');
-		$this->con->execute('DELETE FROM '.$this->prefix.'media');
-		$this->con->execute('DELETE FROM '.$this->prefix.'spamrule');
-		$this->con->execute('DELETE FROM '.$this->prefix.'setting');
-		
-		try
-		{
-			while (($line = $this->getLine()) !== false)
-			{
-				switch ($line->__name)
-				{
-					case 'blog':
-						$this->insertBlog($line);
-						break;
-					case 'category':
-						$this->insertCategory($line);
-						break;
-					case 'link':
-						$this->insertLink($line);
-						break;
-					case 'setting':
-						$this->insertSetting($line);
-						break;
-					case 'user':
-						$this->insertUser($line);
-						break;
-					case 'pref':
-						$this->insertPref($line);
-						break;
-					case 'permissions':
-						$this->insertPermissions($line);
-						break;
-					case 'post':
-						$this->insertPost($line);
-						break;
-					case 'meta':
-						$this->insertMeta($line);
-						break;
-					case 'media':
-						$this->insertMedia($line);
-						break;
-					case 'post_media':
-						$this->insertPostMedia($line);
-						break;
-					case 'log';
-						$this->insertLog($line);
-						break;
-					case 'ping':
-						$this->insertPing($line);
-						break;
-					case 'comment':
-						$this->insertComment($line);
-						break;
-					case 'spamrule':
-						$this->insertSpamRule($line);
-						break;
-				}
-				# --BEHAVIOR-- importFull
-				$this->core->callBehavior('importFull',$line,$this,$this->core);
-			}
-		}
-		catch (Exception $e)
-		{
-			$this->con->rollback();
-			throw $e;
-		}
-		
-		$this->con->commit();
-	}
-	
-	private function insertBlog($blog)
-	{
-		$this->cur_blog->clean();
-		
-		$this->cur_blog->blog_id     = (string) $blog->blog_id;
-		$this->cur_blog->blog_uid    = (string) $blog->blog_uid;
-		$this->cur_blog->blog_creadt = (string) $blog->blog_creadt;
-		$this->cur_blog->blog_upddt  = (string) $blog->blog_upddt;
-		$this->cur_blog->blog_url    = (string) $blog->blog_url;
-		$this->cur_blog->blog_name   = (string) $blog->blog_name;
-		$this->cur_blog->blog_desc   = (string) $blog->blog_desc;
-		
-		$this->cur_blog->blog_status = $blog->exists('blog_status') ? (integer) $blog->blog_status : 1;
-		
-		$this->cur_blog->insert();
-	}
-	
-	private function insertCategory($category)
-	{
-		$this->cur_category->clean();
-		
-		$this->cur_category->cat_id       = (string) $category->cat_id;
-		$this->cur_category->blog_id      = (string) $category->blog_id;
-		$this->cur_category->cat_title    = (string) $category->cat_title;
-		$this->cur_category->cat_url      = (string) $category->cat_url;
-		$this->cur_category->cat_desc     = (string) $category->cat_desc;
-		
-		if (!$this->has_categories && $category->exists('cat_lft') && $category->exists('cat_rgt')) {
-			$this->cur_category->cat_lft = (integer) $category->cat_lft;
-			$this->cur_category->cat_rgt = (integer) $category->cat_rgt;
-		} else {
-			if (!isset($this->stack['cat_lft'][$category->blog_id])) {
-				$this->stack['cat_lft'][$category->blog_id] = 2;
-			}
-			$this->cur_category->cat_lft = $this->stack['cat_lft'][$category->blog_id]++;
-			$this->cur_category->cat_rgt = $this->stack['cat_lft'][$category->blog_id]++;
-		}
-		
-		$this->cur_category->insert();
-	}
-	
-	private function insertLink($link)
-	{
-		$this->cur_link->clean();
-		
-		$this->cur_link->link_id       = (integer) $link->link_id;
-		$this->cur_link->blog_id       = (string) $link->blog_id;
-		$this->cur_link->link_href     = (string) $link->link_href;
-		$this->cur_link->link_title    = (string) $link->link_title;
-		$this->cur_link->link_desc     = (string) $link->link_desc;
-		$this->cur_link->link_lang     = (string) $link->link_lang;
-		$this->cur_link->link_xfn      = (string) $link->link_xfn;
-		$this->cur_link->link_position = (integer) $link->link_position;
-		
-		$this->cur_link->insert();
-	}
-	
-	private function insertSetting($setting)
-	{
-		$this->cur_setting->clean();
-		
-		$this->cur_setting->setting_id    = (string) $setting->setting_id;
-		$this->cur_setting->blog_id       = !$setting->blog_id ? null : (string) $setting->blog_id;
-		$this->cur_setting->setting_ns    = (string) $setting->setting_ns;
-		$this->cur_setting->setting_value = (string) $setting->setting_value;
-		$this->cur_setting->setting_type  = (string) $setting->setting_type;
-		$this->cur_setting->setting_label = (string) $setting->setting_label;
-		
-		$this->cur_setting->insert();
-	}
-	
-	private function insertPref($pref)
-	{
-		if ($this->prefExists($pref->pref_ws,$pref->pref_id,$pref->user_id)) {
-			return;
-		}
-		
-		$this->cur_pref->clean();
-		
-		$this->cur_pref->pref_id    = (string) $pref->pref_id;
-		$this->cur_pref->user_id    = !$pref->user_id ? null : (string) $pref->user_id;
-		$this->cur_pref->pref_ws    = (string) $pref->pref_ws;
-		$this->cur_pref->pref_value = (string) $pref->pref_value;
-		$this->cur_pref->pref_type  = (string) $pref->pref_type;
-		$this->cur_pref->pref_label = (string) $pref->pref_label;
-		
-		$this->cur_pref->insert();
-	}
-	
-	private function insertUser($user)
-	{
-		if ($this->userExists($user->user_id)) {
-			return;
-		}
-		
-		$this->cur_user->clean();
-		
-		$this->cur_user->user_id           = (string) $user->user_id;
-		$this->cur_user->user_super        = (integer) $user->user_super;
-		$this->cur_user->user_pwd          = (string) $user->user_pwd;
-		$this->cur_user->user_recover_key  = (string) $user->user_recover_key;
-		$this->cur_user->user_name         = (string) $user->user_name;
-		$this->cur_user->user_firstname    = (string) $user->user_firstname;
-		$this->cur_user->user_displayname  = (string) $user->user_displayname;
-		$this->cur_user->user_email        = (string) $user->user_email;
-		$this->cur_user->user_url          = (string) $user->user_url;
-		$this->cur_user->user_default_blog = !$user->user_default_blog ? null : (string) $user->user_default_blog;
-		$this->cur_user->user_lang         = (string) $user->user_lang;
-		$this->cur_user->user_tz           = (string) $user->user_tz;
-		$this->cur_user->user_post_status  = (integer) $user->user_post_status;
-		$this->cur_user->user_creadt       = (string) $user->user_creadt;
-		$this->cur_user->user_upddt        = (string) $user->user_upddt;
-		
-		$this->cur_user->user_desc = $user->exists('user_desc') ? (string) $user->user_desc : null;
-		$this->cur_user->user_options = $user->exists('user_options') ? (string) $user->user_options : null;
-		$this->cur_user->user_status = $user->exists('user_status') ? (integer) $user->user_status : 1;
-		
-		$this->cur_user->insert();
-		
-		$this->stack['users'][$user->user_id] = true;
-	}
-	
-	private function insertPermissions($permissions)
-	{
-		$this->cur_permissions->clean();
-		
-		$this->cur_permissions->user_id     = (string) $permissions->user_id;
-		$this->cur_permissions->blog_id     = (string) $permissions->blog_id;
-		$this->cur_permissions->permissions = (string) $permissions->permissions;
-		
-		$this->cur_permissions->insert();
-	}
-	
-	private function insertPost($post)
-	{
-		$this->cur_post->clean();
-		
-		$cat_id = (integer) $post->cat_id;
-		if (!$cat_id) {
-			$cat_id = null;
-		}
-		
-		$post_password = $post->post_password ? (string) $post->post_password : null;
-		
-		$this->cur_post->post_id            = (integer) $post->post_id;
-		$this->cur_post->blog_id            = (string) $post->blog_id;
-		$this->cur_post->user_id            = (string) $this->getUserId($post->user_id);
-		$this->cur_post->cat_id             = $cat_id;
-		$this->cur_post->post_dt            = (string) $post->post_dt;
-		$this->cur_post->post_creadt        = (string) $post->post_creadt;
-		$this->cur_post->post_upddt         = (string) $post->post_upddt;
-		$this->cur_post->post_password      = $post_password;
-		$this->cur_post->post_type          = (string) $post->post_type;
-		$this->cur_post->post_format        = (string) $post->post_format;
-		$this->cur_post->post_url           = (string) $post->post_url;
-		$this->cur_post->post_lang          = (string) $post->post_lang;
-		$this->cur_post->post_title         = (string) $post->post_title;
-		$this->cur_post->post_excerpt       = (string) $post->post_excerpt;
-		$this->cur_post->post_excerpt_xhtml = (string) $post->post_excerpt_xhtml;
-		$this->cur_post->post_content       = (string) $post->post_content;
-		$this->cur_post->post_content_xhtml = (string) $post->post_content_xhtml;
-		$this->cur_post->post_notes         = (string) $post->post_notes;
-		$this->cur_post->post_words         = (string) $post->post_words;
-		$this->cur_post->post_meta          = (string) $post->post_meta;
-		$this->cur_post->post_status        = (integer) $post->post_status;
-		$this->cur_post->post_selected      = (integer) $post->post_selected;
-		$this->cur_post->post_open_comment  = (integer) $post->post_open_comment;
-		$this->cur_post->post_open_tb       = (integer) $post->post_open_tb;
-		$this->cur_post->nb_comment         = (integer) $post->nb_comment;
-		$this->cur_post->nb_trackback       = (integer) $post->nb_trackback;
-		
-		$this->cur_post->post_tz = $post->exists('post_tz') ? (string) $post->post_tz : 'UTC';
-		
-		$this->cur_post->insert();
-	}
-	
-	private function insertMeta($meta)
-	{
-		$this->cur_meta->clean();
-		
-		$this->cur_meta->meta_id   = (string) $meta->meta_id;
-		$this->cur_meta->meta_type = (string) $meta->meta_type;
-		$this->cur_meta->post_id   = (integer) $meta->post_id;
-		
-		$this->cur_meta->insert();
-	}
-	
-	private function insertMedia($media)
-	{
-		$this->cur_media->clean();
-		
-		$this->cur_media->media_id      = (integer) $media->media_id;
-		$this->cur_media->user_id       = (string) $media->user_id;
-		$this->cur_media->media_path    = (string) $media->media_path;
-		$this->cur_media->media_title   = (string) $media->media_title;
-		$this->cur_media->media_file    = (string) $media->media_file;
-		$this->cur_media->media_meta    = (string) $media->media_meta;
-		$this->cur_media->media_dt      = (string) $media->media_dt;
-		$this->cur_media->media_creadt  = (string) $media->media_creadt;
-		$this->cur_media->media_upddt   = (string) $media->media_upddt;
-		$this->cur_media->media_private = (integer) $media->media_private;
-		
-		$this->cur_media->media_dir = $media->exists('media_dir') ? (string) $media->media_dir : dirname($media->media_file);
-		
-		if (!$this->mediaExists()) {
-			$this->cur_media->insert();
-		}
-	}
-	
-	private function insertPostMedia($post_media)
-	{
-		$this->cur_post_media->clean();
-		
-		$this->cur_post_media->media_id = (integer) $post_media->media_id;
-		$this->cur_post_media->post_id  = (integer) $post_media->post_id;
-		
-		$this->cur_post_media->insert();
-	}
-	
-	private function insertLog($log)
-	{
-		$this->cur_log->clean();
-		
-		$this->cur_log->log_id    = (integer) $log->log_id;
-		$this->cur_log->user_id   = (string) $log->user_id;
-		$this->cur_log->log_table = (string) $log->log_table;
-		$this->cur_log->log_dt    = (string) $log->log_dt;
-		$this->cur_log->log_ip    = (string) $log->log_ip;
-		$this->cur_log->log_msg   = (string) $log->log_msg;
-		
-		$this->cur_log->insert();
-	}
-	
-	private function insertPing($ping)
-	{
-		$this->cur_ping->clean();
-		
-		$this->cur_ping->post_id  = (integer) $ping->post_id;
-		$this->cur_ping->ping_url = (string) $ping->ping_url;
-		$this->cur_ping->ping_dt  = (string) $ping->ping_dt;
-		
-		$this->cur_ping->insert();
-	}
-	
-	private function insertComment($comment)
-	{
-		$this->cur_comment->clean();
-		
-		$this->cur_comment->comment_id          = (integer) $comment->comment_id;
-		$this->cur_comment->post_id             = (integer) $comment->post_id;
-		$this->cur_comment->comment_dt          = (string) $comment->comment_dt;
-		$this->cur_comment->comment_upddt       = (string) $comment->comment_upddt;
-		$this->cur_comment->comment_author      = (string) $comment->comment_author;
-		$this->cur_comment->comment_email       = (string) $comment->comment_email;
-		$this->cur_comment->comment_site        = (string) $comment->comment_site;
-		$this->cur_comment->comment_content     = (string) $comment->comment_content;
-		$this->cur_comment->comment_words       = (string) $comment->comment_words;
-		$this->cur_comment->comment_ip          = (string) $comment->comment_ip;
-		$this->cur_comment->comment_status      = (integer) $comment->comment_status;
-		$this->cur_comment->comment_spam_status = (integer) $comment->comment_spam_status;
-		$this->cur_comment->comment_trackback   = (integer) $comment->comment_trackback;
-		
-		$this->cur_comment->comment_tz = $comment->exists('comment_tz') ? (string) $comment->comment_tz : 'UTC';
-		$this->cur_comment->comment_spam_filter = $comment->exists('comment_spam_filter') ? (integer) $comment->comment_spam_filter : null;
-		
-		$this->cur_comment->insert();
-	}
-	
-	private function insertSpamRule($spamrule)
-	{
-		$this->cur_spamrule->clean();
-		
-		$this->cur_spamrule->rule_id      = (integer) $spamrule->rule_id;
-		$this->cur_spamrule->blog_id      = !$spamrule->blog_id ? null : (string) $spamrule->blog_id;
-		$this->cur_spamrule->rule_type    = (string) $spamrule->rule_type;
-		$this->cur_spamrule->rule_content = (string) $spamrule->rule_content;
-		
-		$this->cur_spamrule->insert();
-	}
-	
-	private function insertCategorySingle($category)
-	{
-		$this->cur_category->clean();
-		
-		$m = $this->searchCategory($this->stack['categories'],$category->cat_url);
-		
-		$old_id = $category->cat_id;
-		if ($m !== false)
-		{
-			$cat_id = $m;
-		}
-		else
-		{
-			$cat_id = $this->stack['cat_id'];
-			$category->cat_id = $cat_id;
-			$category->blog_id = $this->blog_id;
-			
-			$this->insertCategory($category);
-			$this->stack['cat_id']++;
-		}
-		
-		$this->old_ids['category'][(integer) $old_id] = $cat_id;
-	}
-	
-	private function insertLinkSingle($link)
-	{
-		$link->blog_id = $this->blog_id;
-		$link->link_id = $this->stack['link_id'];
-		
-		$this->insertLink($link);
-		$this->stack['link_id']++;
-	}
-	
-	private function insertPostSingle($post)
-	{
-		if (!$post->cat_id || isset($this->old_ids['category'][(integer) $post->cat_id])) {
-			$post_id = $this->stack['post_id'];
-			$this->old_ids['post'][(integer) $post->post_id] = $post_id;
-			
-			$cat_id = $post->cat_id ? $this->old_ids['category'][(integer) $post->cat_id] : null;
-			
-			$post->post_id = $post_id;
-			$post->cat_id = $cat_id;
-			$post->blog_id = $this->blog_id;
-			
-			$post->post_url = $this->core->blog->getPostURL(
-				$post->post_url,$post->post_dt,$post->post_title,$post->post_id
-			);
-			
-			$this->insertPost($post);
-			$this->stack['post_id']++;
-		} else {
-			self::throwIdError($post->__name,$post->__line,'category');
-		}
-	}
-	
-	private function insertMetaSingle($meta)
-	{
-		if (isset($this->old_ids['post'][(integer) $meta->post_id])) {
-			$meta->post_id = $this->old_ids['post'][(integer) $meta->post_id];
-			$this->insertMeta($meta);
-		} else {
-			self::throwIdError($meta->__name,$meta->__line,'post');
-		}
-	}
-	
-	private function insertMediaSingle($media)
-	{
-		$media_id = $this->stack['media_id'];
-		$old_id = $media->media_id;
-		
-		$media->media_id = $media_id;
-		$media->media_path = $this->core->blog->settings->system->public_path;
-		$media->user_id = $this->getUserId($media->user_id);
-		
-		$this->insertMedia($media);
-		$this->stack['media_id']++;
-		$this->old_ids['media'][(integer) $old_id] = $media_id;
-	}
-	
-	private function insertPostMediaSingle($post_media)
-	{
-		if (isset($this->old_ids['media'][(integer) $post_media->media_id]) &&
-			isset($this->old_ids['post'][(integer) $post_media->post_id])) {
-			$post_media->media_id = $this->old_ids['media'][(integer) $post_media->media_id];
-			$post_media->post_id = $this->old_ids['post'][(integer) $post_media->post_id];
-			
-			$this->insertPostMedia($post_media);
-		} elseif (!isset($this->old_ids['media'][(integer) $post_media->media_id])) {
-			self::throwIdError($post_media->__name,$post_media->__line,'media');
-		}else {
-			self::throwIdError($post_media->__name,$post_media->__line,'post');
-		}
-	}
-	
-	private function insertPingSingle($ping)
-	{
-		if (isset($this->old_ids['post'][(integer) $ping->post_id])) {
-			$ping->post_id = $this->old_ids['post'][(integer) $ping->post_id];
-			
-			$this->insertPing($ping);
-		} else {
-			self::throwIdError($ping->__name,$ping->__line,'post');
-		}
-	}
-	
-	private function insertCommentSingle($comment)
-	{
-		if (isset($this->old_ids['post'][(integer) $comment->post_id])) {
-			$comment_id = $this->stack['comment_id'];
-			
-			$comment->comment_id = $comment_id;
-			$comment->post_id = $this->old_ids['post'][(integer) $comment->post_id];
-			
-			$this->insertComment($comment);
-			$this->stack['comment_id']++;
-		} else {
-			self::throwIdError($comment->__name,$comment->__line,'post');
-		}
-	}
-	
-	private static function throwIdError($name,$line,$related)
-	{
-		throw new Exception(sprintf(
-			__('ID of "%3$s" does not match on record "%1$s" at line %2$s of backup file.'),
-			html::escapeHTML($name),
-			html::escapeHTML($line),
-			html::escapeHTML($related)
-		));
-	}
-	
-	public function searchCategory($rs,$url)
-	{
-		while ($rs->fetch())
-		{
-			if ($rs->cat_url == $url) {
-				return $rs->cat_id;
-			}
-		}
-		
-		return false;
-	}
-	
-	public function getUserId($user_id)
-	{
-		if (!$this->userExists($user_id))
-		{
-			if ($this->core->auth->isSuperAdmin())
-			{
-				# Sanitizes user_id and create a lambda user
-				$user_id = preg_replace('/[^A-Za-z0-9]$/','',$user_id);
-				$user_id .= strlen($user_id) < 2 ? '-a' : '';
-				
-				# We change user_id, we need to check again
-				if (!$this->userExists($user_id))
-				{
-					$this->cur_user->clean();
-					$this->cur_user->user_id = (string) $user_id;
-					$this->cur_user->user_pwd = md5(uniqid());
-					
-					$this->core->addUser($this->cur_user);
-					
-					$this->stack['users'][$user_id] = true;
-				}
-			}
-			else
-			{
-				# Returns current user id
-				$user_id = $this->core->auth->userID();
-			}
-		}
-		
-		return $user_id;
-	}
-	
-	private function userExists($user_id)
-	{
-		if (isset($this->stack['users'][$user_id])) {
-			return $this->stack['users'][$user_id];
-		}
-		
-		$strReq = 'SELECT user_id '.
-				'FROM '.$this->prefix.'user '.
-				"WHERE user_id = '".$this->con->escape($user_id)."' ";
-		
-		$rs = $this->con->select($strReq);
-		
-		$this->stack['users'][$user_id] = !$rs->isEmpty();
-		return $this->stack['users'][$user_id];
-	}
-	
-	private function prefExists($pref_ws,$pref_id,$user_id)
-	{
-		$strReq = 'SELECT pref_id,pref_ws,user_id '.
-				'FROM '.$this->prefix.'pref '.
-				"WHERE pref_id = '".$this->con->escape($pref_id)."' ".
-				"AND pref_ws = '".$this->con->escape($pref_ws)."' ";
-		if (!$user_id) {
-			$strReq .= "AND user_id IS NULL ";
-		} else {
-			$strReq .= "AND user_id = '".$this->con->escape($user_id)."' ";
-		}
-		
-		$rs = $this->con->select($strReq);
-		
-		return !$rs->isEmpty();
-	}
-	
-	private function mediaExists()
-	{
-		$strReq = 'SELECT media_id '.
-				'FROM '.$this->prefix.'media '.
-				"WHERE media_path = '".$this->cur_media->media_path."' ".
-				"AND media_file = '".$this->cur_media->media_file."' ";
-		
-		$rs = $this->con->select($strReq);
-		
-		return !$rs->isEmpty();
-	}
-	
-	private function prepareDC12line(&$line)
-	{
-		$settings = array('dc_theme','dc_nb_post_per_page','dc_allow_comments',
-		'dc_allow_trackbacks','dc_comment_pub','dc_comments_ttl',
-		'dc_wiki_comments','dc_use_smilies','dc_date_format','dc_time_format',
-		'dc_url_scan');
-		
-		switch ($line->__name)
-		{
-			case 'categorie':
-				$line->substitute('cat_libelle','cat_title');
-				$line->substitute('cat_libelle_url','cat_url');
-				$line->__name = 'category';
-				$line->blog_id = 'default';
-				break;
-			case 'link':
-				$line->substitute('href','link_href');
-				$line->substitute('label','link_title');
-				$line->substitute('title','link_desc');
-				$line->substitute('lang','link_lang');
-				$line->substitute('rel','link_xfn');
-				$line->substitute('position','link_position');
-				$line->blog_id = 'default';
-				break;
-			case 'post':
-				$line->substitute('post_titre','post_title');
-				$line->post_title = html::decodeEntities($line->post_title);
-				$line->post_url = date('Y/m/d/',strtotime($line->post_dt)).$line->post_id.'-'.$line->post_titre_url;
-				$line->post_url = substr($line->post_url,0,255);
-				$line->post_format = $line->post_content_wiki == '' ? 'xhtml' : 'wiki';
-				$line->post_content_xhtml = $line->post_content;
-				$line->post_excerpt_xhtml = $line->post_chapo;
-				
-				if ($line->post_format == 'wiki') {
-					$line->post_content = $line->post_content_wiki;
-					$line->post_excerpt = $line->post_chapo_wiki;
-				} else {
-					$line->post_content = $line->post_content;
-					$line->post_excerpt = $line->post_chapo;
-				}
-				
-				$line->post_status = (integer) $line->post_pub;
-				$line->post_type = 'post';
-				$line->blog_id = 'default';
-				
-				$line->drop('post_titre_url','post_content_wiki','post_chapo','post_chapo_wiki','post_pub');
-				
-				break;
-			case 'post_meta':
-				$line->drop('meta_id');
-				$line->substitute('meta_key','meta_type');
-				$line->substitute('meta_value','meta_id');
-				$line->__name = 'meta';
-				$line->blog_id = 'default';
-				break;
-			case 'comment':
-				$line->substitute('comment_auteur','comment_author');
-				if ($line->comment_site != '' && !preg_match('!^http://.*$!', $line->comment_site,$m)) {
-					$line->comment_site = 'http://'.$line->comment_site;
-				}
-				$line->comment_status = (integer) $line->comment_pub;
-				$line->drop('comment_pub');
-				break;
-		}
-		
-		# --BEHAVIOR-- importPrepareDC12
-		$this->core->callBehavior('importPrepareDC12',$line,$this,$this->core);
-	}
-}
-?>
Index: plugins/importExport/index.php
===================================================================
--- plugins/importExport/index.php	(revision 840)
+++ plugins/importExport/index.php	(revision 696)
@@ -2,7 +2,7 @@
 # -- BEGIN LICENSE BLOCK ---------------------------------------
 #
-# This file is part of importExport, a plugin for DotClear2.
+# This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2012 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -12,12 +12,107 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-function listImportExportModules($core,$modules)
+require dirname(__FILE__).'/inc/class.dc.ieModule.php';
+
+$modules = new ArrayObject();
+$modules['i'] = new ArrayObject(array(
+	'dcImportFlat' => dirname(__FILE__).'/inc/class.dc.import.flat.php',
+	'dcImportFeed' => dirname(__FILE__).'/inc/class.dc.import.feed.php'
+));
+$modules['e'] = new ArrayObject(array(
+	'dcExportFlat' => dirname(__FILE__).'/inc/class.dc.export.flat.php'
+));
+
+if ($core->auth->isSuperAdmin()) {
+	$modules['i']['dcImportDC1']  = dirname(__FILE__).'/inc/class.dc.import.dc1.php';
+	$modules['i']['dcImportWP']  = dirname(__FILE__).'/inc/class.dc.import.wp.php';
+}
+
+# --BEHAVIOR-- importExportModules
+$core->callBehavior('importExportModules',$modules);
+
+$type = null;
+if (!empty($_REQUEST['t']) && ($_REQUEST['t'] == 'e' || $_REQUEST['t'] == 'i')) {
+	$type = $_REQUEST['t'];
+}
+
+$current_module = null;
+if ($type && !empty($_REQUEST['f'])) {
+	if (isset($modules[$type][$_REQUEST['f']])) {
+		require_once $modules[$type][$_REQUEST['f']];
+		$current_module = new $_REQUEST['f']($core);
+		$current_module->init();
+	}
+}
+
+if ($type && $current_module !== null && !empty($_REQUEST['do']))
 {
-	$res = '';
-	foreach ($modules as $id)
+	try {
+		$current_module->process($_REQUEST['do']);
+	} catch (Exception $e) {
+		$core->error->add($e->getMessage());
+	}
+}
+?>
+<html>
+<head>
+	<title><?php echo __('Import/Export'); ?></title>
+	<style type="text/css">
+	dl.modules dt {
+		font-weight: bold;
+		font-size: 1.1em;
+		margin: 1em 0 0 0;
+	}
+	dl.modules dd {
+		margin: 0 0 1.5em 0;
+	}
+	div.ie-progress {
+		background: #eee;
+		margin: 1em 0;
+	}
+	div.ie-progress div {
+		height: 10px;
+		width: 0;
+		font-size: 0.8em;
+		line-height: 1em;
+		height: 1em;
+		padding: 2px 0;
+		text-align: right;
+		background: green url(index.php?pf=importExport/progress.png) repeat-x top left;
+		color: white;
+		font-weight: bold;
+		-moz-border-radius: 2px;
+	}
+	</style>
+	<script type="text/javascript" src="index.php?pf=importExport/script.js"></script>
+	<script type="text/javascript">
+	//<![CDATA[
+	dotclear.msg.please_wait = '<?php echo html::escapeJS(__("Please wait...")); ?>';
+	//]]>
+	</script>
+</head>
+<body>
+
+<?php
+if ($type && $current_module !== null)
+{
+	echo '<h2><a href="'.$p_url.'">'.__('Import/Export').'</a>'.
+	' &rsaquo; <span class="page-title">'.html::escapeHTML($current_module->name).'</span></h2>';
+	
+	echo '<div id="ie-gui">';
+	$current_module->gui();
+	echo '</div>';
+}
+else
+{
+	echo '<h2 class="page-title">'.__('Import/Export').'</h2>';
+	echo '<h3>'.__('Import').'</h3>';
+	
+	echo '<dl class="modules">';
+	foreach ($modules['i'] as $k => $v)
 	{
-		$o = new $id($core);
+		require_once $v;
+		$o = new $k($core);
 		
-		$res .= 
+		echo 
 		'<dt><a href="'.$o->getURL(true).'">'.html::escapeHTML($o->name).'</a></dt>'.
 		'<dd>'.html::escapeHTML($o->description).'</dd>';
@@ -25,71 +120,24 @@
 		unset($o);
 	}
-	return '<dl class="modules">'.$res.'</dl>';
+	echo '</dl>';
+	
+	echo '<h3>'.__('Export').'</h3>';
+	
+	echo '<dl class="modules">';
+	foreach ($modules['e'] as $k => $v)
+	{
+		require_once $v;
+		$o = new $k($core);
+		
+		echo 
+		'<dt><a href="'.$o->getURL(true).'">'.html::escapeHTML($o->name).'</a></dt>'.
+		'<dd>'.html::escapeHTML($o->description).'</dd>';
+		
+		unset($o);
+	}
+	echo '</dl>';
 }
+?>
 
-$modules = new ArrayObject(array('import' => array(),'export' => array()));
-
-# --BEHAVIOR-- importExportModules
-$core->callBehavior('importExportModules',$modules);
-
-$type = null;
-if (!empty($_REQUEST['type'])  && in_array($_REQUEST['type'],array('export','import'))) {
-	$type = $_REQUEST['type'];
-}
-
-$module = null;
-if ($type && !empty($_REQUEST['module'])) {
-
-	if (isset($modules[$type]) && in_array($_REQUEST['module'],$modules[$type])) {
-	
-		$module = new $_REQUEST['module']($core);
-		$module->init();
-	}
-}
-
-if ($type && $module !== null && !empty($_REQUEST['do']))
-{
-	try {
-		$module->process($_REQUEST['do']);
-	} catch (Exception $e) {
-		$core->error->add($e->getMessage());
-	}
-}
-
-$title = __('Import/Export');
-
-echo '
-<html>
-<head>
-	<title>'.$title.'</title>
-	<link rel="stylesheet" type="text/css" href="index.php?pf=importExport/style.css" />
-	'.dcPage::jsLoad('index.php?pf=importExport/js/script.js').'
-	<script type="text/javascript">
-	//<![CDATA[
-	'.dcPage::jsVar('dotclear.msg.please_wait',__('Please wait...')).'
-	//]]>
-	</script>
-</head>
-<body>';
-
-if ($type && $module !== null) {
-	echo
-	'<h2><a href="'.$p_url.'">'.$title.'</a>'.
-	' &rsaquo; <span class="page-title">'.html::escapeHTML($module->name).'</span></h2>'.
-	'<div id="ie-gui">';
-	
-	$module->gui();
-	
-	echo '</div>';
-}
-else {
-	echo
-	'<h2 class="page-title">'.$title.'</h2>'.
-	'<h3>'.__('Import').'</h3>'.listImportExportModules($core,$modules['import']).
-	'<h3>'.__('Export').'</h3>'.listImportExportModules($core,$modules['export']);
-}
-
-echo '
 </body>
-</html>';
-?>
+</html>
Index: lugins/importExport/js/script.js
===================================================================
--- plugins/importExport/js/script.js	(revision 840)
+++ 	(revision )
@@ -1,3 +1,0 @@
-
-$(function(){if($('*.error').length>0){return;}
-$('#ie-gui form[method=post]:has(input[type=hidden][name=autosubmit])').each(function(){$('input[type=submit]',this).remove();$(this).after('<p style="font-size:2em;text-align:center">'+dotclear.msg.please_wait+'</p>');$(this).submit();});});
Index: lugins/importExport/locales/fr/main.po
===================================================================
--- plugins/importExport/locales/fr/main.po	(revision 841)
+++ 	(revision )
@@ -1,333 +1,0 @@
-# Language: Français
-# Module: importExport - 3.1
-# Date: 2012-07-09 14:37:32
-# Translated with translater 1.5
-
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: importExport 3.1\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2012-07-09T14:37:32+00:00\n"
-"Last-Translator: Jean-Christian Denis\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: _admin.php:15
-#: _admin.php:28
-#: index.php:59
-msgid "Import/Export"
-msgstr "Import/Export"
-
-#: inc/class.dc.export.flat.php:19
-msgid "Flat file export"
-msgstr "Exporter un fichier texte"
-
-#: inc/class.dc.export.flat.php:20
-msgid "Exports a blog or a full Dotclear installation to flat file."
-msgstr "Exporte un blog ou toutes les données de Dotclear dans un fichier texte."
-
-#: inc/class.dc.export.flat.php:140
-msgid "Export file not found."
-msgstr "Fichier d'export non trouvé."
-
-#: inc/class.dc.export.flat.php:184
-msgid "Failed to compress export file."
-msgstr "Impossible de compresser le fichier d'export."
-
-#: inc/class.dc.export.flat.php:194
-#: inc/class.dc.import.feed.php:84
-#: inc/class.dc.import.flat.php:183
-msgid "Single blog"
-msgstr "Un seul blog"
-
-#: inc/class.dc.export.flat.php:195
-msgid "This will create an export of your current blog: %s"
-msgstr "Ceci va exporter le contenu du blog en cours : %s."
-
-#: inc/class.dc.export.flat.php:197
-#: inc/class.dc.export.flat.php:223
-msgid "File name:"
-msgstr "Nom du fichier :"
-
-#: inc/class.dc.export.flat.php:203
-#: inc/class.dc.export.flat.php:229
-msgid "Compress file"
-msgstr "Compresser le fichier"
-
-#: inc/class.dc.export.flat.php:207
-msgid "You may also want to download your media directory as a zip file"
-msgstr "Vous pouvez également télécharger votre répertoire de médias au format zip."
-
-#: inc/class.dc.export.flat.php:209
-#: inc/class.dc.export.flat.php:232
-#: index.php:89
-msgid "Export"
-msgstr "Exporter"
-
-#: inc/class.dc.export.flat.php:220
-#: inc/class.dc.import.flat.php:211
-msgid "Multiple blogs"
-msgstr "Tous les blogs"
-
-#: inc/class.dc.export.flat.php:221
-msgid "This will create an export of all the content of your database."
-msgstr "Ceci va exporter le contenu complet de votre base de données."
-
-#: inc/class.dc.ieModule.php:74
-msgid "Congratulation!"
-msgstr "Félicitations !"
-
-#: inc/class.dc.ieModule.php:75
-msgid "Your blog has been successfully imported. Welcome on Dotclear 2!"
-msgstr "Votre blog a été importé avec succès. Bienvenue sur Dotclear 2 !"
-
-#: inc/class.dc.ieModule.php:76
-msgid "Why don't you blog this now?"
-msgstr "Pourquoi ne pas le bloguer maintenant ?"
-
-#: inc/class.dc.ieModule.php:77
-msgid "or"
-msgstr "ou"
-
-#: inc/class.dc.ieModule.php:77
-msgid "visit your dashboard"
-msgstr "vous rendre sur votre tableau de bord"
-
-#: inc/class.dc.import.dc1.php:43
-msgid "Dotclear 1.2 import"
-msgstr "Importer depuis Dotclear 1.2"
-
-#: inc/class.dc.import.dc1.php:44
-msgid "Import a Dotclear 1.2 installation into your current blog."
-msgstr "Importe un blog Dotclear 1.2 dans votre blog en cours."
-
-#: inc/class.dc.import.dc1.php:145
-msgid "This will import your Dotclear 1.2 content as new content in the current blog: %s."
-msgstr "Ceci va importer votre blog Dotclear 1.2 comme un nouveau contenu dans le blog en cours : %s."
-
-#: inc/class.dc.import.dc1.php:149
-#: inc/class.dc.import.wp.php:180
-msgid "Depending on the size of your blog, it could take a few minutes."
-msgstr "Selon la taille de votre blog, ceci peut prendre quelques minutes."
-
-#: inc/class.dc.import.dc1.php:151
-#: inc/class.dc.import.wp.php:182
-msgid "General information"
-msgstr "Informations générales"
-
-#: inc/class.dc.import.dc1.php:151
-#: inc/class.dc.import.wp.php:182
-msgid "Import my blog now"
-msgstr "Importer mon blog"
-
-#: inc/class.dc.import.dc1.php:152
-msgid "We first need some information about your old Dotclear 1.2 installation."
-msgstr "Nous avons d'abord besoin de renseignements à propos de votre ancienne installation Dotclear 1.2."
-
-#: inc/class.dc.import.dc1.php:163
-#: inc/class.dc.import.wp.php:194
-msgid "Entries import options"
-msgstr "Options d'importation des billets"
-
-#: inc/class.dc.import.dc1.php:164
-#: inc/class.dc.import.wp.php:212
-msgid "Number of entries to import at once:"
-msgstr "Nombre de billets à importer à chaque étape :"
-
-#: inc/class.dc.import.dc1.php:169
-#: inc/class.dc.import.wp.php:222
-msgid "Importing users"
-msgstr "Importe les utilisateurs"
-
-#: inc/class.dc.import.dc1.php:174
-#: inc/class.dc.import.wp.php:227
-msgid "Importing categories"
-msgstr "Importe les catégories"
-
-#: inc/class.dc.import.dc1.php:179
-#: inc/class.dc.import.wp.php:232
-msgid "Importing blogroll"
-msgstr "Importe les liens"
-
-#: inc/class.dc.import.dc1.php:184
-#: inc/class.dc.import.wp.php:237
-msgid "Importing entries from %d to %d / %d"
-msgstr "Importation des billets %d à %d"
-
-#: inc/class.dc.import.dc1.php:193
-msgid "Please read carefully"
-msgstr "Merci de lire attentivement"
-
-#: inc/class.dc.import.dc1.php:214
-#: inc/class.dc.import.wp.php:258
-msgid "next step"
-msgstr "étape suivante"
-
-#: inc/class.dc.import.dc1.php:242
-msgid "Dotclear tables not found"
-msgstr "Tables Dotclear non trouvées"
-
-#: inc/class.dc.import.feed.php:22
-msgid "Feed import"
-msgstr "Importer depuis un flux"
-
-#: inc/class.dc.import.feed.php:23
-msgid "Imports a feed as new entries."
-msgstr "Importe un flux comme nouveaux billets."
-
-#: inc/class.dc.import.feed.php:41
-msgid "Cannot retrieve feed URL."
-msgstr "Impossible d'atteindre l'URL du fil."
-
-#: inc/class.dc.import.feed.php:44
-msgid "No items in feed."
-msgstr "Aucun élément dans le fil."
-
-#: inc/class.dc.import.feed.php:79
-#: inc/class.dc.import.flat.php:149
-msgid "Content successfully imported."
-msgstr "Contenu importé avec succès."
-
-#: inc/class.dc.import.feed.php:85
-msgid "This will import a feed (RSS or Atom) a as new content in the current blog: %s."
-msgstr "Ceci va importer un fil (RSS ou Atom) comme un nouveau contenu dans le blog en cours : %s."
-
-#: inc/class.dc.import.feed.php:87
-msgid "Feed URL:"
-msgstr "URL du fil :"
-
-#: inc/class.dc.import.feed.php:93
-#: inc/class.dc.import.flat.php:202
-#: inc/class.dc.import.flat.php:233
-#: index.php:88
-msgid "Import"
-msgstr "Importer"
-
-#: inc/class.dc.import.flat.php:21
-msgid "Flat file import"
-msgstr "Importer depuis un fichier texte"
-
-#: inc/class.dc.import.flat.php:22
-msgid "Imports a blog or a full Dotclear installation from flat file."
-msgstr "Importe un blog ou toutes les données depuis un fichier texte."
-
-#: inc/class.dc.import.flat.php:144
-msgid "Single blog successfully imported."
-msgstr "Blog importé avec succès."
-
-#: inc/class.dc.import.flat.php:160
-msgid "Are you sure you want to import a full backup file?"
-msgstr "Êtes-vous certain de vouloir charger un fichier de sauvegarde complet ?"
-
-#: inc/class.dc.import.flat.php:184
-msgid "This will import a single blog backup as new content in the current blog: %s."
-msgstr "Ceci va charger une sauvegarde de blog comme un nouveau contenu dans le blog en cours : %s."
-
-#: inc/class.dc.import.flat.php:186
-#: inc/class.dc.import.flat.php:214
-msgid "Upload a backup file"
-msgstr "Charger un fichier de sauvegarde"
-
-#: inc/class.dc.import.flat.php:192
-#: inc/class.dc.import.flat.php:220
-msgid "or pick up a local file in your public directory"
-msgstr "ou choisissez un fichier local dans votre répertoire public"
-
-#: inc/class.dc.import.flat.php:212
-msgid "This will reset all the content of your database, except users."
-msgstr "Ceci va remettre à zéro tout le contenu, sauf les utilisateurs."
-
-#: inc/class.dc.import.flat.php:281
-msgid "File is empty or not a compressed file."
-msgstr "Le Fichier est vide ou n'est pas un fichier compressé."
-
-#: inc/class.dc.import.flat.php:304
-msgid "Another file with same name exists."
-msgstr "Un autre fichier du même nom existe déjà."
-
-#: inc/class.dc.import.flat.php:311
-msgid "Failed to extract backup file."
-msgstr "Impossible d'extraire le fichier de sauvegarde."
-
-#: inc/class.dc.import.flat.php:322
-msgid "No backup in compressed file."
-msgstr "Pas de sauvegarde dans le fichier compressé."
-
-#: inc/class.dc.import.wp.php:64
-msgid "WordPress import"
-msgstr "Importer depuis WordPress"
-
-#: inc/class.dc.import.wp.php:65
-msgid "Import a WordPress installation into your current blog."
-msgstr "Importe un blog WordPress dans votre blog en cours."
-
-#: inc/class.dc.import.wp.php:176
-msgid "This will import your WordPress content as new content in the current blog: %s."
-msgstr "Ceci va importer votre blog WordPress comme un nouveau contenu dans le blog en cours : %s."
-
-#: inc/class.dc.import.wp.php:183
-msgid "We first need some information about your old WordPress installation."
-msgstr "Nous avons d'abord besoin de renseignements à propos de votre ancienne installation WordPress."
-
-#: inc/class.dc.import.wp.php:205
-msgid "Ignore the first category:"
-msgstr "Ignorer la première catégorie :"
-
-#: inc/class.dc.import.wp.php:207
-msgid "Import lowest numbered category on posts:"
-msgstr "Importer la catégorie la plus ancienne sur les articles :"
-
-#: inc/class.dc.import.wp.php:209
-msgid "Import all categories as tags:"
-msgstr "Importer les catégories comme des mots-clés :"
-
-#: inc/class.dc.import.wp.php:210
-msgid "Prefix such tags with:"
-msgstr "Préfixer ces mots-clés avec :"
-
-#: inc/class.dc.import.wp.php:215
-msgid "Content filters"
-msgstr "Filtres de contenu"
-
-#: inc/class.dc.import.wp.php:216
-msgid "You may want to process your post and/or comment content with the following filters."
-msgstr "Vous pouvez utiliser les filtres suivants sur vos articles et/ou commentaires."
-
-#: inc/class.dc.import.wp.php:217
-msgid "Post content formatter:"
-msgstr "Formatage des articles :"
-
-#: inc/class.dc.import.wp.php:218
-msgid "Comment content formatter:"
-msgstr "Formatage des commentaires :"
-
-#: inc/class.dc.import.wp.php:286
-msgid "WordPress tables not found"
-msgstr "Tables WordPress non trouvées"
-
-#: inc/flat/class.flat.backup.php:34
-msgid "No file to read."
-msgstr "Aucun fichier lisible."
-
-#: inc/flat/class.flat.import.php:54
-msgid "File is not a DotClear backup."
-msgstr "Le fichier n'est pas une sauvegarde DotClear."
-
-#: inc/flat/class.flat.import.php:105
-msgid "File is not a single blog export."
-msgstr "Le fichier n'est pas un fichier d'export simple."
-
-#: inc/flat/class.flat.import.php:222
-msgid "File is not a full export."
-msgstr "Le fichier n'est pas un fichier d'export complet."
-
-#: inc/flat/class.flat.import.php:704
-msgid "ID of \"%3$s\" does not match on record \"%1$s\" at line %2$s of backup file."
-msgstr "L'ID de \"%3$s\" ne correspond pas dans l'enregistrement de \"%1$s\" à la ligne %2$s du fichier de sauvegarde."
-
-#: index.php:69
-msgid "Please wait..."
-msgstr "Veuillez patienter..."
-
Index: plugins/importExport/script.js
===================================================================
--- plugins/importExport/script.js	(revision 0)
+++ plugins/importExport/script.js	(revision 0)
@@ -0,0 +1,11 @@
+$(function() {
+	if ($('*.error').length > 0) {
+		return;
+	}
+	
+	$('#ie-gui form[method=post]:has(input[type=hidden][name=autosubmit])').each(function() {
+		$('input[type=submit]',this).remove();
+		$(this).after('<p style="font-size:2em;text-align:center">' + dotclear.msg.please_wait + '</p>');
+		$(this).submit();
+	});
+});
Index: lugins/importExport/style.css
===================================================================
--- plugins/importExport/style.css	(revision 951)
+++ 	(revision )
@@ -1,28 +1,0 @@
-dl.modules dt {
-	font-weight: bold;
-	font-size: 1.1em;
-	margin: 1em 0 0 0;
-}
-dl.modules dd {
-	margin: 0 0 1.5em 0;
-}
-div.ie-progress {
-	background: #eee;
-	margin: 1em 0;
-}
-div.ie-progress div {
-	height: 10px;
-	width: 0;
-	font-size: 0.8em;
-	line-height: 1em;
-	height: 1em;
-	padding: 2px 0;
-	text-align: right;
-	background: green url(index.php?pf=importExport/progress.png) repeat-x top left;
-	color: white;
-	font-weight: bold;
-	border-radius: 2px;
-	-o-border-radius: 2px;
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-}
Index: plugins/maintenance/_define.php
===================================================================
--- plugins/maintenance/_define.php	(revision 967)
+++ plugins/maintenance/_define.php	(revision 464)
@@ -16,5 +16,5 @@
 	/* Description*/		"Maintain your database",
 	/* Author */			"Olivier Meunier",
-	/* Version */			'1.2'
+	/* Version */			'1.1'
 );
 ?>
Index: plugins/maintenance/index.php
===================================================================
--- plugins/maintenance/index.php	(revision 907)
+++ plugins/maintenance/index.php	(revision 500)
@@ -73,14 +73,14 @@
 <?php
 if (!empty($_GET['vacuum'])) {
-	dcPage::message(__('Optimization successful.'));
+	echo '<p class="message">'.__('Optimization successful.').'</p>';
 }
 if (!empty($_GET['commentscount'])) {
-	dcPage::message(__('Comments and trackback counted.'));
+	echo '<p class="message">'.__('Comments and trackback counted.').'</p>';
 }
 if (!empty($_GET['empty_cache'])) {
-	dcPage::message(__('Templates cache directory emptied.'));
+	echo '<p class="message">'.__('Templates cache directory emptied.').'</p>';
 }
 if (!empty($_GET['delete_logs'])) {
-	dcPage::message(__('Logs deleted.'));
+	echo '<p class="message">'.__('Logs deleted.').'</p>';
 }
 
@@ -105,5 +105,5 @@
 	else
 	{
-		dcPage::message(__('Entries index done.'));
+		echo '<p class="message">'.__('Entries index done.').'</p>';
 		echo '<p><a class="back" href="'.$p_url.'">'.__('Back').'</a></p>';
 	}
@@ -129,5 +129,5 @@
 	else
 	{
-		dcPage::message(__('Comments index done.'));
+		echo '<p class="message">'.__('Comments index done.').'</p>';
 		echo '<p><a class="back" href="'.$p_url.'">'.__('Back').'</a></p>';
 	}
Index: plugins/pages/_define.php
===================================================================
--- plugins/pages/_define.php	(revision 965)
+++ plugins/pages/_define.php	(revision 464)
@@ -16,5 +16,5 @@
 	/* Description*/	"Serve entries as simple web pages",
 	/* Author */		"Olivier Meunier",
-	/* Version */		'1.2',
+	/* Version */		'1.1.1',
 	array(
 		'permissions' =>	'contentadmin,pages',
Index: plugins/pages/_prepend.php
===================================================================
--- plugins/pages/_prepend.php	(revision 857)
+++ plugins/pages/_prepend.php	(revision 776)
@@ -12,6 +12,4 @@
 if (!defined('DC_RC_PATH')) { return; }
 
-global $core;
-
 $core->url->register('pages','pages','^pages/(.+)$',array('urlPages','pages'));
 $core->url->register('pagespreview','pagespreview','^pagespreview/(.+)$',array('urlPages','pagespreview'));
Index: plugins/pages/_public.php
===================================================================
--- plugins/pages/_public.php	(revision 945)
+++ plugins/pages/_public.php	(revision 727)
@@ -221,6 +221,5 @@
 		global $core, $_ctx;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
+		if ($w->homeonly && $core->url->type != 'default') {
 			return;
 		}
@@ -229,5 +228,4 @@
 		$params['limit'] = abs((integer) $w->limit);
 		$params['no_content'] = true;
-		$params['post_selected'] = false;
 		
 		$sort = $w->sortby;
@@ -249,5 +247,5 @@
 		
 		$res =
-		'<div class="pages'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">'.
+		'<div class="pages">'.
 		($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
 		'<ul>';
Index: plugins/pages/_widgets.php
===================================================================
--- plugins/pages/_widgets.php	(revision 954)
+++ plugins/pages/_widgets.php	(revision 270)
@@ -19,13 +19,7 @@
 	public static function initWidgets($w)
 	{
-		$w->create('pages',__('Pages'),array('tplPages','pagesWidget'),null,'List of published pages');
+		$w->create('pages',__('Pages'),array('tplPages','pagesWidget'));
 		$w->pages->setting('title',__('Title:'),__('Pages'));
-		$w->pages->setting('homeonly',__('Display on:'),1,'combo',
-			array(
-				__('All pages') => 0,
-				__('Home page only') => 1,
-				__('Except on home page') => 2
-				)
-		);
+		$w->pages->setting('homeonly',__('Home page only'),1,'check');
 		$w->pages->setting('sortby',__('Order by:'),'post_title','combo',
 			array(
@@ -38,5 +32,4 @@
 			array(__('Ascending') => 'asc', __('Descending') => 'desc')
 		);
-		$w->pages->setting('class',__('CSS class:'),'');
 	}
 	
Index: plugins/pages/list.php
===================================================================
--- plugins/pages/list.php	(revision 911)
+++ plugins/pages/list.php	(revision 884)
@@ -11,55 +11,70 @@
 # -- END LICENSE BLOCK -----------------------------------------
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
+
 dcPage::check('pages,contentadmin');
 
-/* Pager class
--------------------------------------------------------- */
-class adminPageList extends adminGenericList
-{
-	public function display($page,$nb_per_page,$enclose_block='')
-	{
-		if ($this->rs->isEmpty())
-		{
-			echo '<p><strong>'.__('No page').'</strong></p>';
-		}
-		else
-		{
-			$pager = new pager($page,$this->rs_count,$nb_per_page,10);
-			$pager->html_prev = $this->html_prev;
-			$pager->html_next = $this->html_next;
-			$pager->var_page = 'page';
-			
-			$html_block =
-			'<table class="clear"><tr>'.
-			'<th colspan="2">'.__('Title').'</th>'.
-			'<th>'.__('Date').'</th>'.
-			'<th>'.__('Author').'</th>'.
-			'<th>'.__('Comments').'</th>'.
-			'<th>'.__('Trackbacks').'</th>'.
-			'<th>'.__('Status').'</th>'.
-			'</tr>%s</table>';
-			
-			if ($enclose_block) {
-				$html_block = sprintf($enclose_block,$html_block);
-			}
-			
-			echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-			
-			$blocks = explode('%s',$html_block);
-			
-			echo $blocks[0];
-			
-			while ($this->rs->fetch())
-			{
-				echo $this->postLine();
-			}
-			
-			echo $blocks[1];
-			
-			echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-		}
-	}
-	
-	private function postLine()
+class adminPageList extends adminItemsList
+{
+	public function setColumns()
+	{
+		$this->addColumn('title','post_title',__('Title'),array('adminPostList','getTitle'),array('class' => array('maximal')),true,true,false);
+		$this->addColumn('date','post_dt',__('Date'),array('adminPostList','getDate'));
+		$this->addColumn('datetime','post_dt',__('Date and time'),array('adminPostList','getDateTime'));
+		$this->addColumn('author','user_id',__('Author'),array('adminPostList','getAuthor'));
+		$this->addColumn('comments','nb_comment',__('Comments'),array('adminPostList','getComments'));
+		$this->addColumn('trackbacks','nb_trackback',__('Trackbacks'),array('adminPostList','getTrackbacks'));
+		$this->addColumn('status','post_status',__('Status'),array('adminPostList','getStatus'));
+		$this->default_sortby = 'datetime';
+		$this->default_order = 'desc';
+
+	}
+	
+	protected function getDefaultCaption()
+	{
+		return __('Pages list');
+	}
+	
+	protected function getDefaultLine()
+	{
+		return
+		'<tr class="line'.($this->rs->post_status != 1 ? ' offline' : '').'"'.
+		' id="p'.$this->rs->post_id.'">%s</tr>';
+	}
+	
+	protected function getTitle()
+	{
+		return
+		'<th scope="row" class="maximal">'.
+		form::checkbox(array('entries[]'),$this->rs->post_id,'','','',!$this->rs->isEditable()).'&nbsp;'.
+		'<a href="'.$this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id).'">'.
+		html::escapeHTML($this->rs->post_title).'</a></th>';
+	}
+	
+	protected function getDate()
+	{
+		return '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d'),$this->rs->post_dt).'</td>';
+	}
+	
+	protected function getDateTime()
+	{
+		return '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>';
+	}
+	
+	protected function getAuthor()
+	{
+		return '<td class="nowrap">'.$this->rs->user_id.'</td>';
+	}
+	
+	protected function getComments()
+	{
+		return '<td class="nowrap">'.$this->rs->nb_comment.'</td>';
+	}
+	
+	protected function getTrackbacks()
+	{
+		return '<td class="nowrap">'.$this->rs->nb_trackback.'</td>';
+	}
+	
+	protected function getStatus()
 	{
 		$img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
@@ -82,9 +97,4 @@
 		if ($this->rs->post_password) {
 			$protected = sprintf($img,__('protected'),'locker.png');
-		}
-		
-		$selected = '';
-		if ($this->rs->post_selected) {
-			$selected = sprintf($img,__('hidden'),'hidden.png');
 		}
 		
@@ -96,47 +106,61 @@
 		}
 		
-		$res = '<tr class="line'.($this->rs->post_status != 1 ? ' offline' : '').'"'.
-		' id="p'.$this->rs->post_id.'">';
-		
-		$res .=
-		'<td class="nowrap">'.
-		form::checkbox(array('entries[]'),$this->rs->post_id,'','','',!$this->rs->isEditable(),'title="'.__('select this page').'"').'</td>'.
-		'<td class="maximal"><a href="'.$this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id).'">'.
-		html::escapeHTML($this->rs->post_title).'</a></td>'.
-		'<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>'.
-		
-		'<td class="nowrap">'.$this->rs->user_id.'</td>'.
-		'<td class="nowrap">'.$this->rs->nb_comment.'</td>'.
-		'<td class="nowrap">'.$this->rs->nb_trackback.'</td>'.
-		'<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.' '.$attach.'</td>'.
-		'</tr>';
-		
-		return $res;
-	}
-}
-
-/* Getting pages
--------------------------------------------------------- */
-$params = array(
-	'post_type' => 'page'
-);
-
-$page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
-$nb_per_page =  30;
-
-if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
-	$nb_per_page = (integer) $_GET['nb'];
-}
-
-$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
-$params['no_content'] = true;
-$params['order'] = 'post_position ASC, post_title ASC';
-
-try {
-	$pages = $core->blog->getPosts($params);
-	$counter = $core->blog->getPosts($params,true);
-	$post_list = new adminPageList($core,$pages,$counter->f(0));
-} catch (Exception $e) {
-	$core->error->add($e->getMessage());
+		return '<td class="nowrap status">'.$img_status.' '.$protected.' '.$attach.'</td>';
+	}
+}
+
+
+# Getting authors
+try {
+	$users = $core->blog->getPostsUsers('page');
+} catch (Exception $e) {
+	$core->error->add($e->getMessage());
+}
+
+# Getting dates
+try {
+	$dates = $core->blog->getDates(array('type'=>'month','post_type'=>'page'));
+} catch (Exception $e) {
+	$core->error->add($e->getMessage());
+}
+
+# Getting langs
+try {
+	$langs = $core->blog->getLangs(array('post_type'=>'page'));
+} catch (Exception $e) {
+	$core->error->add($e->getMessage());
+}
+
+# Creating filter combo boxes
+if (!$core->error->flag())
+{
+	# Filter form we'll put in html_block
+	$users_combo = array();
+	while ($users->fetch())
+	{
+		$user_cn = dcUtils::getUserCN($users->user_id,$users->user_name,
+		$users->user_firstname,$users->user_displayname);
+		
+		if ($user_cn != $users->user_id) {
+			$user_cn .= ' ('.$users->user_id.')';
+		}
+		
+		$users_combo[$user_cn] = $users->user_id; 
+	}
+	
+	$status_combo = array(
+	);
+	foreach ($core->blog->getAllPostStatus() as $k => $v) {
+		$status_combo[$v] = (string) $k;
+	}
+	
+	# Months array
+	while ($dates->fetch()) {
+		$dt_m_combo[dt::str('%B %Y',$dates->ts())] = $dates->year().$dates->month();
+	}
+	
+	while ($langs->fetch()) {
+		$lang_combo[$langs->post_lang] = $langs->post_lang;
+	}
 }
 
@@ -145,19 +169,76 @@
 if ($core->auth->check('publish,contentadmin',$core->blog->id))
 {
-	$combo_action[__('publish')] = 'publish';
-	$combo_action[__('unpublish')] = 'unpublish';
-	$combo_action[__('schedule')] = 'schedule';
-	$combo_action[__('mark as pending')] = 'pending';
-}
-if ($core->auth->check('admin',$core->blog->id)) {
-	$combo_action[__('change author')] = 'author';
+	$combo_action[__('Status')] = array(
+		__('Publish') => 'publish',
+		__('Unpublish') => 'unpublish',
+		__('Schedule') => 'schedule',
+		__('Mark as pending') => 'pending'
+	);
+}
+if ($core->auth->check('admin',$core->blog->id))
+{
+	$combo_action[__('Change')] = array(__('Change author') => 'author');
 }
 if ($core->auth->check('delete,contentadmin',$core->blog->id))
 {
-	$combo_action[__('delete')] = 'delete';
+	$combo_action[__('Delete')] = array(__('Delete') => 'delete');
 }
 
 # --BEHAVIOR-- adminPagesActionsCombo
 $core->callBehavior('adminPagesActionsCombo',array(&$combo_action));
+
+
+/* Get posts
+-------------------------------------------------------- */
+$post_list = new adminPageList($core);
+
+$params = new ArrayObject();
+$params['post_type'] = 'page';
+$params['no_content'] = true;
+
+$filterSet = new dcFilterSet('pages',$p_url);
+class monthComboFilter extends comboFilter {
+	public function applyFilter($params) {
+		$month=$this->values[0];
+		$params['post_month'] = substr($month,4,2);
+		$params['post_year'] = substr($month,0,4);
+	}
+}
+$filterSet
+	->addFilter(new comboFilter(
+		'users',__('Author'), __('Author'), 'user_id', $users_combo))
+	->addFilter(new comboFilter(
+		'post_status',__('Status'), __('Status'), 'post_status', $status_combo))
+	->addFilter(new comboFilter(
+		'lang',__('Lang'), __('Lang'), 'post_lang', $lang_combo))
+	->addFilter(new monthComboFilter(
+		'month',__('Month'),__('Month'), 'post_month', $dt_m_combo,array('singleval' => 1)))
+	->addFilter(new textFilter(
+		'search',__('Contains'),__('The page contains'), 'search',20,255));
+
+$core->callBehavior('adminPagesFilters',$filterSet);
+$filterSet->setExtra($post_list);
+
+$filterSet->setup($_GET,$_POST);
+
+# Get pages
+try {
+	$nfparams = $params->getArrayCopy();
+	$filtered = $filterSet->applyFilters($params);
+	$core->callBehavior('adminPostsParams',$params);
+	$posts = $core->blog->getPosts($params);
+	$counter = $core->blog->getPosts($params,true);
+	if ($filtered) {
+		$totalcounter = $core->blog->getPosts($nfparams,true);
+		$page_title = sprintf(__('Pages / %s filtered out of %s'),$counter->f(0),$totalcounter->f(0));
+	} else {
+		$page_title = __('Pages');
+		$filters_info = '';
+	}
+	$post_list->setItems($posts,$counter->f(0));
+} catch (Exception $e) {
+	$core->error->add($e->getMessage());
+}
+
 
 /* Display
@@ -173,16 +254,20 @@
   //]]>
   </script>
+<?php
+echo $filterSet->header();
+?>
 </head>
 
 <body>
 <?php
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Pages').'</span></h2>'.
-'<p class="top-add"><a class="button add" href="'.$p_url.'&amp;act=page">'.__('New page').'</a></p>';
-
 if (!$core->error->flag())
 {
+	echo 
+	'<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Pages').'</span></h2>'.
+	'<p class="top-add"><a class="button add" href="'.$p_url.'&amp;act=page">'.__('New page').'</a></p>';
+
+	$filterSet->display();
 	# Show pages
-	$post_list->display($page,$nb_per_page,
-	'<form action="posts_actions.php" method="post" id="form-entries">'.
+	$post_list->display('<form action="posts_actions.php" method="post" id="form-entries">'.
 	
 	'%s'.
@@ -194,10 +279,11 @@
 	form::combo('action',$combo_action).
 	'<input type="submit" value="'.__('ok').'" /></p>'.
-	form::hidden(array('post_type'),'page').
-	form::hidden(array('redir'),html::escapeHTML($_SERVER['REQUEST_URI'])).
+	str_replace('%','%%',$filterSet->getFormFieldsAsHidden()).
 	$core->formNonce().
 	'</div>'.
-	'</form>');
-}
+	'</form>'
+	);
+}
+
 dcPage::helpBlock('pages');
 ?>
Index: plugins/pages/page.php
===================================================================
--- plugins/pages/page.php	(revision 957)
+++ plugins/pages/page.php	(revision 776)
@@ -31,5 +31,4 @@
 $post_open_comment = false;
 $post_open_tb = false;
-$post_selected = false;
 
 $post_media = array();
@@ -77,6 +76,4 @@
 unset($rs);
 
-# Validation flag
-$bad_dt = false;
 
 # Get page informations
@@ -111,5 +108,4 @@
 		$post_open_comment = (boolean) $post->post_open_comment;
 		$post_open_tb = (boolean) $post->post_open_tb;
-		$post_selected = (boolean) $post->post_selected;
 		
 		$page_title = __('Edit page');
@@ -158,22 +154,10 @@
 		$post_dt = '';
 	} else {
-		try
-		{
-			$post_dt = strtotime($_POST['post_dt']);
-			if ($post_dt == false || $post_dt == -1) {
-				$bad_dt = true;
-				throw new Exception(__('Invalid publication date'));
-			}
-			$post_dt = date('Y-m-d H:i',$post_dt);
-		}
-		catch (Exception $e)
-		{
-			$core->error->add($e->getMessage());
-		}
+		$post_dt = strtotime($_POST['post_dt']);
+		$post_dt = date('Y-m-d H:i',$post_dt);
 	}
 	
 	$post_open_comment = !empty($_POST['post_open_comment']);
 	$post_open_tb = !empty($_POST['post_open_tb']);
-	$post_selected = !empty($_POST['post_selected']);
 	$post_lang = $_POST['post_lang'];
 	$post_password = !empty($_POST['post_password']) ? $_POST['post_password'] : null;
@@ -193,5 +177,5 @@
 
 # Create or update post
-if (!empty($_POST) && !empty($_POST['save']) && $can_edit_page && !$bad_dt)
+if (!empty($_POST) && !empty($_POST['save']) && $can_edit_page)
 {
 	$cur = $core->con->openCursor($core->prefix.'post');
@@ -216,5 +200,4 @@
 	$cur->post_open_comment = (integer) $post_open_comment;
 	$cur->post_open_tb = (integer) $post_open_tb;
-	$cur->post_selected = (integer) $post_selected;
 	
 	if (isset($_POST['post_url'])) {
@@ -314,14 +297,14 @@
 
 if (!empty($_GET['upd'])) {
-	dcPage::message(__('Page has been successfully updated.'));
+		echo '<p class="message">'.__('Page has been successfully updated.').'</p>';
 }
 elseif (!empty($_GET['crea'])) {
-	dcPage::message(__('Page has been successfully created.'));
+		echo '<p class="message">'.__('Page has been successfully created.').'</p>';
 }
 elseif (!empty($_GET['attached'])) {
-	dcPage::message(__('File has been successfully attached.'));
+	echo '<p class="message">'.__('File has been successfully attached.').'</p>';
 }
 elseif (!empty($_GET['rmattach'])) {
-	dcPage::message(__('Attachment has been successfully removed.'));
+	echo '<p class="message">'.__('Attachment has been successfully removed.').'</p>';
 }
 
@@ -333,5 +316,5 @@
 	$post_format = 'xhtml';
 	
-	dcPage::message(__('Don\'t forget to validate your XHTML conversion by saving your post.'));
+	echo '<p class="message">'.__('Don\'t forget to validate your XHTML conversion by saving your post.').'</p>';
 }
 
@@ -432,5 +415,5 @@
 	
 	'<p><label for="post_dt">'.__('Published on:').
-	form::field('post_dt',16,16,$post_dt,($bad_dt ? 'invalid' : '')).'</label></p>'.
+	form::field('post_dt',16,16,$post_dt).'</label></p>'.
 	
 	'<p><label for="post_format">'.__('Text formating:').
@@ -441,24 +424,7 @@
 	'<p><label for="post_open_comment" class="classic">'.form::checkbox('post_open_comment',1,$post_open_comment).' '.
 	__('Accept comments').'</label></p>'.
-	($core->blog->settings->system->allow_comments ? 
-		(isContributionAllowed($post_id,strtotime($post_dt),true) ? 
-			'' :
-			'<p class="form-note warn">'.__('Warning: Comments are not more accepted for this page.').'</p>') : 
-		'<p class="form-note warn">'.__('Warning: Comments are not accepted on this blog.').'</p>').
-
 	'<p><label for="post_open_tb" class="classic">'.form::checkbox('post_open_tb',1,$post_open_tb).' '.
 	__('Accept trackbacks').'</label></p>'.
-	($core->blog->settings->system->allow_trackbacks ? 
-		(isContributionAllowed($post_id,strtotime($post_dt),false) ? 
-			'' :
-			'<p class="form-note warn">'.__('Warning: Trackbacks are not more accepted for this page.').'</p>') : 
-		'<p class="form-note warn">'.__('Warning: Trackbacks are not accepted on this blog.').'</p>').
-	
-	'<p><label for="post_selected" class="classic">'.form::checkbox('post_selected',1,$post_selected).' '.
-	__('Hidden').'</label></p>'.
-	'<p class="form-note">'.
-	__('If checked this page will be active but not listed in widget Pages.').
-	'</p>'.
-
+	
 	'<p><label for="post_position" class="classic">'.__('Page position:').' '.
 	form::field('post_position',3,3,(string) $post_position).
@@ -637,25 +603,4 @@
 }
 
-# Controls comments or trakbacks capabilities
-function isContributionAllowed($id,$dt,$com=true)
-{
-	global $core;
-
-	if (!$id) {
-		return true;
-	}
-	if ($com) {
-		if (($core->blog->settings->system->comments_ttl == 0) || 
-			(time() - $core->blog->settings->system->comments_ttl*86400 < $dt)) {
-			return true;
-		}
-	} else {
-		if (($core->blog->settings->system->trackbacks_ttl == 0) || 
-			(time() - $core->blog->settings->system->trackbacks_ttl*86400 < $dt)) {
-			return true;
-		}
-	}
-	return false;
-}
 
 # Show comments or trackbacks
Index: plugins/pings/_define.php
===================================================================
--- plugins/pings/_define.php	(revision 967)
+++ plugins/pings/_define.php	(revision 464)
@@ -16,5 +16,5 @@
 	/* Description*/		"Ping services",
 	/* Author */			"Olivier Meunier",
-	/* Version */			'1.2',
+	/* Version */			'1.1',
 	array(
 		'permissions' =>	'usage,contentadmin'
Index: plugins/pings/index.php
===================================================================
--- plugins/pings/index.php	(revision 907)
+++ plugins/pings/index.php	(revision 500)
@@ -54,5 +54,5 @@
 
 if (!empty($_GET['up'])) {
-	dcPage::message(__('Settings have been successfully updated.'));
+	echo '<p class="message">'.__('Settings have been successfully updated.').'</p>';
 }
 
Index: plugins/simpleMenu/_define.php
===================================================================
--- plugins/simpleMenu/_define.php	(revision 967)
+++ plugins/simpleMenu/_define.php	(revision 685)
@@ -16,5 +16,5 @@
 	/* Description*/		"Simple menu for Dotclear",
 	/* Author */			"Franck Paul",
-	/* Version */			'1.1',
+	/* Version */			'1.0',
 	array(
 		'permissions' =>	'admin'
Index: plugins/simpleMenu/_public.php
===================================================================
--- plugins/simpleMenu/_public.php	(revision 945)
+++ plugins/simpleMenu/_public.php	(revision 683)
@@ -42,6 +42,5 @@
 		global $core, $_ctx;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
+		if ($w->homeonly && $core->url->type != 'default') {
 			return;
 		}
@@ -52,7 +51,5 @@
 		}
 
-		return '<div class="simple-menu'.
-			($w->class ? ' '.html::escapeHTML($w->class) : '').'">'.
-			($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').$menu.'</div>';
+		return '<div class="simple-menu">'.($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').$menu.'</div>';
 	}
 	
Index: plugins/simpleMenu/_widgets.php
===================================================================
--- plugins/simpleMenu/_widgets.php	(revision 954)
+++ plugins/simpleMenu/_widgets.php	(revision 587)
@@ -18,14 +18,7 @@
 	public static function initWidgets($w)
 	{
-		$w->create('simplemenu',__('Simple menu'),array('tplSimpleMenu','simpleMenuWidget'),null,'List of simple menu items');
+		$w->create('simplemenu',__('Simple menu'),array('tplSimpleMenu','simpleMenuWidget'));
 		$w->simplemenu->setting('title',__('Title:'),__('Menu'));
-		$w->simplemenu->setting('homeonly',__('Display on:'),0,'combo',
-			array(
-				__('All pages') => 0,
-				__('Home page only') => 1,
-				__('Except on home page') => 2
-				)
-		);
-		$w->simplemenu->setting('class',__('CSS class:'),'');
+		$w->simplemenu->setting('homeonly',__('Home page only'),1,'check');
 	}
 }
Index: plugins/simpleMenu/index.php
===================================================================
--- plugins/simpleMenu/index.php	(revision 907)
+++ plugins/simpleMenu/index.php	(revision 776)
@@ -405,4 +405,7 @@
 	</script>
 	<?php endif; ?>
+	<!--
+	<link rel="stylesheet" type="text/css" href="index.php?pf=simpleMenu/style.css" />
+	-->
 </head>
 
@@ -412,14 +415,14 @@
 
 if (!empty($_GET['added'])) {
-	dcPage::message(__('Menu item has been successfully added.'));
+	echo '<p class="message">'.__('Menu item has been successfully added.').'</p>';
 }
 if (!empty($_GET['removed'])) {
-	dcPage::message(__('Menu items have been successfully removed.'));
+	echo '<p class="message">'.__('Menu items have been successfully removed.').'</p>';
 }
 if (!empty($_GET['neworder'])) {
-	dcPage::message(__('Menu items have been successfully updated.'));
+	echo '<p class="message">'.__('Menu items have been successfully updated.').'</p>';
 }
 if (!empty($_GET['updated'])) {
-	dcPage::message(__('Menu items have been successfully updated.'));
+	echo '<p class="message">'.__('Menu items have been successfully updated.').'</p>';
 }
 
Index: plugins/tags/_admin.php
===================================================================
--- plugins/tags/_admin.php	(revision 897)
+++ plugins/tags/_admin.php	(revision 782)
@@ -31,7 +31,6 @@
 
 $core->addBehavior('adminPreferencesForm',array('tagsBehaviors','adminUserForm'));
-$core->addBehavior('adminBeforeUserOptionsUpdate',array('tagsBehaviors','setTagListFormat'));
-
-$core->addBehavior('adminUserForm',array('tagsBehaviors','adminUserForm'));
+// $core->addBehavior('adminUserForm',array('tagsBehaviors','adminUserForm'));
+
 $core->addBehavior('adminBeforeUserCreate',array('tagsBehaviors','setTagListFormat'));
 $core->addBehavior('adminBeforeUserUpdate',array('tagsBehaviors','setTagListFormat'));
@@ -132,29 +131,27 @@
 	public static function postsActionsHeaders()
 	{
-		if (($_POST['action'] == 'tags') || ($_POST['action'] == 'tags_remove')) {
-			$tag_url = $GLOBALS['core']->blog->url.$GLOBALS['core']->url->getURLFor('tag');
-
-			$opts = $GLOBALS['core']->auth->getOptions();
-			$type = isset($opts['tag_list_format']) ? $opts['tag_list_format'] : 'more';
-
-			return 
-			'<script type="text/javascript" src="index.php?pf=tags/js/jquery.autocomplete.js"></script>'.
-			'<script type="text/javascript" src="index.php?pf=tags/js/posts_actions.js"></script>'.
-			'<script type="text/javascript">'."\n".
-			"//<![CDATA[\n".
-			"metaEditor.prototype.meta_url = 'plugin.php?p=tags&m=tag_posts&amp;tag=';\n".
-			"metaEditor.prototype.meta_type = '".html::escapeJS($type)."';\n".
-			"metaEditor.prototype.text_confirm_remove = '".html::escapeJS(__('Are you sure you want to remove this %s?'))."';\n".
-			"metaEditor.prototype.text_add_meta = '".html::escapeJS(__('Add a %s to this entry'))."';\n".
-			"metaEditor.prototype.text_choose = '".html::escapeJS(__('Choose from list'))."';\n".
-			"metaEditor.prototype.text_all = '".html::escapeJS(__('all'))."';\n".
-			"metaEditor.prototype.text_separation = '".html::escapeJS(__('Enter tags separated by coma'))."';\n".
-			"dotclear.msg.tags_autocomplete = '".html::escapeJS(__('used in %e - frequency %p%'))."';\n".
-			"dotclear.msg.entry = '".html::escapeJS(__('entry'))."';\n".
-			"dotclear.msg.entries = '".html::escapeJS(__('entries'))."';\n".
-			"\n//]]>\n".
-			"</script>\n".
-			'<link rel="stylesheet" type="text/css" href="index.php?pf=tags/style.css" />';
-		}
+		$tag_url = $GLOBALS['core']->blog->url.$GLOBALS['core']->url->getURLFor('tag');
+		
+		$opts = $GLOBALS['core']->auth->getOptions();
+		$type = isset($opts['tag_list_format']) ? $opts['tag_list_format'] : 'more';
+		
+		return 
+		'<script type="text/javascript">'."\n".
+		"//<![CDATA[\n".
+		"metaEditor.prototype.meta_url = 'plugin.php?p=tags&m=tag_posts&amp;tag=';\n".
+		"metaEditor.prototype.meta_type = '".html::escapeJS($type)."';\n".
+		"metaEditor.prototype.text_confirm_remove = '".html::escapeJS(__('Are you sure you want to remove this %s?'))."';\n".
+		"metaEditor.prototype.text_add_meta = '".html::escapeJS(__('Add a %s to this entry'))."';\n".
+		"metaEditor.prototype.text_choose = '".html::escapeJS(__('Choose from list'))."';\n".
+		"metaEditor.prototype.text_all = '".html::escapeJS(__('all'))."';\n".
+		"metaEditor.prototype.text_separation = '".html::escapeJS(__('Enter tags separated by coma'))."';\n".
+		"dotclear.msg.tags_autocomplete = '".html::escapeJS(__('used in %e - frequency %p%'))."';\n".
+		"dotclear.msg.entry = '".html::escapeJS(__('entry'))."';\n".
+		"dotclear.msg.entries = '".html::escapeJS(__('entries'))."';\n".
+		"\n//]]>\n".
+		"</script>\n".
+		'<script type="text/javascript" src="index.php?pf=tags/js/posts_actions.js"></script>'.
+		dcPage::jqueryUI().
+		'<link rel="stylesheet" type="text/css" href="index.php?pf=tags/style.css" />';
 	}
 	
@@ -175,5 +172,4 @@
 			try
 			{
-
 				$meta =& $GLOBALS['core']->meta;
 				$tags = $meta->splitMetaValues($_POST['new_tags']);
Index: plugins/tags/_define.php
===================================================================
--- plugins/tags/_define.php	(revision 965)
+++ plugins/tags/_define.php	(revision 464)
@@ -16,5 +16,5 @@
 	/* Description*/		"Tags for posts",
 	/* Author */			"Olivier Meunier",
-	/* Version */			'1.2',
+	/* Version */			'1.1',
 	array(
 		'permissions' =>	'usage,contentadmin'
Index: plugins/tags/_public.php
===================================================================
--- plugins/tags/_public.php	(revision 945)
+++ plugins/tags/_public.php	(revision 783)
@@ -23,7 +23,5 @@
 $core->tpl->addBlock('TagsFooter',array('tplTags','TagsFooter'));
 $core->tpl->addBlock('EntryTags',array('tplTags','EntryTags'));
-$core->tpl->addBlock('TagIf',array('tplTags','TagIf'));
 $core->tpl->addValue('TagID',array('tplTags','TagID'));
-$core->tpl->addValue('TagCount',array('tplTags','TagCount'));
 $core->tpl->addValue('TagPercent',array('tplTags','TagPercent'));
 $core->tpl->addValue('TagRoundPercent',array('tplTags','TagRoundPercent'));
@@ -46,4 +44,5 @@
 
 $core->addBehavior('templateBeforeBlock',array('behaviorsTags','templateBeforeBlock'));
+$core->addBehavior('tplSysIfConditions',array('behaviorsTags','tplSysIfConditions'));
 $core->addBehavior('publicBeforeDocument',array('behaviorsTags','addTplPath'));
 
@@ -56,6 +55,8 @@
 			return
 			"<?php\n".
-			"@\$params['from'] .= ', '.\$core->prefix.'meta META ';\n".
-			"@\$params['sql'] .= 'AND META.post_id = P.post_id ';\n".
+			"if (!isset(\$params['from'])) \$params['from']='';"."\n".
+			"if (!isset(\$params['sql'])) \$params['sql']='';"."\n".
+			"\$params['from'] .= ', '.\$core->prefix.'meta META ';\n".
+			"\$params['sql'] .= 'AND META.post_id = P.post_id ';\n".
 			"\$params['sql'] .= \"AND META.meta_type = 'tag' \";\n".
 			"\$params['sql'] .= \"AND META.meta_id = '".$core->con->escape($attr['tag'])."' \";\n".
@@ -65,10 +66,24 @@
 		{
 			return
-			'<?php if ($_ctx->exists("meta") && ($_ctx->meta->meta_type == "tag")) { '.
-				"@\$params['from'] .= ', '.\$core->prefix.'meta META ';\n".
-				"@\$params['sql'] .= 'AND META.post_id = P.post_id ';\n".
+			'<?php if ($_ctx->exists("meta")) { '.
+				"if (!isset(\$params['from'])) \$params['from']='';"."\n".
+				"if (!isset(\$params['sql'])) \$params['sql']='';"."\n".
+				"\$params['from'] .= ', '.\$core->prefix.'meta META ';\n".
+				"\$params['sql'] .= 'AND META.post_id = P.post_id ';\n".
 				"\$params['sql'] .= \"AND META.meta_type = 'tag' \";\n".
 				"\$params['sql'] .= \"AND META.meta_id = '\".\$core->con->escape(\$_ctx->meta->meta_id).\"' \";\n".
 			"} ?>\n";
+		}
+	}
+	
+	public static function tplIfConditions($tag, $attr,$content,$if)
+	{
+		if ($tag == 'Sys' && isset($attr['has_tag'])) {
+			$sign = '';
+			if (substr($attr['has_tag'],0,1) == '!') {
+				$sign = '!';
+				$attr['has_tag'] = substr($attr['has_tag'],1);
+			}
+			$if[] =  $sign."(\$core->tpl->tagExists('".addslashes($attr['has_tag'])."') )";
 		}
 	}
@@ -155,22 +170,5 @@
 		return $res;
 	}
-
-	public static function TagIf($attr,$content) 
-	{ 
-		$if = array();
-		$operateur = isset($attr['operator']) ? dcTemplate::getOperator($attr['operator']) : '&&';
-
-		if (isset($attr['has_entries'])) {
-			$sign = (boolean) $attr['has_entries'] ? '' : '!';
-			$if[] = $sign.'$_ctx->meta->count';
-		}
-
-		if (!empty($if)) {
-			return '<?php if('.implode(' '.$operateur.' ',$if).') : ?>'.$content.'<?php endif; ?>';
-		} else {
-			return $content;
-		}
-	}
-
+	
 	public static function TagID($attr)
 	{
@@ -179,9 +177,4 @@
 	}
 	
-	public static function TagCount($attr)
-	{
-		return '<?php echo $_ctx->meta->count; ?>';
-	}
-
 	public static function TagPercent($attr)
 	{
@@ -225,9 +218,4 @@
 		global $core;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
-			return;
-		}
-
 		$params = array('meta_type' => 'tag');
 		
@@ -256,5 +244,5 @@
 		
 		$res =
-		'<div class="tags'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">'.
+		'<div class="tags">'.
 		($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
 		'<ul>';
@@ -264,5 +252,5 @@
 			$res .=
 			'<li><a href="'.$core->blog->url.$core->url->getURLFor('tag',rawurlencode($rs->meta_id)).'" '.
-			'class="tag'.$rs->roundpercent.'">'.
+			'class="tag'.$rs->roundpercent.'" rel="tag">'.
 			$rs->meta_id.'</a> </li>';
 		}
Index: plugins/tags/_widgets.php
===================================================================
--- plugins/tags/_widgets.php	(revision 954)
+++ plugins/tags/_widgets.php	(revision 270)
@@ -19,5 +19,5 @@
 	public static function initWidgets($w)
 	{
-		$w->create('tags',__('Tags'),array('tplTags','tagsWidget'),null,'Tags cloud');
+		$w->create('tags',__('Tags'),array('tplTags','tagsWidget'));
 		$w->tags->setting('title',__('Title:'),__('Tags'));
 		$w->tags->setting('limit',__('Limit (empty means no limit):'),'20');
@@ -29,12 +29,4 @@
 		);
 		$w->tags->setting('alltagslinktitle',__('Link to all tags:'),__('All tags'));
-		$w->tags->setting('homeonly',__('Display on:'),0,'combo',
-			array(
-				__('All pages') => 0,
-				__('Home page only') => 1,
-				__('Except on home page') => 2
-				)
-		);
-		$w->tags->setting('class',__('CSS class:'),'');
 	}
 	
Index: plugins/tags/js/post.js
===================================================================
--- plugins/tags/js/post.js	(revision 0)
+++ plugins/tags/js/post.js	(revision 756)
@@ -1,3 +1,9 @@
 $(function() {
+	function split( val ) {
+		return val.split( /,\s*/ );
+	}
+	function extractLast(term) {
+		return split(term).pop();
+	}
 	$('#edit-entry').onetabload(function() {
 		var tags_edit = $('#tags-edit');
@@ -18,42 +24,69 @@
 		}
 		
-		$('#post_meta_input').autocomplete(mEdit.service_uri, {
-			extraParams: {
-				'f': 'searchMeta',
-				'metaType': 'tag'
-			},
-			delay: 1000,
-			multiple: true,
-			matchSubset: false,
-			matchContains: true,
-			parse: function(xml) { 
-				var results = [];
-				$(xml).find('meta').each(function(){
-					results[results.length] = {
-						data: {
-							"id": $(this).text(),
-							"count": $(this).attr("count"),
-							"percent":  $(this).attr("roundpercent")
-						},
-						result: $(this).text()
-					}; 
-				});
-				return results;
-			},
-			formatItem: function(tag) {
-				return tag.id + ' <em>(' +
-				dotclear.msg.tags_autocomplete.
-					replace('%p',tag.percent).
-					replace('%e',tag.count + ' ' +
-						(tag.count > 1 ?
-						dotclear.msg.entries :
-						dotclear.msg.entry)
-					) +
-				')</em>';
-			},
-			formatResult: function(tag) { 
-				return tag.result; 
+		$('#post_meta_input')
+			.bind( "keydown", function( event ) {
+		if ( event.keyCode === $.ui.keyCode.TAB &&
+				$( this ).data( "autocomplete" ).menu.active ) {
+			event.preventDefault();
+		}
+	})
+	.autocomplete({
+		minLength: 2,
+		delay: 1000,
+		source: function(request,response) {
+			$.ajax({
+				url: mEdit.service_uri,
+				data: {
+					'f': 'searchMeta',
+					'metaType': 'tag',
+					'q': extractLast(request.term)
+				},
+				success:function(data) {
+					results = [];
+					$(data).find('meta').each(function(){
+						var id = $(this).text();
+						var roundpercent = $(this).attr("roundpercent");
+						var count = $(this).attr("count");
+						console.log(id);
+						console.log(roundpercent);
+						console.log(count);
+						var label = id + ' (' +
+							dotclear.msg.tags_autocomplete.
+								replace('%p',roundpercent).
+								replace('%e',count + ' ' +
+								((count > 1) ?
+									dotclear.msg.entries :
+									dotclear.msg.entry
+								)) + ')';
+							console.log(label);
+						results.push({label:label,value:id});
+					});
+					response(results);
+				}
+			});
+		},
+		search: function() {
+			var term = extractLast( this.value );
+			if ( term.length < 2 ) {
+				return false;
 			}
-		});
+		},
+		focus: function() {
+			// prevent value inserted on focus
+			return false;
+		},
+		select: function( event, ui ) {
+			var terms = split( this.value );
+			// remove the current input
+			terms.pop();
+			// add the selected item
+			terms.push( ui.item.value );
+			// add placeholder to get the comma-and-space at the end
+			terms.push( "" );
+			this.value = terms.join( ", " );
+			return false;
+		}		
+	});
+
 	});
 });
Index: plugins/tags/js/posts_actions.js
===================================================================
--- plugins/tags/js/posts_actions.js	(revision 0)
+++ plugins/tags/js/posts_actions.js	(revision 756)
@@ -1,3 +1,9 @@
 $(function() {
+	function split( val ) {
+		return val.split( /,\s*/ );
+	}
+	function extractLast(term) {
+		return split(term).pop();
+	}
 	var tag_field = $('#new_tags');
 	
@@ -19,41 +25,67 @@
 	});
 	
-	$('#post_meta_input').autocomplete(mEdit.service_uri, {
-		extraParams: {
-			'f': 'searchMeta',
-			'metaType': 'tag'
+	$('#post_meta_input')
+	.bind( "keydown", function( event ) {
+		if ( event.keyCode === $.ui.keyCode.TAB &&
+				$( this ).data( "autocomplete" ).menu.active ) {
+			event.preventDefault();
+		}
+	})
+	.autocomplete({
+		minLength: 2,
+		delay: 1000,
+		source: function(request,response) {
+			$.ajax({
+				url: mEdit.service_uri,
+				data: {
+					'f': 'searchMeta',
+					'metaType': 'tag',
+					'q': extractLast(request.term)
+				},
+				success:function(data) {
+					results = [];
+					$(data).find('meta').each(function(){
+						var id = $(this).text();
+						var roundpercent = $(this).attr("roundpercent");
+						var count = $(this).attr("count");
+						console.log(id);
+						console.log(roundpercent);
+						console.log(count);
+						var label = id + ' (' +
+							dotclear.msg.tags_autocomplete.
+								replace('%p',roundpercent).
+								replace('%e',count + ' ' +
+								((count > 1) ?
+									dotclear.msg.entries :
+									dotclear.msg.entry
+								)) + ')';
+							console.log(label);
+						results.push({label:label,value:id});
+					});
+					response(results);
+				}
+			});
 		},
-		delay: 1000,
-		multiple: true,
-		matchSubset: false,
-		matchContains: true,
-		parse: function(xml) { 
-			var results = [];
-			$(xml).find('meta').each(function(){
-				results[results.length] = {
-					data: {
-						"id": $(this).text(),
-						"count": $(this).attr("count"),
-						"percent":  $(this).attr("roundpercent")
-					},
-					result: $(this).text()
-				}; 
-			});
-			return results;
+		search: function() {
+			var term = extractLast( this.value );
+			if ( term.length < 2 ) {
+				return false;
+			}
 		},
-		formatItem: function(tag) {
-			return tag.id + ' <em>(' +
-			dotclear.msg.tags_autocomplete.
-				replace('%p',tag.percent).
-				replace('%e',tag.count + ' ' +
-					(tag.count > 1 ?
-					dotclear.msg.entries :
-					dotclear.msg.entry)
-				) +
-			')</em>';
+		focus: function() {
+			// prevent value inserted on focus
+			return false;
 		},
-		formatResult: function(tag) { 
-			return tag.result; 
-		}
+		select: function( event, ui ) {
+			var terms = split( this.value );
+			// remove the current input
+			terms.pop();
+			// add the selected item
+			terms.push( ui.item.value );
+			// add placeholder to get the comma-and-space at the end
+			terms.push( "" );
+			this.value = terms.join( ", " );
+			return false;
+		}		
 	});
 });
Index: plugins/tags/tag_posts.php
===================================================================
--- plugins/tags/tag_posts.php	(revision 907)
+++ plugins/tags/tag_posts.php	(revision 711)
@@ -17,5 +17,5 @@
 
 
-$page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
+$page = !empty($_GET['page']) ? $_GET['page'] : 1;
 $nb_per_page =  30;
 
@@ -114,5 +114,5 @@
 <?php
 if (!empty($_GET['renamed'])) {
-	dcPage::message(__('Tag has been successfully renamed'));
+	echo '<p class="message">'.__('Tag has been successfully renamed').'</p>';
 }
 
Index: plugins/tags/tags.php
===================================================================
--- plugins/tags/tags.php	(revision 907)
+++ plugins/tags/tags.php	(revision 782)
@@ -25,5 +25,5 @@
 <?php
 if (!empty($_GET['del'])) {
-	dcPage::message(__('Tag has been successfully removed'));
+	echo '<p class="message">'.__('Tag has been successfully removed').'</p>';
 }
 
@@ -43,11 +43,11 @@
 			$col = 1;
 		}
-		$cols[$col] .= '<tr class="tagLetter"><td colspan="2"><span>'.$letter.'</span></td></tr>';
+		$cols[$col] .= '<tr class="tagLetter"><th scope="row" colspan="2"><span>'.$letter.'</span></th></tr>';
 	}
 	
 	$cols[$col] .=
 	'<tr class="line">'.
-		'<td class="maximal"><a href="'.$p_url.
-		'&amp;m=tag_posts&amp;tag='.rawurlencode($tags->meta_id).'">'.$tags->meta_id.'</a></td>'.
+		'<th scope="row" class="maximal"><a href="'.$p_url.
+		'&amp;m=tag_posts&amp;tag='.rawurlencode($tags->meta_id).'">'.$tags->meta_id.'</a></th>'.
 		'<td class="nowrap"><strong>'.$tags->count.'</strong> '.
 		(($tags->count==1) ? __('entry') : __('entries')).'</td>'.
@@ -57,5 +57,8 @@
 }
 
-$table = '<div class="col"><table class="tags">%s</table></div>';
+$table =
+'<div class="col"><table class="tags"><caption>'.
+__('Tags list').
+'</caption><tbody>%s</tbody></table></div>';
 
 if ($cols[0])
Index: plugins/themeEditor/_admin.php
===================================================================
--- plugins/themeEditor/_admin.php	(revision 966)
+++ plugins/themeEditor/_admin.php	(revision 270)
@@ -16,47 +16,10 @@
 }
 
-$core->addBehavior('adminCurrentThemeDetails', array('themeEditorBehaviors','theme_editor_details'));
+$core->addBehavior('adminCurrentThemeDetails','theme_editor_details');
 
-$core->addBehavior('adminBeforeUserOptionsUpdate',array('themeEditorBehaviors','adminBeforeUserUpdate'));
-$core->addBehavior('adminPreferencesForm',array('themeEditorBehaviors','adminPreferencesForm'));
-
-class themeEditorBehaviors
+function theme_editor_details($core,$id)
 {
-	public static function theme_editor_details($core,$id)
-	{
-		if ($id != 'default' && $core->auth->isSuperAdmin()) {
-			return '<p><a href="plugin.php?p=themeEditor" class="button">'.__('Theme Editor').'</a></p>';
-		}
-	}
-
-	public static function adminBeforeUserUpdate($cur,$userID)
-	{
-		global $core;
-
-		// Get and store user's prefs for plugin options
-		$core->auth->user_prefs->addWorkspace('interface');
-		try {
-			$core->auth->user_prefs->interface->put('colorsyntax',!empty($_POST['colorsyntax']),'boolean');
-		} 
-		catch (Exception $e)
-		{
-			$core->error->add($e->getMessage());
-		}
-	}
-	
-	public static function adminPreferencesForm($core)
-	{
-		// Add fieldset for plugin options
-		$core->auth->user_prefs->addWorkspace('interface');
-
-		echo
-		'<fieldset><legend>'.__('Theme Editor').'</legend>'.
-		
-		'<p><label for"colorsyntax" class="classic">'.
-		form::checkbox('colorsyntax',1,$core->auth->user_prefs->interface->colorsyntax).' '.
-		__('Syntax color').'</label></p>'.
-
-		'<br class="clear" />'. //Opera sucks
-		'</fieldset>';
+	if ($id != 'default' && $core->auth->isSuperAdmin()) {
+		return '<p><a href="plugin.php?p=themeEditor" class="button">'.__('Theme Editor').'</a></p>';
 	}
 }
Index: plugins/themeEditor/_define.php
===================================================================
--- plugins/themeEditor/_define.php	(revision 965)
+++ plugins/themeEditor/_define.php	(revision 464)
@@ -16,5 +16,5 @@
 	/* Description*/		"Theme Editor",
 	/* Author */			"Olivier Meunier",
-	/* Version */			'1.0'
+	/* Version */			'0.9'
 );
 ?>
Index: lugins/themeEditor/codemirror.css
===================================================================
--- plugins/themeEditor/codemirror.css	(revision 948)
+++ 	(revision )
@@ -1,7 +1,0 @@
-.CodeMirror {
-	font-size: 1.4em;
-	background: #fff;
-}
-.CodeMirror .CodeMirror-wrap, .CodeMirror .CodeMirror-scroll {
-	height: 30em;
-}
Index: lugins/themeEditor/codemirror/LICENSE
===================================================================
--- plugins/themeEditor/codemirror/LICENSE	(revision 948)
+++ 	(revision )
@@ -1,23 +1,0 @@
-Copyright (C) 2012 by Marijn Haverbeke <marijnh@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Please note that some subdirectories of the CodeMirror distribution
-include their own LICENSE files, and are released under different
-licences.
Index: lugins/themeEditor/codemirror/codemirror.css
===================================================================
--- plugins/themeEditor/codemirror/codemirror.css	(revision 948)
+++ 	(revision )
@@ -1,174 +1,0 @@
-.CodeMirror {
-  line-height: 1em;
-  font-family: monospace;
-
-  /* Necessary so the scrollbar can be absolutely positioned within the wrapper on Lion. */
-  position: relative;
-  /* This prevents unwanted scrollbars from showing up on the body and wrapper in IE. */
-  overflow: hidden;
-}
-
-.CodeMirror-scroll {
-  overflow: auto;
-  height: 300px;
-  /* This is needed to prevent an IE[67] bug where the scrolled content
-     is visible outside of the scrolling box. */
-  position: relative;
-  outline: none;
-}
-
-/* Vertical scrollbar */
-.CodeMirror-scrollbar {
-  position: absolute;
-  right: 0; top: 0;
-  overflow-x: hidden;
-  overflow-y: scroll;
-  z-index: 5;
-}
-.CodeMirror-scrollbar-inner {
-  /* This needs to have a nonzero width in order for the scrollbar to appear
-     in Firefox and IE9. */
-  width: 1px;
-}
-.CodeMirror-scrollbar.cm-sb-overlap {
-  /* Ensure that the scrollbar appears in Lion, and that it overlaps the content
-     rather than sitting to the right of it. */
-  position: absolute;
-  z-index: 1;
-  float: none;
-  right: 0;
-  min-width: 12px;
-}
-.CodeMirror-scrollbar.cm-sb-nonoverlap {
-  min-width: 12px;
-}
-.CodeMirror-scrollbar.cm-sb-ie7 {
-  min-width: 18px;
-}
-
-.CodeMirror-gutter {
-  position: absolute; left: 0; top: 0;
-  z-index: 10;
-  background-color: #f7f7f7;
-  border-right: 1px solid #eee;
-  min-width: 2em;
-  height: 100%;
-}
-.CodeMirror-gutter-text {
-  color: #aaa;
-  text-align: right;
-  padding: .4em .2em .4em .4em;
-  white-space: pre !important;
-  cursor: default;
-}
-.CodeMirror-lines {
-  padding: .4em;
-  white-space: pre;
-  cursor: text;
-}
-
-.CodeMirror pre {
-  -moz-border-radius: 0;
-  -webkit-border-radius: 0;
-  -o-border-radius: 0;
-  border-radius: 0;
-  border-width: 0; margin: 0; padding: 0; background: transparent;
-  font-family: inherit;
-  font-size: inherit;
-  padding: 0; margin: 0;
-  white-space: pre;
-  word-wrap: normal;
-  line-height: inherit;
-  color: inherit;
-  overflow: visible;
-}
-
-.CodeMirror-wrap pre {
-  word-wrap: break-word;
-  white-space: pre-wrap;
-  word-break: normal;
-}
-.CodeMirror-wrap .CodeMirror-scroll {
-  overflow-x: hidden;
-}
-
-.CodeMirror textarea {
-  outline: none !important;
-}
-
-.CodeMirror pre.CodeMirror-cursor {
-  z-index: 10;
-  position: absolute;
-  visibility: hidden;
-  border-left: 1px solid black;
-  border-right: none;
-  width: 0;
-}
-.cm-keymap-fat-cursor pre.CodeMirror-cursor {
-  width: auto;
-  border: 0;
-  background: transparent;
-  background: rgba(0, 200, 0, .4);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#6600c800, endColorstr=#4c00c800);
-}
-/* Kludge to turn off filter in ie9+, which also accepts rgba */
-.cm-keymap-fat-cursor pre.CodeMirror-cursor:not(#nonsense_id) {
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-.CodeMirror pre.CodeMirror-cursor.CodeMirror-overwrite {}
-.CodeMirror-focused pre.CodeMirror-cursor {
-  visibility: visible;
-}
-
-div.CodeMirror-selected { background: #d9d9d9; }
-.CodeMirror-focused div.CodeMirror-selected { background: #d7d4f0; }
-
-.CodeMirror-searching {
-  background: #ffa;
-  background: rgba(255, 255, 0, .4);
-}
-
-/* Default theme */
-
-.cm-s-default span.cm-keyword {color: #708;}
-.cm-s-default span.cm-atom {color: #219;}
-.cm-s-default span.cm-number {color: #164;}
-.cm-s-default span.cm-def {color: #00f;}
-.cm-s-default span.cm-variable {color: black;}
-.cm-s-default span.cm-variable-2 {color: #05a;}
-.cm-s-default span.cm-variable-3 {color: #085;}
-.cm-s-default span.cm-property {color: black;}
-.cm-s-default span.cm-operator {color: black;}
-.cm-s-default span.cm-comment {color: #a50;}
-.cm-s-default span.cm-string {color: #a11;}
-.cm-s-default span.cm-string-2 {color: #f50;}
-.cm-s-default span.cm-meta {color: #555;}
-.cm-s-default span.cm-error {color: #f00;}
-.cm-s-default span.cm-qualifier {color: #555;}
-.cm-s-default span.cm-builtin {color: #30a;}
-.cm-s-default span.cm-bracket {color: #997;}
-.cm-s-default span.cm-tag {color: #170;}
-.cm-s-default span.cm-attribute {color: #00c;}
-.cm-s-default span.cm-header {color: blue;}
-.cm-s-default span.cm-quote {color: #090;}
-.cm-s-default span.cm-hr {color: #999;}
-.cm-s-default span.cm-link {color: #00c;}
-
-span.cm-header, span.cm-strong {font-weight: bold;}
-span.cm-em {font-style: italic;}
-span.cm-emstrong {font-style: italic; font-weight: bold;}
-span.cm-link {text-decoration: underline;}
-
-span.cm-invalidchar {color: #f00;}
-
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
-
-@media print {
-
-  /* Hide the cursor when printing */
-  .CodeMirror pre.CodeMirror-cursor {
-    visibility: hidden;
-  }
-
-}
Index: lugins/themeEditor/codemirror/codemirror.js
===================================================================
--- plugins/themeEditor/codemirror/codemirror.js	(revision 948)
+++ 	(revision )
@@ -1,3165 +1,0 @@
-// CodeMirror version 2.35
-//
-// All functions that need access to the editor's state live inside
-// the CodeMirror function. Below that, at the bottom of the file,
-// some utilities are defined.
-
-// CodeMirror is the only global var we claim
-window.CodeMirror = (function() {
-  "use strict";
-  // This is the function that produces an editor instance. Its
-  // closure is used to store the editor state.
-  function CodeMirror(place, givenOptions) {
-    // Determine effective options based on given values and defaults.
-    var options = {}, defaults = CodeMirror.defaults;
-    for (var opt in defaults)
-      if (defaults.hasOwnProperty(opt))
-        options[opt] = (givenOptions && givenOptions.hasOwnProperty(opt) ? givenOptions : defaults)[opt];
-
-    var input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em");
-    input.setAttribute("wrap", "off"); input.setAttribute("autocorrect", "off"); input.setAttribute("autocapitalize", "off");
-    // Wraps and hides input textarea
-    var inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
-    // The empty scrollbar content, used solely for managing the scrollbar thumb.
-    var scrollbarInner = elt("div", null, "CodeMirror-scrollbar-inner");
-    // The vertical scrollbar. Horizontal scrolling is handled by the scroller itself.
-    var scrollbar = elt("div", [scrollbarInner], "CodeMirror-scrollbar");
-    // DIVs containing the selection and the actual code
-    var lineDiv = elt("div"), selectionDiv = elt("div", null, null, "position: relative; z-index: -1");
-    // Blinky cursor, and element used to ensure cursor fits at the end of a line
-    var cursor = elt("pre", "\u00a0", "CodeMirror-cursor"), widthForcer = elt("pre", "\u00a0", "CodeMirror-cursor", "visibility: hidden");
-    // Used to measure text size
-    var measure = elt("div", null, null, "position: absolute; width: 100%; height: 0px; overflow: hidden; visibility: hidden;");
-    var lineSpace = elt("div", [measure, cursor, widthForcer, selectionDiv, lineDiv], null, "position: relative; z-index: 0");
-    var gutterText = elt("div", null, "CodeMirror-gutter-text"), gutter = elt("div", [gutterText], "CodeMirror-gutter");
-    // Moved around its parent to cover visible view
-    var mover = elt("div", [gutter, elt("div", [lineSpace], "CodeMirror-lines")], null, "position: relative");
-    // Set to the height of the text, causes scrolling
-    var sizer = elt("div", [mover], null, "position: relative");
-    // Provides scrolling
-    var scroller = elt("div", [sizer], "CodeMirror-scroll");
-    scroller.setAttribute("tabIndex", "-1");
-    // The element in which the editor lives.
-    var wrapper = elt("div", [inputDiv, scrollbar, scroller], "CodeMirror" + (options.lineWrapping ? " CodeMirror-wrap" : ""));
-    if (place.appendChild) place.appendChild(wrapper); else place(wrapper);
-
-    themeChanged(); keyMapChanged();
-    // Needed to hide big blue blinking cursor on Mobile Safari
-    if (ios) input.style.width = "0px";
-    if (!webkit) scroller.draggable = true;
-    lineSpace.style.outline = "none";
-    if (options.tabindex != null) input.tabIndex = options.tabindex;
-    if (options.autofocus) focusInput();
-    if (!options.gutter && !options.lineNumbers) gutter.style.display = "none";
-    // Needed to handle Tab key in KHTML
-    if (khtml) inputDiv.style.height = "1px", inputDiv.style.position = "absolute";
-
-    // Check for OS X >= 10.7. This has transparent scrollbars, so the
-    // overlaying of one scrollbar with another won't work. This is a
-    // temporary hack to simply turn off the overlay scrollbar. See
-    // issue #727.
-    if (mac_geLion) { scrollbar.style.zIndex = -2; scrollbar.style.visibility = "hidden"; }
-    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-    else if (ie_lt8) scrollbar.style.minWidth = "18px";
-
-    // Delayed object wrap timeouts, making sure only one is active. blinker holds an interval.
-    var poll = new Delayed(), highlight = new Delayed(), blinker;
-
-    // mode holds a mode API object. doc is the tree of Line objects,
-    // frontier is the point up to which the content has been parsed,
-    // and history the undo history (instance of History constructor).
-    var mode, doc = new BranchChunk([new LeafChunk([new Line("")])]), frontier = 0, focused;
-    loadMode();
-    // The selection. These are always maintained to point at valid
-    // positions. Inverted is used to remember that the user is
-    // selecting bottom-to-top.
-    var sel = {from: {line: 0, ch: 0}, to: {line: 0, ch: 0}, inverted: false};
-    // Selection-related flags. shiftSelecting obviously tracks
-    // whether the user is holding shift.
-    var shiftSelecting, lastClick, lastDoubleClick, lastScrollTop = 0, draggingText,
-        overwrite = false, suppressEdits = false, pasteIncoming = false;
-    // Variables used by startOperation/endOperation to track what
-    // happened during the operation.
-    var updateInput, userSelChange, changes, textChanged, selectionChanged,
-        gutterDirty, callbacks;
-    // Current visible range (may be bigger than the view window).
-    var displayOffset = 0, showingFrom = 0, showingTo = 0, lastSizeC = 0;
-    // bracketHighlighted is used to remember that a bracket has been
-    // marked.
-    var bracketHighlighted;
-    // Tracks the maximum line length so that the horizontal scrollbar
-    // can be kept static when scrolling.
-    var maxLine = getLine(0), updateMaxLine = false, maxLineChanged = true;
-    var pollingFast = false; // Ensures slowPoll doesn't cancel fastPoll
-    var goalColumn = null;
-
-    // Initialize the content.
-    operation(function(){setValue(options.value || ""); updateInput = false;})();
-    var history = new History();
-
-    // Register our event handlers.
-    connect(scroller, "mousedown", operation(onMouseDown));
-    connect(scroller, "dblclick", operation(onDoubleClick));
-    connect(lineSpace, "selectstart", e_preventDefault);
-    // Gecko browsers fire contextmenu *after* opening the menu, at
-    // which point we can't mess with it anymore. Context menu is
-    // handled in onMouseDown for Gecko.
-    if (!gecko) connect(scroller, "contextmenu", onContextMenu);
-    connect(scroller, "scroll", onScrollMain);
-    connect(scrollbar, "scroll", onScrollBar);
-    connect(scrollbar, "mousedown", function() {if (focused) setTimeout(focusInput, 0);});
-    var resizeHandler = connect(window, "resize", function() {
-      if (wrapper.parentNode) updateDisplay(true);
-      else resizeHandler();
-    }, true);
-    connect(input, "keyup", operation(onKeyUp));
-    connect(input, "input", fastPoll);
-    connect(input, "keydown", operation(onKeyDown));
-    connect(input, "keypress", operation(onKeyPress));
-    connect(input, "focus", onFocus);
-    connect(input, "blur", onBlur);
-
-    function drag_(e) {
-      if (options.onDragEvent && options.onDragEvent(instance, addStop(e))) return;
-      e_stop(e);
-    }
-    if (options.dragDrop) {
-      connect(scroller, "dragstart", onDragStart);
-      connect(scroller, "dragenter", drag_);
-      connect(scroller, "dragover", drag_);
-      connect(scroller, "drop", operation(onDrop));
-    }
-    connect(scroller, "paste", function(){focusInput(); fastPoll();});
-    connect(input, "paste", function(){pasteIncoming = true; fastPoll();});
-    connect(input, "cut", operation(function(){
-      if (!options.readOnly) replaceSelection("");
-    }));
-
-    // Needed to handle Tab key in KHTML
-    if (khtml) connect(sizer, "mouseup", function() {
-        if (document.activeElement == input) input.blur();
-        focusInput();
-    });
-
-    // IE throws unspecified error in certain cases, when
-    // trying to access activeElement before onload
-    var hasFocus; try { hasFocus = (document.activeElement == input); } catch(e) { }
-    if (hasFocus || options.autofocus) setTimeout(onFocus, 20);
-    else onBlur();
-
-    function isLine(l) {return l >= 0 && l < doc.size;}
-    // The instance object that we'll return. Mostly calls out to
-    // local functions in the CodeMirror function. Some do some extra
-    // range checking and/or clipping. operation is used to wrap the
-    // call so that changes it makes are tracked, and the display is
-    // updated afterwards.
-    var instance = wrapper.CodeMirror = {
-      getValue: getValue,
-      setValue: operation(setValue),
-      getSelection: getSelection,
-      replaceSelection: operation(replaceSelection),
-      focus: function(){window.focus(); focusInput(); onFocus(); fastPoll();},
-      setOption: function(option, value) {
-        var oldVal = options[option];
-        options[option] = value;
-        if (option == "mode" || option == "indentUnit") loadMode();
-        else if (option == "readOnly" && value == "nocursor") {onBlur(); input.blur();}
-        else if (option == "readOnly" && !value) {resetInput(true);}
-        else if (option == "theme") themeChanged();
-        else if (option == "lineWrapping" && oldVal != value) operation(wrappingChanged)();
-        else if (option == "tabSize") updateDisplay(true);
-        else if (option == "keyMap") keyMapChanged();
-        else if (option == "tabindex") input.tabIndex = value;
-        if (option == "lineNumbers" || option == "gutter" || option == "firstLineNumber" ||
-            option == "theme" || option == "lineNumberFormatter") {
-          gutterChanged();
-          updateDisplay(true);
-        }
-      },
-      getOption: function(option) {return options[option];},
-      getMode: function() {return mode;},
-      undo: operation(undo),
-      redo: operation(redo),
-      indentLine: operation(function(n, dir) {
-        if (typeof dir != "string") {
-          if (dir == null) dir = options.smartIndent ? "smart" : "prev";
-          else dir = dir ? "add" : "subtract";
-        }
-        if (isLine(n)) indentLine(n, dir);
-      }),
-      indentSelection: operation(indentSelected),
-      historySize: function() {return {undo: history.done.length, redo: history.undone.length};},
-      clearHistory: function() {history = new History();},
-      setHistory: function(histData) {
-        history = new History();
-        history.done = histData.done;
-        history.undone = histData.undone;
-      },
-      getHistory: function() {
-        function cp(arr) {
-          for (var i = 0, nw = [], nwelt; i < arr.length; ++i) {
-            nw.push(nwelt = []);
-            for (var j = 0, elt = arr[i]; j < elt.length; ++j) {
-              var old = [], cur = elt[j];
-              nwelt.push({start: cur.start, added: cur.added, old: old});
-              for (var k = 0; k < cur.old.length; ++k) old.push(hlText(cur.old[k]));
-            }
-          }
-          return nw;
-        }
-        return {done: cp(history.done), undone: cp(history.undone)};
-      },
-      matchBrackets: operation(function(){matchBrackets(true);}),
-      getTokenAt: operation(function(pos) {
-        pos = clipPos(pos);
-        return getLine(pos.line).getTokenAt(mode, getStateBefore(pos.line), options.tabSize, pos.ch);
-      }),
-      getStateAfter: function(line) {
-        line = clipLine(line == null ? doc.size - 1: line);
-        return getStateBefore(line + 1);
-      },
-      cursorCoords: function(start, mode) {
-        if (start == null) start = sel.inverted;
-        return this.charCoords(start ? sel.from : sel.to, mode);
-      },
-      charCoords: function(pos, mode) {
-        pos = clipPos(pos);
-        if (mode == "local") return localCoords(pos, false);
-        if (mode == "div") return localCoords(pos, true);
-        return pageCoords(pos);
-      },
-      coordsChar: function(coords) {
-        var off = eltOffset(lineSpace);
-        return coordsChar(coords.x - off.left, coords.y - off.top);
-      },
-      markText: operation(markText),
-      setBookmark: setBookmark,
-      findMarksAt: findMarksAt,
-      setMarker: operation(addGutterMarker),
-      clearMarker: operation(removeGutterMarker),
-      setLineClass: operation(setLineClass),
-      hideLine: operation(function(h) {return setLineHidden(h, true);}),
-      showLine: operation(function(h) {return setLineHidden(h, false);}),
-      onDeleteLine: function(line, f) {
-        if (typeof line == "number") {
-          if (!isLine(line)) return null;
-          line = getLine(line);
-        }
-        (line.handlers || (line.handlers = [])).push(f);
-        return line;
-      },
-      lineInfo: lineInfo,
-      getViewport: function() { return {from: showingFrom, to: showingTo};},
-      addWidget: function(pos, node, scroll, vert, horiz) {
-        pos = localCoords(clipPos(pos));
-        var top = pos.yBot, left = pos.x;
-        node.style.position = "absolute";
-        sizer.appendChild(node);
-        if (vert == "over") top = pos.y;
-        else if (vert == "near") {
-          var vspace = Math.max(scroller.offsetHeight, doc.height * textHeight()),
-              hspace = Math.max(sizer.clientWidth, lineSpace.clientWidth) - paddingLeft();
-          if (pos.yBot + node.offsetHeight > vspace && pos.y > node.offsetHeight)
-            top = pos.y - node.offsetHeight;
-          if (left + node.offsetWidth > hspace)
-            left = hspace - node.offsetWidth;
-        }
-        node.style.top = (top + paddingTop()) + "px";
-        node.style.left = node.style.right = "";
-        if (horiz == "right") {
-          left = sizer.clientWidth - node.offsetWidth;
-          node.style.right = "0px";
-        } else {
-          if (horiz == "left") left = 0;
-          else if (horiz == "middle") left = (sizer.clientWidth - node.offsetWidth) / 2;
-          node.style.left = (left + paddingLeft()) + "px";
-        }
-        if (scroll)
-          scrollIntoView(left, top, left + node.offsetWidth, top + node.offsetHeight);
-      },
-
-      lineCount: function() {return doc.size;},
-      clipPos: clipPos,
-      getCursor: function(start) {
-        if (start == null) start = sel.inverted;
-        return copyPos(start ? sel.from : sel.to);
-      },
-      somethingSelected: function() {return !posEq(sel.from, sel.to);},
-      setCursor: operation(function(line, ch, user) {
-        if (ch == null && typeof line.line == "number") setCursor(line.line, line.ch, user);
-        else setCursor(line, ch, user);
-      }),
-      setSelection: operation(function(from, to, user) {
-        (user ? setSelectionUser : setSelection)(clipPos(from), clipPos(to || from));
-      }),
-      getLine: function(line) {if (isLine(line)) return getLine(line).text;},
-      getLineHandle: function(line) {if (isLine(line)) return getLine(line);},
-      setLine: operation(function(line, text) {
-        if (isLine(line)) replaceRange(text, {line: line, ch: 0}, {line: line, ch: getLine(line).text.length});
-      }),
-      removeLine: operation(function(line) {
-        if (isLine(line)) replaceRange("", {line: line, ch: 0}, clipPos({line: line+1, ch: 0}));
-      }),
-      replaceRange: operation(replaceRange),
-      getRange: function(from, to, lineSep) {return getRange(clipPos(from), clipPos(to), lineSep);},
-
-      triggerOnKeyDown: operation(onKeyDown),
-      execCommand: function(cmd) {return commands[cmd](instance);},
-      // Stuff used by commands, probably not much use to outside code.
-      moveH: operation(moveH),
-      deleteH: operation(deleteH),
-      moveV: operation(moveV),
-      toggleOverwrite: function() {
-        if(overwrite){
-          overwrite = false;
-          cursor.className = cursor.className.replace(" CodeMirror-overwrite", "");
-        } else {
-          overwrite = true;
-          cursor.className += " CodeMirror-overwrite";
-        }
-      },
-
-      posFromIndex: function(off) {
-        var lineNo = 0, ch;
-        doc.iter(0, doc.size, function(line) {
-          var sz = line.text.length + 1;
-          if (sz > off) { ch = off; return true; }
-          off -= sz;
-          ++lineNo;
-        });
-        return clipPos({line: lineNo, ch: ch});
-      },
-      indexFromPos: function (coords) {
-        if (coords.line < 0 || coords.ch < 0) return 0;
-        var index = coords.ch;
-        doc.iter(0, coords.line, function (line) {
-          index += line.text.length + 1;
-        });
-        return index;
-      },
-      scrollTo: function(x, y) {
-        if (x != null) scroller.scrollLeft = x;
-        if (y != null) scrollbar.scrollTop = scroller.scrollTop = y;
-        updateDisplay([]);
-      },
-      getScrollInfo: function() {
-        return {x: scroller.scrollLeft, y: scrollbar.scrollTop,
-                height: scrollbar.scrollHeight, width: scroller.scrollWidth};
-      },
-      setSize: function(width, height) {
-        function interpret(val) {
-          val = String(val);
-          return /^\d+$/.test(val) ? val + "px" : val;
-        }
-        if (width != null) wrapper.style.width = interpret(width);
-        if (height != null) scroller.style.height = interpret(height);
-        instance.refresh();
-      },
-
-      operation: function(f){return operation(f)();},
-      compoundChange: function(f){return compoundChange(f);},
-      refresh: function(){
-        updateDisplay(true, null, lastScrollTop);
-        if (scrollbar.scrollHeight > lastScrollTop)
-          scrollbar.scrollTop = lastScrollTop;
-      },
-      getInputField: function(){return input;},
-      getWrapperElement: function(){return wrapper;},
-      getScrollerElement: function(){return scroller;},
-      getGutterElement: function(){return gutter;}
-    };
-
-    function getLine(n) { return getLineAt(doc, n); }
-    function updateLineHeight(line, height) {
-      gutterDirty = true;
-      var diff = height - line.height;
-      for (var n = line; n; n = n.parent) n.height += diff;
-    }
-
-    function lineContent(line, wrapAt) {
-      if (!line.styles)
-        line.highlight(mode, line.stateAfter = getStateBefore(lineNo(line)), options.tabSize);
-      return line.getContent(options.tabSize, wrapAt, options.lineWrapping);
-    }
-
-    function setValue(code) {
-      var top = {line: 0, ch: 0};
-      updateLines(top, {line: doc.size - 1, ch: getLine(doc.size-1).text.length},
-                  splitLines(code), top, top);
-      updateInput = true;
-    }
-    function getValue(lineSep) {
-      var text = [];
-      doc.iter(0, doc.size, function(line) { text.push(line.text); });
-      return text.join(lineSep || "\n");
-    }
-
-    function onScrollBar(e) {
-      if (scrollbar.scrollTop != lastScrollTop) {
-        lastScrollTop = scroller.scrollTop = scrollbar.scrollTop;
-        updateDisplay([]);
-      }
-    }
-
-    function onScrollMain(e) {
-      if (options.fixedGutter && gutter.style.left != scroller.scrollLeft + "px")
-        gutter.style.left = scroller.scrollLeft + "px";
-      if (scroller.scrollTop != lastScrollTop) {
-        lastScrollTop = scroller.scrollTop;
-        if (scrollbar.scrollTop != lastScrollTop)
-          scrollbar.scrollTop = lastScrollTop;
-        updateDisplay([]);
-      }
-      if (options.onScroll) options.onScroll(instance);
-    }
-
-    function onMouseDown(e) {
-      setShift(e_prop(e, "shiftKey"));
-      // Check whether this is a click in a widget
-      for (var n = e_target(e); n != wrapper; n = n.parentNode)
-        if (n.parentNode == sizer && n != mover) return;
-
-      // See if this is a click in the gutter
-      for (var n = e_target(e); n != wrapper; n = n.parentNode)
-        if (n.parentNode == gutterText) {
-          if (options.onGutterClick)
-            options.onGutterClick(instance, indexOf(gutterText.childNodes, n) + showingFrom, e);
-          return e_preventDefault(e);
-        }
-
-      var start = posFromMouse(e);
-
-      switch (e_button(e)) {
-      case 3:
-        if (gecko) onContextMenu(e);
-        return;
-      case 2:
-        if (start) setCursor(start.line, start.ch, true);
-        setTimeout(focusInput, 20);
-        e_preventDefault(e);
-        return;
-      }
-      // For button 1, if it was clicked inside the editor
-      // (posFromMouse returning non-null), we have to adjust the
-      // selection.
-      if (!start) {if (e_target(e) == scroller) e_preventDefault(e); return;}
-
-      if (!focused) onFocus();
-
-      var now = +new Date, type = "single";
-      if (lastDoubleClick && lastDoubleClick.time > now - 400 && posEq(lastDoubleClick.pos, start)) {
-        type = "triple";
-        e_preventDefault(e);
-        setTimeout(focusInput, 20);
-        selectLine(start.line);
-      } else if (lastClick && lastClick.time > now - 400 && posEq(lastClick.pos, start)) {
-        type = "double";
-        lastDoubleClick = {time: now, pos: start};
-        e_preventDefault(e);
-        var word = findWordAt(start);
-        setSelectionUser(word.from, word.to);
-      } else { lastClick = {time: now, pos: start}; }
-
-      function dragEnd(e2) {
-        if (webkit) scroller.draggable = false;
-        draggingText = false;
-        up(); drop();
-        if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
-          e_preventDefault(e2);
-          setCursor(start.line, start.ch, true);
-          focusInput();
-        }
-      }
-      var last = start, going;
-      if (options.dragDrop && dragAndDrop && !options.readOnly && !posEq(sel.from, sel.to) &&
-          !posLess(start, sel.from) && !posLess(sel.to, start) && type == "single") {
-        // Let the drag handler handle this.
-        if (webkit) scroller.draggable = true;
-        var up = connect(document, "mouseup", operation(dragEnd), true);
-        var drop = connect(scroller, "drop", operation(dragEnd), true);
-        draggingText = true;
-        // IE's approach to draggable
-        if (scroller.dragDrop) scroller.dragDrop();
-        return;
-      }
-      e_preventDefault(e);
-      if (type == "single") setCursor(start.line, start.ch, true);
-
-      var startstart = sel.from, startend = sel.to;
-
-      function doSelect(cur) {
-        if (type == "single") {
-          setSelectionUser(start, cur);
-        } else if (type == "double") {
-          var word = findWordAt(cur);
-          if (posLess(cur, startstart)) setSelectionUser(word.from, startend);
-          else setSelectionUser(startstart, word.to);
-        } else if (type == "triple") {
-          if (posLess(cur, startstart)) setSelectionUser(startend, clipPos({line: cur.line, ch: 0}));
-          else setSelectionUser(startstart, clipPos({line: cur.line + 1, ch: 0}));
-        }
-      }
-
-      function extend(e) {
-        var cur = posFromMouse(e, true);
-        if (cur && !posEq(cur, last)) {
-          if (!focused) onFocus();
-          last = cur;
-          doSelect(cur);
-          updateInput = false;
-          var visible = visibleLines();
-          if (cur.line >= visible.to || cur.line < visible.from)
-            going = setTimeout(operation(function(){extend(e);}), 150);
-        }
-      }
-
-      function done(e) {
-        clearTimeout(going);
-        var cur = posFromMouse(e);
-        if (cur) doSelect(cur);
-        e_preventDefault(e);
-        focusInput();
-        updateInput = true;
-        move(); up();
-      }
-      var move = connect(document, "mousemove", operation(function(e) {
-        clearTimeout(going);
-        e_preventDefault(e);
-        if (!ie && !e_button(e)) done(e);
-        else extend(e);
-      }), true);
-      var up = connect(document, "mouseup", operation(done), true);
-    }
-    function onDoubleClick(e) {
-      for (var n = e_target(e); n != wrapper; n = n.parentNode)
-        if (n.parentNode == gutterText) return e_preventDefault(e);
-      e_preventDefault(e);
-    }
-    function onDrop(e) {
-      if (options.onDragEvent && options.onDragEvent(instance, addStop(e))) return;
-      e_preventDefault(e);
-      var pos = posFromMouse(e, true), files = e.dataTransfer.files;
-      if (!pos || options.readOnly) return;
-      if (files && files.length && window.FileReader && window.File) {
-        var n = files.length, text = Array(n), read = 0;
-        var loadFile = function(file, i) {
-          var reader = new FileReader;
-          reader.onload = function() {
-            text[i] = reader.result;
-            if (++read == n) {
-              pos = clipPos(pos);
-              operation(function() {
-                var end = replaceRange(text.join(""), pos, pos);
-                setSelectionUser(pos, end);
-              })();
-            }
-          };
-          reader.readAsText(file);
-        };
-        for (var i = 0; i < n; ++i) loadFile(files[i], i);
-      } else {
-        // Don't do a replace if the drop happened inside of the selected text.
-        if (draggingText && !(posLess(pos, sel.from) || posLess(sel.to, pos))) return;
-        try {
-          var text = e.dataTransfer.getData("Text");
-          if (text) {
-            compoundChange(function() {
-              var curFrom = sel.from, curTo = sel.to;
-              setSelectionUser(pos, pos);
-              if (draggingText) replaceRange("", curFrom, curTo);
-              replaceSelection(text);
-              focusInput();
-            });
-          }
-        }
-        catch(e){}
-      }
-    }
-    function onDragStart(e) {
-      var txt = getSelection();
-      e.dataTransfer.setData("Text", txt);
-
-      // Use dummy image instead of default browsers image.
-      if (e.dataTransfer.setDragImage)
-        e.dataTransfer.setDragImage(elt('img'), 0, 0);
-    }
-
-    function doHandleBinding(bound, dropShift) {
-      if (typeof bound == "string") {
-        bound = commands[bound];
-        if (!bound) return false;
-      }
-      var prevShift = shiftSelecting;
-      try {
-        if (options.readOnly) suppressEdits = true;
-        if (dropShift) shiftSelecting = null;
-        bound(instance);
-      } catch(e) {
-        if (e != Pass) throw e;
-        return false;
-      } finally {
-        shiftSelecting = prevShift;
-        suppressEdits = false;
-      }
-      return true;
-    }
-    var maybeTransition;
-    function handleKeyBinding(e) {
-      // Handle auto keymap transitions
-      var startMap = getKeyMap(options.keyMap), next = startMap.auto;
-      clearTimeout(maybeTransition);
-      if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() {
-        if (getKeyMap(options.keyMap) == startMap) {
-          options.keyMap = (next.call ? next.call(null, instance) : next);
-        }
-      }, 50);
-
-      var name = keyNames[e_prop(e, "keyCode")], handled = false;
-      var flipCtrlCmd = opera && mac;
-      if (name == null || e.altGraphKey) return false;
-      if (e_prop(e, "altKey")) name = "Alt-" + name;
-      if (e_prop(e, flipCtrlCmd ? "metaKey" : "ctrlKey")) name = "Ctrl-" + name;
-      if (e_prop(e, flipCtrlCmd ? "ctrlKey" : "metaKey")) name = "Cmd-" + name;
-
-      var stopped = false;
-      function stop() { stopped = true; }
-
-      if (e_prop(e, "shiftKey")) {
-        handled = lookupKey("Shift-" + name, options.extraKeys, options.keyMap,
-                            function(b) {return doHandleBinding(b, true);}, stop)
-               || lookupKey(name, options.extraKeys, options.keyMap, function(b) {
-                 if (typeof b == "string" && /^go[A-Z]/.test(b)) return doHandleBinding(b);
-               }, stop);
-      } else {
-        handled = lookupKey(name, options.extraKeys, options.keyMap, doHandleBinding, stop);
-      }
-      if (stopped) handled = false;
-      if (handled) {
-        e_preventDefault(e);
-        restartBlink();
-        if (ie) { e.oldKeyCode = e.keyCode; e.keyCode = 0; }
-      }
-      return handled;
-    }
-    function handleCharBinding(e, ch) {
-      var handled = lookupKey("'" + ch + "'", options.extraKeys,
-                              options.keyMap, function(b) { return doHandleBinding(b, true); });
-      if (handled) {
-        e_preventDefault(e);
-        restartBlink();
-      }
-      return handled;
-    }
-
-    var lastStoppedKey = null;
-    function onKeyDown(e) {
-      if (!focused) onFocus();
-      if (ie && e.keyCode == 27) { e.returnValue = false; }
-      if (pollingFast) { if (readInput()) pollingFast = false; }
-      if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
-      var code = e_prop(e, "keyCode");
-      // IE does strange things with escape.
-      setShift(code == 16 || e_prop(e, "shiftKey"));
-      // First give onKeyEvent option a chance to handle this.
-      var handled = handleKeyBinding(e);
-      if (opera) {
-        lastStoppedKey = handled ? code : null;
-        // Opera has no cut event... we try to at least catch the key combo
-        if (!handled && code == 88 && e_prop(e, mac ? "metaKey" : "ctrlKey"))
-          replaceSelection("");
-      }
-    }
-    function onKeyPress(e) {
-      if (pollingFast) readInput();
-      if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
-      var keyCode = e_prop(e, "keyCode"), charCode = e_prop(e, "charCode");
-      if (opera && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
-      if (((opera && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(e)) return;
-      var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
-      if (options.electricChars && mode.electricChars && options.smartIndent && !options.readOnly) {
-        if (mode.electricChars.indexOf(ch) > -1)
-          setTimeout(operation(function() {indentLine(sel.to.line, "smart");}), 75);
-      }
-      if (handleCharBinding(e, ch)) return;
-      fastPoll();
-    }
-    function onKeyUp(e) {
-      if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
-      if (e_prop(e, "keyCode") == 16) shiftSelecting = null;
-    }
-
-    function onFocus() {
-      if (options.readOnly == "nocursor") return;
-      if (!focused) {
-        if (options.onFocus) options.onFocus(instance);
-        focused = true;
-        if (scroller.className.search(/\bCodeMirror-focused\b/) == -1)
-          scroller.className += " CodeMirror-focused";
-      }
-      slowPoll();
-      restartBlink();
-    }
-    function onBlur() {
-      if (focused) {
-        if (options.onBlur) options.onBlur(instance);
-        focused = false;
-        if (bracketHighlighted)
-          operation(function(){
-            if (bracketHighlighted) { bracketHighlighted(); bracketHighlighted = null; }
-          })();
-        scroller.className = scroller.className.replace(" CodeMirror-focused", "");
-      }
-      clearInterval(blinker);
-      setTimeout(function() {if (!focused) shiftSelecting = null;}, 150);
-    }
-
-    // Replace the range from from to to by the strings in newText.
-    // Afterwards, set the selection to selFrom, selTo.
-    function updateLines(from, to, newText, selFrom, selTo) {
-      if (suppressEdits) return;
-      var old = [];
-      doc.iter(from.line, to.line + 1, function(line) {
-        old.push(newHL(line.text, line.markedSpans));
-      });
-      if (history) {
-        history.addChange(from.line, newText.length, old);
-        while (history.done.length > options.undoDepth) history.done.shift();
-      }
-      var lines = updateMarkedSpans(hlSpans(old[0]), hlSpans(lst(old)), from.ch, to.ch, newText);
-      updateLinesNoUndo(from, to, lines, selFrom, selTo);
-    }
-    function unredoHelper(from, to) {
-      if (!from.length) return;
-      var set = from.pop(), out = [];
-      for (var i = set.length - 1; i >= 0; i -= 1) {
-        var change = set[i];
-        var replaced = [], end = change.start + change.added;
-        doc.iter(change.start, end, function(line) { replaced.push(newHL(line.text, line.markedSpans)); });
-        out.push({start: change.start, added: change.old.length, old: replaced});
-        var pos = {line: change.start + change.old.length - 1,
-                   ch: editEnd(hlText(lst(replaced)), hlText(lst(change.old)))};
-        updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: getLine(end-1).text.length},
-                          change.old, pos, pos);
-      }
-      updateInput = true;
-      to.push(out);
-    }
-    function undo() {unredoHelper(history.done, history.undone);}
-    function redo() {unredoHelper(history.undone, history.done);}
-
-    function updateLinesNoUndo(from, to, lines, selFrom, selTo) {
-      if (suppressEdits) return;
-      var recomputeMaxLength = false, maxLineLength = maxLine.text.length;
-      if (!options.lineWrapping)
-        doc.iter(from.line, to.line + 1, function(line) {
-          if (!line.hidden && line.text.length == maxLineLength) {recomputeMaxLength = true; return true;}
-        });
-      if (from.line != to.line || lines.length > 1) gutterDirty = true;
-
-      var nlines = to.line - from.line, firstLine = getLine(from.line), lastLine = getLine(to.line);
-      var lastHL = lst(lines);
-
-      // First adjust the line structure
-      if (from.ch == 0 && to.ch == 0 && hlText(lastHL) == "") {
-        // This is a whole-line replace. Treated specially to make
-        // sure line objects move the way they are supposed to.
-        var added = [], prevLine = null;
-        for (var i = 0, e = lines.length - 1; i < e; ++i)
-          added.push(new Line(hlText(lines[i]), hlSpans(lines[i])));
-        lastLine.update(lastLine.text, hlSpans(lastHL));
-        if (nlines) doc.remove(from.line, nlines, callbacks);
-        if (added.length) doc.insert(from.line, added);
-      } else if (firstLine == lastLine) {
-        if (lines.length == 1) {
-          firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]) + firstLine.text.slice(to.ch), hlSpans(lines[0]));
-        } else {
-          for (var added = [], i = 1, e = lines.length - 1; i < e; ++i)
-            added.push(new Line(hlText(lines[i]), hlSpans(lines[i])));
-          added.push(new Line(hlText(lastHL) + firstLine.text.slice(to.ch), hlSpans(lastHL)));
-          firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]), hlSpans(lines[0]));
-          doc.insert(from.line + 1, added);
-        }
-      } else if (lines.length == 1) {
-        firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]) + lastLine.text.slice(to.ch), hlSpans(lines[0]));
-        doc.remove(from.line + 1, nlines, callbacks);
-      } else {
-        var added = [];
-        firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]), hlSpans(lines[0]));
-        lastLine.update(hlText(lastHL) + lastLine.text.slice(to.ch), hlSpans(lastHL));
-        for (var i = 1, e = lines.length - 1; i < e; ++i)
-          added.push(new Line(hlText(lines[i]), hlSpans(lines[i])));
-        if (nlines > 1) doc.remove(from.line + 1, nlines - 1, callbacks);
-        doc.insert(from.line + 1, added);
-      }
-      if (options.lineWrapping) {
-        var perLine = Math.max(5, scroller.clientWidth / charWidth() - 3);
-        doc.iter(from.line, from.line + lines.length, function(line) {
-          if (line.hidden) return;
-          var guess = Math.ceil(line.text.length / perLine) || 1;
-          if (guess != line.height) updateLineHeight(line, guess);
-        });
-      } else {
-        doc.iter(from.line, from.line + lines.length, function(line) {
-          var l = line.text;
-          if (!line.hidden && l.length > maxLineLength) {
-            maxLine = line; maxLineLength = l.length; maxLineChanged = true;
-            recomputeMaxLength = false;
-          }
-        });
-        if (recomputeMaxLength) updateMaxLine = true;
-      }
-
-      // Adjust frontier, schedule worker
-      frontier = Math.min(frontier, from.line);
-      startWorker(400);
-
-      var lendiff = lines.length - nlines - 1;
-      // Remember that these lines changed, for updating the display
-      changes.push({from: from.line, to: to.line + 1, diff: lendiff});
-      if (options.onChange) {
-        // Normalize lines to contain only strings, since that's what
-        // the change event handler expects
-        for (var i = 0; i < lines.length; ++i)
-          if (typeof lines[i] != "string") lines[i] = lines[i].text;
-        var changeObj = {from: from, to: to, text: lines};
-        if (textChanged) {
-          for (var cur = textChanged; cur.next; cur = cur.next) {}
-          cur.next = changeObj;
-        } else textChanged = changeObj;
-      }
-
-      // Update the selection
-      function updateLine(n) {return n <= Math.min(to.line, to.line + lendiff) ? n : n + lendiff;}
-      setSelection(clipPos(selFrom), clipPos(selTo),
-                   updateLine(sel.from.line), updateLine(sel.to.line));
-    }
-
-    function needsScrollbar() {
-      var realHeight = doc.height * textHeight() + 2 * paddingTop();
-      return realHeight * .99 > scroller.offsetHeight ? realHeight : false;
-    }
-
-    function updateVerticalScroll(scrollTop) {
-      var scrollHeight = needsScrollbar();
-      scrollbar.style.display = scrollHeight ? "block" : "none";
-      if (scrollHeight) {
-        scrollbarInner.style.height = sizer.style.minHeight = scrollHeight + "px";
-        scrollbar.style.height = scroller.clientHeight + "px";
-        if (scrollTop != null) {
-          scrollbar.scrollTop = scroller.scrollTop = scrollTop;
-          // 'Nudge' the scrollbar to work around a Webkit bug where,
-          // in some situations, we'd end up with a scrollbar that
-          // reported its scrollTop (and looked) as expected, but
-          // *behaved* as if it was still in a previous state (i.e.
-          // couldn't scroll up, even though it appeared to be at the
-          // bottom).
-          if (webkit) setTimeout(function() {
-            if (scrollbar.scrollTop != scrollTop) return;
-            scrollbar.scrollTop = scrollTop + (scrollTop ? -1 : 1);
-            scrollbar.scrollTop = scrollTop;
-          }, 0);
-        }
-      } else {
-        sizer.style.minHeight = "";
-      }
-      // Position the mover div to align with the current virtual scroll position
-      mover.style.top = displayOffset * textHeight() + "px";
-    }
-
-    function computeMaxLength() {
-      maxLine = getLine(0); maxLineChanged = true;
-      var maxLineLength = maxLine.text.length;
-      doc.iter(1, doc.size, function(line) {
-        var l = line.text;
-        if (!line.hidden && l.length > maxLineLength) {
-          maxLineLength = l.length; maxLine = line;
-        }
-      });
-      updateMaxLine = false;
-    }
-
-    function replaceRange(code, from, to) {
-      from = clipPos(from);
-      if (!to) to = from; else to = clipPos(to);
-      code = splitLines(code);
-      function adjustPos(pos) {
-        if (posLess(pos, from)) return pos;
-        if (!posLess(to, pos)) return end;
-        var line = pos.line + code.length - (to.line - from.line) - 1;
-        var ch = pos.ch;
-        if (pos.line == to.line)
-          ch += lst(code).length - (to.ch - (to.line == from.line ? from.ch : 0));
-        return {line: line, ch: ch};
-      }
-      var end;
-      replaceRange1(code, from, to, function(end1) {
-        end = end1;
-        return {from: adjustPos(sel.from), to: adjustPos(sel.to)};
-      });
-      return end;
-    }
-    function replaceSelection(code, collapse) {
-      replaceRange1(splitLines(code), sel.from, sel.to, function(end) {
-        if (collapse == "end") return {from: end, to: end};
-        else if (collapse == "start") return {from: sel.from, to: sel.from};
-        else return {from: sel.from, to: end};
-      });
-    }
-    function replaceRange1(code, from, to, computeSel) {
-      var endch = code.length == 1 ? code[0].length + from.ch : lst(code).length;
-      var newSel = computeSel({line: from.line + code.length - 1, ch: endch});
-      updateLines(from, to, code, newSel.from, newSel.to);
-    }
-
-    function getRange(from, to, lineSep) {
-      var l1 = from.line, l2 = to.line;
-      if (l1 == l2) return getLine(l1).text.slice(from.ch, to.ch);
-      var code = [getLine(l1).text.slice(from.ch)];
-      doc.iter(l1 + 1, l2, function(line) { code.push(line.text); });
-      code.push(getLine(l2).text.slice(0, to.ch));
-      return code.join(lineSep || "\n");
-    }
-    function getSelection(lineSep) {
-      return getRange(sel.from, sel.to, lineSep);
-    }
-
-    function slowPoll() {
-      if (pollingFast) return;
-      poll.set(options.pollInterval, function() {
-        readInput();
-        if (focused) slowPoll();
-      });
-    }
-    function fastPoll() {
-      var missed = false;
-      pollingFast = true;
-      function p() {
-        var changed = readInput();
-        if (!changed && !missed) {missed = true; poll.set(60, p);}
-        else {pollingFast = false; slowPoll();}
-      }
-      poll.set(20, p);
-    }
-
-    // Previnput is a hack to work with IME. If we reset the textarea
-    // on every change, that breaks IME. So we look for changes
-    // compared to the previous content instead. (Modern browsers have
-    // events that indicate IME taking place, but these are not widely
-    // supported or compatible enough yet to rely on.)
-    var prevInput = "";
-    function readInput() {
-      if (!focused || hasSelection(input) || options.readOnly) return false;
-      var text = input.value;
-      if (text == prevInput) return false;
-      if (!nestedOperation) startOperation();
-      shiftSelecting = null;
-      var same = 0, l = Math.min(prevInput.length, text.length);
-      while (same < l && prevInput[same] == text[same]) ++same;
-      if (same < prevInput.length)
-        sel.from = {line: sel.from.line, ch: sel.from.ch - (prevInput.length - same)};
-      else if (overwrite && posEq(sel.from, sel.to) && !pasteIncoming)
-        sel.to = {line: sel.to.line, ch: Math.min(getLine(sel.to.line).text.length, sel.to.ch + (text.length - same))};
-      replaceSelection(text.slice(same), "end");
-      if (text.length > 1000) { input.value = prevInput = ""; }
-      else prevInput = text;
-      if (!nestedOperation) endOperation();
-      pasteIncoming = false;
-      return true;
-    }
-    function resetInput(user) {
-      if (!posEq(sel.from, sel.to)) {
-        prevInput = "";
-        input.value = getSelection();
-        if (focused) selectInput(input);
-      } else if (user) prevInput = input.value = "";
-    }
-
-    function focusInput() {
-      if (options.readOnly != "nocursor") input.focus();
-    }
-
-    function scrollCursorIntoView() {
-      var coords = calculateCursorCoords();
-      scrollIntoView(coords.x, coords.y, coords.x, coords.yBot);
-      if (!focused) return;
-      var box = sizer.getBoundingClientRect(), doScroll = null;
-      if (coords.y + box.top < 0) doScroll = true;
-      else if (coords.y + box.top + textHeight() > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
-      if (doScroll != null) {
-        var hidden = cursor.style.display == "none";
-        if (hidden) {
-          cursor.style.display = "";
-          cursor.style.left = coords.x + "px";
-          cursor.style.top = (coords.y - displayOffset) + "px";
-        }
-        cursor.scrollIntoView(doScroll);
-        if (hidden) cursor.style.display = "none";
-      }
-    }
-    function calculateCursorCoords() {
-      var cursor = localCoords(sel.inverted ? sel.from : sel.to);
-      var x = options.lineWrapping ? Math.min(cursor.x, lineSpace.offsetWidth) : cursor.x;
-      return {x: x, y: cursor.y, yBot: cursor.yBot};
-    }
-    function scrollIntoView(x1, y1, x2, y2) {
-      var scrollPos = calculateScrollPos(x1, y1, x2, y2);
-      if (scrollPos.scrollLeft != null) {scroller.scrollLeft = scrollPos.scrollLeft;}
-      if (scrollPos.scrollTop != null) {scrollbar.scrollTop = scroller.scrollTop = scrollPos.scrollTop;}
-    }
-    function calculateScrollPos(x1, y1, x2, y2) {
-      var pl = paddingLeft(), pt = paddingTop();
-      y1 += pt; y2 += pt; x1 += pl; x2 += pl;
-      var screen = scroller.clientHeight, screentop = scrollbar.scrollTop, result = {};
-      var docBottom = needsScrollbar() || Infinity;
-      var atTop = y1 < pt + 10, atBottom = y2 + pt > docBottom - 10;
-      if (y1 < screentop) result.scrollTop = atTop ? 0 : Math.max(0, y1);
-      else if (y2 > screentop + screen) result.scrollTop = (atBottom ? docBottom : y2) - screen;
-
-      var screenw = scroller.clientWidth, screenleft = scroller.scrollLeft;
-      var gutterw = options.fixedGutter ? gutter.clientWidth : 0;
-      var atLeft = x1 < gutterw + pl + 10;
-      if (x1 < screenleft + gutterw || atLeft) {
-        if (atLeft) x1 = 0;
-        result.scrollLeft = Math.max(0, x1 - 10 - gutterw);
-      } else if (x2 > screenw + screenleft - 3) {
-        result.scrollLeft = x2 + 10 - screenw;
-      }
-      return result;
-    }
-
-    function visibleLines(scrollTop) {
-      var lh = textHeight(), top = (scrollTop != null ? scrollTop : scrollbar.scrollTop) - paddingTop();
-      var fromHeight = Math.max(0, Math.floor(top / lh));
-      var toHeight = Math.ceil((top + scroller.clientHeight) / lh);
-      return {from: lineAtHeight(doc, fromHeight),
-              to: lineAtHeight(doc, toHeight)};
-    }
-    // Uses a set of changes plus the current scroll position to
-    // determine which DOM updates have to be made, and makes the
-    // updates.
-    function updateDisplay(changes, suppressCallback, scrollTop) {
-      if (!scroller.clientWidth) {
-        showingFrom = showingTo = displayOffset = 0;
-        return;
-      }
-      // Compute the new visible window
-      // If scrollTop is specified, use that to determine which lines
-      // to render instead of the current scrollbar position.
-      var visible = visibleLines(scrollTop);
-      // Bail out if the visible area is already rendered and nothing changed.
-      if (changes !== true && changes.length == 0 && visible.from > showingFrom && visible.to < showingTo) {
-        updateVerticalScroll(scrollTop);
-        return;
-      }
-      var from = Math.max(visible.from - 100, 0), to = Math.min(doc.size, visible.to + 100);
-      if (showingFrom < from && from - showingFrom < 20) from = showingFrom;
-      if (showingTo > to && showingTo - to < 20) to = Math.min(doc.size, showingTo);
-
-      // Create a range of theoretically intact lines, and punch holes
-      // in that using the change info.
-      var intact = changes === true ? [] :
-        computeIntact([{from: showingFrom, to: showingTo, domStart: 0}], changes);
-      // Clip off the parts that won't be visible
-      var intactLines = 0;
-      for (var i = 0; i < intact.length; ++i) {
-        var range = intact[i];
-        if (range.from < from) {range.domStart += (from - range.from); range.from = from;}
-        if (range.to > to) range.to = to;
-        if (range.from >= range.to) intact.splice(i--, 1);
-        else intactLines += range.to - range.from;
-      }
-      if (intactLines == to - from && from == showingFrom && to == showingTo) {
-        updateVerticalScroll(scrollTop);
-        return;
-      }
-      intact.sort(function(a, b) {return a.domStart - b.domStart;});
-
-      var th = textHeight(), gutterDisplay = gutter.style.display;
-      lineDiv.style.display = "none";
-      patchDisplay(from, to, intact);
-      lineDiv.style.display = gutter.style.display = "";
-
-      var different = from != showingFrom || to != showingTo || lastSizeC != scroller.clientHeight + th;
-      // This is just a bogus formula that detects when the editor is
-      // resized or the font size changes.
-      if (different) lastSizeC = scroller.clientHeight + th;
-      if (from != showingFrom || to != showingTo && options.onViewportChange)
-        setTimeout(function(){
-          if (options.onViewportChange) options.onViewportChange(instance, from, to);
-        });
-      showingFrom = from; showingTo = to;
-      displayOffset = heightAtLine(doc, from);
-      startWorker(100);
-
-      // Since this is all rather error prone, it is honoured with the
-      // only assertion in the whole file.
-      if (lineDiv.childNodes.length != showingTo - showingFrom)
-        throw new Error("BAD PATCH! " + JSON.stringify(intact) + " size=" + (showingTo - showingFrom) +
-                        " nodes=" + lineDiv.childNodes.length);
-
-      function checkHeights() {
-        var curNode = lineDiv.firstChild, heightChanged = false;
-        doc.iter(showingFrom, showingTo, function(line) {
-          // Work around bizarro IE7 bug where, sometimes, our curNode
-          // is magically replaced with a new node in the DOM, leaving
-          // us with a reference to an orphan (nextSibling-less) node.
-          if (!curNode) return;
-          if (!line.hidden) {
-            var height = Math.round(curNode.offsetHeight / th) || 1;
-            if (line.height != height) {
-              updateLineHeight(line, height);
-              gutterDirty = heightChanged = true;
-            }
-          }
-          curNode = curNode.nextSibling;
-        });
-        return heightChanged;
-      }
-
-      if (options.lineWrapping) checkHeights();
-
-      gutter.style.display = gutterDisplay;
-      if (different || gutterDirty) {
-        // If the gutter grew in size, re-check heights. If those changed, re-draw gutter.
-        updateGutter() && options.lineWrapping && checkHeights() && updateGutter();
-      }
-      updateVerticalScroll(scrollTop);
-      updateSelection();
-      if (!suppressCallback && options.onUpdate) options.onUpdate(instance);
-      return true;
-    }
-
-    function computeIntact(intact, changes) {
-      for (var i = 0, l = changes.length || 0; i < l; ++i) {
-        var change = changes[i], intact2 = [], diff = change.diff || 0;
-        for (var j = 0, l2 = intact.length; j < l2; ++j) {
-          var range = intact[j];
-          if (change.to <= range.from && change.diff)
-            intact2.push({from: range.from + diff, to: range.to + diff,
-                          domStart: range.domStart});
-          else if (change.to <= range.from || change.from >= range.to)
-            intact2.push(range);
-          else {
-            if (change.from > range.from)
-              intact2.push({from: range.from, to: change.from, domStart: range.domStart});
-            if (change.to < range.to)
-              intact2.push({from: change.to + diff, to: range.to + diff,
-                            domStart: range.domStart + (change.to - range.from)});
-          }
-        }
-        intact = intact2;
-      }
-      return intact;
-    }
-
-    function patchDisplay(from, to, intact) {
-      function killNode(node) {
-        var tmp = node.nextSibling;
-        node.parentNode.removeChild(node);
-        return tmp;
-      }
-      // The first pass removes the DOM nodes that aren't intact.
-      if (!intact.length) removeChildren(lineDiv);
-      else {
-        var domPos = 0, curNode = lineDiv.firstChild, n;
-        for (var i = 0; i < intact.length; ++i) {
-          var cur = intact[i];
-          while (cur.domStart > domPos) {curNode = killNode(curNode); domPos++;}
-          for (var j = 0, e = cur.to - cur.from; j < e; ++j) {curNode = curNode.nextSibling; domPos++;}
-        }
-        while (curNode) curNode = killNode(curNode);
-      }
-      // This pass fills in the lines that actually changed.
-      var nextIntact = intact.shift(), curNode = lineDiv.firstChild, j = from;
-      doc.iter(from, to, function(line) {
-        if (nextIntact && nextIntact.to == j) nextIntact = intact.shift();
-        if (!nextIntact || nextIntact.from > j) {
-          if (line.hidden) var lineElement = elt("pre");
-          else {
-            var lineElement = lineContent(line);
-            if (line.className) lineElement.className = line.className;
-            // Kludge to make sure the styled element lies behind the selection (by z-index)
-            if (line.bgClassName) {
-              var pre = elt("pre", "\u00a0", line.bgClassName, "position: absolute; left: 0; right: 0; top: 0; bottom: 0; z-index: -2");
-              lineElement = elt("div", [pre, lineElement], null, "position: relative");
-            }
-          }
-          lineDiv.insertBefore(lineElement, curNode);
-        } else {
-          curNode = curNode.nextSibling;
-        }
-        ++j;
-      });
-    }
-
-    function updateGutter() {
-      if (!options.gutter && !options.lineNumbers) return;
-      var hText = mover.offsetHeight, hEditor = scroller.clientHeight;
-      gutter.style.height = (hText - hEditor < 2 ? hEditor : hText) + "px";
-      var fragment = document.createDocumentFragment(), i = showingFrom, normalNode;
-      doc.iter(showingFrom, Math.max(showingTo, showingFrom + 1), function(line) {
-        if (line.hidden) {
-          fragment.appendChild(elt("pre"));
-        } else {
-          var marker = line.gutterMarker;
-          var text = options.lineNumbers ? options.lineNumberFormatter(i + options.firstLineNumber) : null;
-          if (marker && marker.text)
-            text = marker.text.replace("%N%", text != null ? text : "");
-          else if (text == null)
-            text = "\u00a0";
-          var markerElement = fragment.appendChild(elt("pre", null, marker && marker.style));
-          markerElement.innerHTML = text;
-          for (var j = 1; j < line.height; ++j) {
-            markerElement.appendChild(elt("br"));
-            markerElement.appendChild(document.createTextNode("\u00a0"));
-          }
-          if (!marker) normalNode = i;
-        }
-        ++i;
-      });
-      gutter.style.display = "none";
-      removeChildrenAndAdd(gutterText, fragment);
-      // Make sure scrolling doesn't cause number gutter size to pop
-      if (normalNode != null && options.lineNumbers) {
-        var node = gutterText.childNodes[normalNode - showingFrom];
-        var minwidth = String(doc.size).length, val = eltText(node.firstChild), pad = "";
-        while (val.length + pad.length < minwidth) pad += "\u00a0";
-        if (pad) node.insertBefore(document.createTextNode(pad), node.firstChild);
-      }
-      gutter.style.display = "";
-      var resized = Math.abs((parseInt(lineSpace.style.marginLeft) || 0) - gutter.offsetWidth) > 2;
-      lineSpace.style.marginLeft = gutter.offsetWidth + "px";
-      gutterDirty = false;
-      return resized;
-    }
-    function updateSelection() {
-      var collapsed = posEq(sel.from, sel.to);
-      var fromPos = localCoords(sel.from, true);
-      var toPos = collapsed ? fromPos : localCoords(sel.to, true);
-      var headPos = sel.inverted ? fromPos : toPos, th = textHeight();
-      var wrapOff = eltOffset(wrapper), lineOff = eltOffset(lineDiv);
-      inputDiv.style.top = Math.max(0, Math.min(scroller.offsetHeight, headPos.y + lineOff.top - wrapOff.top)) + "px";
-      inputDiv.style.left = Math.max(0, Math.min(scroller.offsetWidth, headPos.x + lineOff.left - wrapOff.left)) + "px";
-      if (collapsed) {
-        cursor.style.top = headPos.y + "px";
-        cursor.style.left = (options.lineWrapping ? Math.min(headPos.x, lineSpace.offsetWidth) : headPos.x) + "px";
-        cursor.style.display = "";
-        selectionDiv.style.display = "none";
-      } else {
-        var sameLine = fromPos.y == toPos.y, fragment = document.createDocumentFragment();
-        var clientWidth = lineSpace.clientWidth || lineSpace.offsetWidth;
-        var clientHeight = lineSpace.clientHeight || lineSpace.offsetHeight;
-        var add = function(left, top, right, height) {
-          var rstyle = quirksMode ? "width: " + (!right ? clientWidth : clientWidth - right - left) + "px"
-                                  : "right: " + right + "px";
-          fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
-                                   "px; top: " + top + "px; " + rstyle + "; height: " + height + "px"));
-        };
-        if (sel.from.ch && fromPos.y >= 0) {
-          var right = sameLine ? clientWidth - toPos.x : 0;
-          add(fromPos.x, fromPos.y, right, th);
-        }
-        var middleStart = Math.max(0, fromPos.y + (sel.from.ch ? th : 0));
-        var middleHeight = Math.min(toPos.y, clientHeight) - middleStart;
-        if (middleHeight > 0.2 * th)
-          add(0, middleStart, 0, middleHeight);
-        if ((!sameLine || !sel.from.ch) && toPos.y < clientHeight - .5 * th)
-          add(0, toPos.y, clientWidth - toPos.x, th);
-        removeChildrenAndAdd(selectionDiv, fragment);
-        cursor.style.display = "none";
-        selectionDiv.style.display = "";
-      }
-    }
-
-    function setShift(val) {
-      if (val) shiftSelecting = shiftSelecting || (sel.inverted ? sel.to : sel.from);
-      else shiftSelecting = null;
-    }
-    function setSelectionUser(from, to) {
-      var sh = shiftSelecting && clipPos(shiftSelecting);
-      if (sh) {
-        if (posLess(sh, from)) from = sh;
-        else if (posLess(to, sh)) to = sh;
-      }
-      setSelection(from, to);
-      userSelChange = true;
-    }
-    // Update the selection. Last two args are only used by
-    // updateLines, since they have to be expressed in the line
-    // numbers before the update.
-    function setSelection(from, to, oldFrom, oldTo) {
-      goalColumn = null;
-      if (oldFrom == null) {oldFrom = sel.from.line; oldTo = sel.to.line;}
-      if (posEq(sel.from, from) && posEq(sel.to, to)) return;
-      if (posLess(to, from)) {var tmp = to; to = from; from = tmp;}
-
-      // Skip over hidden lines.
-      if (from.line != oldFrom) {
-        var from1 = skipHidden(from, oldFrom, sel.from.ch);
-        // If there is no non-hidden line left, force visibility on current line
-        if (!from1) setLineHidden(from.line, false);
-        else from = from1;
-      }
-      if (to.line != oldTo) to = skipHidden(to, oldTo, sel.to.ch);
-
-      if (posEq(from, to)) sel.inverted = false;
-      else if (posEq(from, sel.to)) sel.inverted = false;
-      else if (posEq(to, sel.from)) sel.inverted = true;
-
-      if (options.autoClearEmptyLines && posEq(sel.from, sel.to)) {
-        var head = sel.inverted ? from : to;
-        if (head.line != sel.from.line && sel.from.line < doc.size) {
-          var oldLine = getLine(sel.from.line);
-          if (/^\s+$/.test(oldLine.text))
-            setTimeout(operation(function() {
-              if (oldLine.parent && /^\s+$/.test(oldLine.text)) {
-                var no = lineNo(oldLine);
-                replaceRange("", {line: no, ch: 0}, {line: no, ch: oldLine.text.length});
-              }
-            }, 10));
-        }
-      }
-
-      sel.from = from; sel.to = to;
-      selectionChanged = true;
-    }
-    function skipHidden(pos, oldLine, oldCh) {
-      function getNonHidden(dir) {
-        var lNo = pos.line + dir, end = dir == 1 ? doc.size : -1;
-        while (lNo != end) {
-          var line = getLine(lNo);
-          if (!line.hidden) {
-            var ch = pos.ch;
-            if (toEnd || ch > oldCh || ch > line.text.length) ch = line.text.length;
-            return {line: lNo, ch: ch};
-          }
-          lNo += dir;
-        }
-      }
-      var line = getLine(pos.line);
-      var toEnd = pos.ch == line.text.length && pos.ch != oldCh;
-      if (!line.hidden) return pos;
-      if (pos.line >= oldLine) return getNonHidden(1) || getNonHidden(-1);
-      else return getNonHidden(-1) || getNonHidden(1);
-    }
-    function setCursor(line, ch, user) {
-      var pos = clipPos({line: line, ch: ch || 0});
-      (user ? setSelectionUser : setSelection)(pos, pos);
-    }
-
-    function clipLine(n) {return Math.max(0, Math.min(n, doc.size-1));}
-    function clipPos(pos) {
-      if (pos.line < 0) return {line: 0, ch: 0};
-      if (pos.line >= doc.size) return {line: doc.size-1, ch: getLine(doc.size-1).text.length};
-      var ch = pos.ch, linelen = getLine(pos.line).text.length;
-      if (ch == null || ch > linelen) return {line: pos.line, ch: linelen};
-      else if (ch < 0) return {line: pos.line, ch: 0};
-      else return pos;
-    }
-
-    function findPosH(dir, unit) {
-      var end = sel.inverted ? sel.from : sel.to, line = end.line, ch = end.ch;
-      var lineObj = getLine(line);
-      function findNextLine() {
-        for (var l = line + dir, e = dir < 0 ? -1 : doc.size; l != e; l += dir) {
-          var lo = getLine(l);
-          if (!lo.hidden) { line = l; lineObj = lo; return true; }
-        }
-      }
-      function moveOnce(boundToLine) {
-        if (ch == (dir < 0 ? 0 : lineObj.text.length)) {
-          if (!boundToLine && findNextLine()) ch = dir < 0 ? lineObj.text.length : 0;
-          else return false;
-        } else ch += dir;
-        return true;
-      }
-      if (unit == "char") moveOnce();
-      else if (unit == "column") moveOnce(true);
-      else if (unit == "word") {
-        var sawWord = false;
-        for (;;) {
-          if (dir < 0) if (!moveOnce()) break;
-          if (isWordChar(lineObj.text.charAt(ch))) sawWord = true;
-          else if (sawWord) {if (dir < 0) {dir = 1; moveOnce();} break;}
-          if (dir > 0) if (!moveOnce()) break;
-        }
-      }
-      return {line: line, ch: ch};
-    }
-    function moveH(dir, unit) {
-      var pos = dir < 0 ? sel.from : sel.to;
-      if (shiftSelecting || posEq(sel.from, sel.to)) pos = findPosH(dir, unit);
-      setCursor(pos.line, pos.ch, true);
-    }
-    function deleteH(dir, unit) {
-      if (!posEq(sel.from, sel.to)) replaceRange("", sel.from, sel.to);
-      else if (dir < 0) replaceRange("", findPosH(dir, unit), sel.to);
-      else replaceRange("", sel.from, findPosH(dir, unit));
-      userSelChange = true;
-    }
-    function moveV(dir, unit) {
-      var dist = 0, pos = localCoords(sel.inverted ? sel.from : sel.to, true);
-      if (goalColumn != null) pos.x = goalColumn;
-      if (unit == "page") {
-        var screen = Math.min(scroller.clientHeight, window.innerHeight || document.documentElement.clientHeight);
-        var target = coordsChar(pos.x, pos.y + screen * dir);
-      } else if (unit == "line") {
-        var th = textHeight();
-        var target = coordsChar(pos.x, pos.y + .5 * th + dir * th);
-      }
-      if (unit == "page") scrollbar.scrollTop += localCoords(target, true).y - pos.y;
-      setCursor(target.line, target.ch, true);
-      goalColumn = pos.x;
-    }
-
-    function findWordAt(pos) {
-      var line = getLine(pos.line).text;
-      var start = pos.ch, end = pos.ch;
-      if (line) {
-        if (pos.after === false || end == line.length) --start; else ++end;
-        var startChar = line.charAt(start);
-        var check = isWordChar(startChar) ? isWordChar :
-                    /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);} :
-                    function(ch) {return !/\s/.test(ch) && isWordChar(ch);};
-        while (start > 0 && check(line.charAt(start - 1))) --start;
-        while (end < line.length && check(line.charAt(end))) ++end;
-      }
-      return {from: {line: pos.line, ch: start}, to: {line: pos.line, ch: end}};
-    }
-    function selectLine(line) {
-      setSelectionUser({line: line, ch: 0}, clipPos({line: line + 1, ch: 0}));
-    }
-    function indentSelected(mode) {
-      if (posEq(sel.from, sel.to)) return indentLine(sel.from.line, mode);
-      var e = sel.to.line - (sel.to.ch ? 0 : 1);
-      for (var i = sel.from.line; i <= e; ++i) indentLine(i, mode);
-    }
-
-    function indentLine(n, how) {
-      if (!how) how = "add";
-      if (how == "smart") {
-        if (!mode.indent) how = "prev";
-        else var state = getStateBefore(n);
-      }
-
-      var line = getLine(n), curSpace = line.indentation(options.tabSize),
-          curSpaceString = line.text.match(/^\s*/)[0], indentation;
-      if (how == "smart") {
-        indentation = mode.indent(state, line.text.slice(curSpaceString.length), line.text);
-        if (indentation == Pass) how = "prev";
-      }
-      if (how == "prev") {
-        if (n) indentation = getLine(n-1).indentation(options.tabSize);
-        else indentation = 0;
-      }
-      else if (how == "add") indentation = curSpace + options.indentUnit;
-      else if (how == "subtract") indentation = curSpace - options.indentUnit;
-      indentation = Math.max(0, indentation);
-      var diff = indentation - curSpace;
-
-      var indentString = "", pos = 0;
-      if (options.indentWithTabs)
-        for (var i = Math.floor(indentation / options.tabSize); i; --i) {pos += options.tabSize; indentString += "\t";}
-      if (pos < indentation) indentString += spaceStr(indentation - pos);
-
-      if (indentString != curSpaceString)
-        replaceRange(indentString, {line: n, ch: 0}, {line: n, ch: curSpaceString.length});
-      line.stateAfter = null;
-    }
-
-    function loadMode() {
-      mode = CodeMirror.getMode(options, options.mode);
-      doc.iter(0, doc.size, function(line) { line.stateAfter = null; });
-      frontier = 0;
-      startWorker(100);
-    }
-    function gutterChanged() {
-      var visible = options.gutter || options.lineNumbers;
-      gutter.style.display = visible ? "" : "none";
-      if (visible) gutterDirty = true;
-      else lineDiv.parentNode.style.marginLeft = 0;
-    }
-    function wrappingChanged(from, to) {
-      if (options.lineWrapping) {
-        wrapper.className += " CodeMirror-wrap";
-        var perLine = scroller.clientWidth / charWidth() - 3;
-        doc.iter(0, doc.size, function(line) {
-          if (line.hidden) return;
-          var guess = Math.ceil(line.text.length / perLine) || 1;
-          if (guess != 1) updateLineHeight(line, guess);
-        });
-        lineSpace.style.minWidth = widthForcer.style.left = "";
-      } else {
-        wrapper.className = wrapper.className.replace(" CodeMirror-wrap", "");
-        computeMaxLength();
-        doc.iter(0, doc.size, function(line) {
-          if (line.height != 1 && !line.hidden) updateLineHeight(line, 1);
-        });
-      }
-      changes.push({from: 0, to: doc.size});
-    }
-    function themeChanged() {
-      scroller.className = scroller.className.replace(/\s*cm-s-\S+/g, "") +
-        options.theme.replace(/(^|\s)\s*/g, " cm-s-");
-    }
-    function keyMapChanged() {
-      var style = keyMap[options.keyMap].style;
-      wrapper.className = wrapper.className.replace(/\s*cm-keymap-\S+/g, "") +
-        (style ? " cm-keymap-" + style : "");
-    }
-
-    function TextMarker(type, style) { this.lines = []; this.type = type; if (style) this.style = style; }
-    TextMarker.prototype.clear = operation(function() {
-      var min, max;
-      for (var i = 0; i < this.lines.length; ++i) {
-        var line = this.lines[i];
-        var span = getMarkedSpanFor(line.markedSpans, this);
-        if (span.from != null) min = lineNo(line);
-        if (span.to != null) max = lineNo(line);
-        line.markedSpans = removeMarkedSpan(line.markedSpans, span);
-      }
-      if (min != null) changes.push({from: min, to: max + 1});
-      this.lines.length = 0;
-      this.explicitlyCleared = true;
-    });
-    TextMarker.prototype.find = function() {
-      var from, to;
-      for (var i = 0; i < this.lines.length; ++i) {
-        var line = this.lines[i];
-        var span = getMarkedSpanFor(line.markedSpans, this);
-        if (span.from != null || span.to != null) {
-          var found = lineNo(line);
-          if (span.from != null) from = {line: found, ch: span.from};
-          if (span.to != null) to = {line: found, ch: span.to};
-        }
-      }
-      if (this.type == "bookmark") return from;
-      return from && {from: from, to: to};
-    };
-
-    function markText(from, to, className, options) {
-      from = clipPos(from); to = clipPos(to);
-      var marker = new TextMarker("range", className);
-      if (options) for (var opt in options) if (options.hasOwnProperty(opt))
-        marker[opt] = options[opt];
-      var curLine = from.line;
-      doc.iter(curLine, to.line + 1, function(line) {
-        var span = {from: curLine == from.line ? from.ch : null,
-                    to: curLine == to.line ? to.ch : null,
-                    marker: marker};
-        line.markedSpans = (line.markedSpans || []).concat([span]);
-        marker.lines.push(line);
-        ++curLine;
-      });
-      changes.push({from: from.line, to: to.line + 1});
-      return marker;
-    }
-
-    function setBookmark(pos) {
-      pos = clipPos(pos);
-      var marker = new TextMarker("bookmark"), line = getLine(pos.line);
-      history.addChange(pos.line, 1, [newHL(line.text, line.markedSpans)], true);
-      var span = {from: pos.ch, to: pos.ch, marker: marker};
-      line.markedSpans = (line.markedSpans || []).concat([span]);
-      marker.lines.push(line);
-      return marker;
-    }
-
-    function findMarksAt(pos) {
-      pos = clipPos(pos);
-      var markers = [], spans = getLine(pos.line).markedSpans;
-      if (spans) for (var i = 0; i < spans.length; ++i) {
-        var span = spans[i];
-        if ((span.from == null || span.from <= pos.ch) &&
-            (span.to == null || span.to >= pos.ch))
-          markers.push(span.marker);
-      }
-      return markers;
-    }
-
-    function addGutterMarker(line, text, className) {
-      if (typeof line == "number") line = getLine(clipLine(line));
-      line.gutterMarker = {text: text, style: className};
-      gutterDirty = true;
-      return line;
-    }
-    function removeGutterMarker(line) {
-      if (typeof line == "number") line = getLine(clipLine(line));
-      line.gutterMarker = null;
-      gutterDirty = true;
-    }
-
-    function changeLine(handle, op) {
-      var no = handle, line = handle;
-      if (typeof handle == "number") line = getLine(clipLine(handle));
-      else no = lineNo(handle);
-      if (no == null) return null;
-      if (op(line, no)) changes.push({from: no, to: no + 1});
-      else return null;
-      return line;
-    }
-    function setLineClass(handle, className, bgClassName) {
-      return changeLine(handle, function(line) {
-        if (line.className != className || line.bgClassName != bgClassName) {
-          line.className = className;
-          line.bgClassName = bgClassName;
-          return true;
-        }
-      });
-    }
-    function setLineHidden(handle, hidden) {
-      return changeLine(handle, function(line, no) {
-        if (line.hidden != hidden) {
-          line.hidden = hidden;
-          if (!options.lineWrapping) {
-            if (hidden && line.text.length == maxLine.text.length) {
-              updateMaxLine = true;
-            } else if (!hidden && line.text.length > maxLine.text.length) {
-              maxLine = line; updateMaxLine = false;
-            }
-          }
-          updateLineHeight(line, hidden ? 0 : 1);
-          var fline = sel.from.line, tline = sel.to.line;
-          if (hidden && (fline == no || tline == no)) {
-            var from = fline == no ? skipHidden({line: fline, ch: 0}, fline, 0) : sel.from;
-            var to = tline == no ? skipHidden({line: tline, ch: 0}, tline, 0) : sel.to;
-            // Can't hide the last visible line, we'd have no place to put the cursor
-            if (!to) return;
-            setSelection(from, to);
-          }
-          return (gutterDirty = true);
-        }
-      });
-    }
-
-    function lineInfo(line) {
-      if (typeof line == "number") {
-        if (!isLine(line)) return null;
-        var n = line;
-        line = getLine(line);
-        if (!line) return null;
-      } else {
-        var n = lineNo(line);
-        if (n == null) return null;
-      }
-      var marker = line.gutterMarker;
-      return {line: n, handle: line, text: line.text, markerText: marker && marker.text,
-              markerClass: marker && marker.style, lineClass: line.className, bgClass: line.bgClassName};
-    }
-
-    function measureLine(line, ch) {
-      if (ch == 0) return {top: 0, left: 0};
-      var pre = lineContent(line, ch);
-      removeChildrenAndAdd(measure, pre);
-      var anchor = pre.anchor;
-      var top = anchor.offsetTop, left = anchor.offsetLeft;
-      // Older IEs report zero offsets for spans directly after a wrap
-      if (ie && top == 0 && left == 0) {
-        var backup = elt("span", "x");
-        anchor.parentNode.insertBefore(backup, anchor.nextSibling);
-        top = backup.offsetTop;
-      }
-      return {top: top, left: left};
-    }
-    function localCoords(pos, inLineWrap) {
-      var x, lh = textHeight(), y = lh * (heightAtLine(doc, pos.line) - (inLineWrap ? displayOffset : 0));
-      if (pos.ch == 0) x = 0;
-      else {
-        var sp = measureLine(getLine(pos.line), pos.ch);
-        x = sp.left;
-        if (options.lineWrapping) y += Math.max(0, sp.top);
-      }
-      return {x: x, y: y, yBot: y + lh};
-    }
-    // Coords must be lineSpace-local
-    function coordsChar(x, y) {
-      var th = textHeight(), cw = charWidth(), heightPos = displayOffset + Math.floor(y / th);
-      if (heightPos < 0) return {line: 0, ch: 0};
-      var lineNo = lineAtHeight(doc, heightPos);
-      if (lineNo >= doc.size) return {line: doc.size - 1, ch: getLine(doc.size - 1).text.length};
-      var lineObj = getLine(lineNo), text = lineObj.text;
-      var tw = options.lineWrapping, innerOff = tw ? heightPos - heightAtLine(doc, lineNo) : 0;
-      if (x <= 0 && innerOff == 0) return {line: lineNo, ch: 0};
-      var wrongLine = false;
-      function getX(len) {
-        var sp = measureLine(lineObj, len);
-        if (tw) {
-          var off = Math.round(sp.top / th);
-          wrongLine = off != innerOff;
-          return Math.max(0, sp.left + (off - innerOff) * scroller.clientWidth);
-        }
-        return sp.left;
-      }
-      var from = 0, fromX = 0, to = text.length, toX;
-      // Guess a suitable upper bound for our search.
-      var estimated = Math.min(to, Math.ceil((x + innerOff * scroller.clientWidth * .9) / cw));
-      for (;;) {
-        var estX = getX(estimated);
-        if (estX <= x && estimated < to) estimated = Math.min(to, Math.ceil(estimated * 1.2));
-        else {toX = estX; to = estimated; break;}
-      }
-      if (x > toX) return {line: lineNo, ch: to};
-      // Try to guess a suitable lower bound as well.
-      estimated = Math.floor(to * 0.8); estX = getX(estimated);
-      if (estX < x) {from = estimated; fromX = estX;}
-      // Do a binary search between these bounds.
-      for (;;) {
-        if (to - from <= 1) {
-          var after = x - fromX < toX - x;
-          return {line: lineNo, ch: after ? from : to, after: after};
-        }
-        var middle = Math.ceil((from + to) / 2), middleX = getX(middle);
-        if (middleX > x) {to = middle; toX = middleX; if (wrongLine) toX += 1000; }
-        else {from = middle; fromX = middleX;}
-      }
-    }
-    function pageCoords(pos) {
-      var local = localCoords(pos, true), off = eltOffset(lineSpace);
-      return {x: off.left + local.x, y: off.top + local.y, yBot: off.top + local.yBot};
-    }
-
-    var cachedHeight, cachedHeightFor, measurePre;
-    function textHeight() {
-      if (measurePre == null) {
-        measurePre = elt("pre");
-        for (var i = 0; i < 49; ++i) {
-          measurePre.appendChild(document.createTextNode("x"));
-          measurePre.appendChild(elt("br"));
-        }
-        measurePre.appendChild(document.createTextNode("x"));
-      }
-      var offsetHeight = lineDiv.clientHeight;
-      if (offsetHeight == cachedHeightFor) return cachedHeight;
-      cachedHeightFor = offsetHeight;
-      removeChildrenAndAdd(measure, measurePre.cloneNode(true));
-      cachedHeight = measure.firstChild.offsetHeight / 50 || 1;
-      removeChildren(measure);
-      return cachedHeight;
-    }
-    var cachedWidth, cachedWidthFor = 0;
-    function charWidth() {
-      if (scroller.clientWidth == cachedWidthFor) return cachedWidth;
-      cachedWidthFor = scroller.clientWidth;
-      var anchor = elt("span", "x");
-      var pre = elt("pre", [anchor]);
-      removeChildrenAndAdd(measure, pre);
-      return (cachedWidth = anchor.offsetWidth || 10);
-    }
-    function paddingTop() {return lineSpace.offsetTop;}
-    function paddingLeft() {return lineSpace.offsetLeft;}
-
-    function posFromMouse(e, liberal) {
-      var offW = eltOffset(scroller, true), x, y;
-      // Fails unpredictably on IE[67] when mouse is dragged around quickly.
-      try { x = e.clientX; y = e.clientY; } catch (e) { return null; }
-      // This is a mess of a heuristic to try and determine whether a
-      // scroll-bar was clicked or not, and to return null if one was
-      // (and !liberal).
-      if (!liberal && (x - offW.left > scroller.clientWidth || y - offW.top > scroller.clientHeight))
-        return null;
-      var offL = eltOffset(lineSpace, true);
-      return coordsChar(x - offL.left, y - offL.top);
-    }
-    var detectingSelectAll;
-    function onContextMenu(e) {
-      var pos = posFromMouse(e), scrollPos = scrollbar.scrollTop;
-      if (!pos || opera) return; // Opera is difficult.
-      if (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to))
-        operation(setCursor)(pos.line, pos.ch);
-
-      var oldCSS = input.style.cssText;
-      inputDiv.style.position = "absolute";
-      input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
-        "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: white; " +
-        "border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
-      focusInput();
-      resetInput(true);
-      // Adds "Select all" to context menu in FF
-      if (posEq(sel.from, sel.to)) input.value = prevInput = " ";
-
-      function rehide() {
-        inputDiv.style.position = "relative";
-        input.style.cssText = oldCSS;
-        if (ie_lt9) scrollbar.scrollTop = scrollPos;
-        slowPoll();
-
-        // Try to detect the user choosing select-all 
-        if (input.selectionStart != null) {
-          clearTimeout(detectingSelectAll);
-          var extval = input.value = " " + (posEq(sel.from, sel.to) ? "" : input.value), i = 0;
-          prevInput = " ";
-          input.selectionStart = 1; input.selectionEnd = extval.length;
-          detectingSelectAll = setTimeout(function poll(){
-            if (prevInput == " " && input.selectionStart == 0)
-              operation(commands.selectAll)(instance);
-            else if (i++ < 10) detectingSelectAll = setTimeout(poll, 500);
-            else resetInput();
-          }, 200);
-        }
-      }
-
-      if (gecko) {
-        e_stop(e);
-        var mouseup = connect(window, "mouseup", function() {
-          mouseup();
-          setTimeout(rehide, 20);
-        }, true);
-      } else {
-        setTimeout(rehide, 50);
-      }
-    }
-
-    // Cursor-blinking
-    function restartBlink() {
-      clearInterval(blinker);
-      var on = true;
-      cursor.style.visibility = "";
-      blinker = setInterval(function() {
-        cursor.style.visibility = (on = !on) ? "" : "hidden";
-      }, options.cursorBlinkRate);
-    }
-
-    var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
-    function matchBrackets(autoclear) {
-      var head = sel.inverted ? sel.from : sel.to, line = getLine(head.line), pos = head.ch - 1;
-      var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
-      if (!match) return;
-      var ch = match.charAt(0), forward = match.charAt(1) == ">", d = forward ? 1 : -1, st = line.styles;
-      for (var off = pos + 1, i = 0, e = st.length; i < e; i+=2)
-        if ((off -= st[i].length) <= 0) {var style = st[i+1]; break;}
-
-      var stack = [line.text.charAt(pos)], re = /[(){}[\]]/;
-      function scan(line, from, to) {
-        if (!line.text) return;
-        var st = line.styles, pos = forward ? 0 : line.text.length - 1, cur;
-        for (var i = forward ? 0 : st.length - 2, e = forward ? st.length : -2; i != e; i += 2*d) {
-          var text = st[i];
-          if (st[i+1] != style) {pos += d * text.length; continue;}
-          for (var j = forward ? 0 : text.length - 1, te = forward ? text.length : -1; j != te; j += d, pos+=d) {
-            if (pos >= from && pos < to && re.test(cur = text.charAt(j))) {
-              var match = matching[cur];
-              if (match.charAt(1) == ">" == forward) stack.push(cur);
-              else if (stack.pop() != match.charAt(0)) return {pos: pos, match: false};
-              else if (!stack.length) return {pos: pos, match: true};
-            }
-          }
-        }
-      }
-      for (var i = head.line, e = forward ? Math.min(i + 100, doc.size) : Math.max(-1, i - 100); i != e; i+=d) {
-        var line = getLine(i), first = i == head.line;
-        var found = scan(line, first && forward ? pos + 1 : 0, first && !forward ? pos : line.text.length);
-        if (found) break;
-      }
-      if (!found) found = {pos: null, match: false};
-      var style = found.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
-      var one = markText({line: head.line, ch: pos}, {line: head.line, ch: pos+1}, style),
-          two = found.pos != null && markText({line: i, ch: found.pos}, {line: i, ch: found.pos + 1}, style);
-      var clear = operation(function(){one.clear(); two && two.clear();});
-      if (autoclear) setTimeout(clear, 800);
-      else bracketHighlighted = clear;
-    }
-
-    // Finds the line to start with when starting a parse. Tries to
-    // find a line with a stateAfter, so that it can start with a
-    // valid state. If that fails, it returns the line with the
-    // smallest indentation, which tends to need the least context to
-    // parse correctly.
-    function findStartLine(n) {
-      var minindent, minline;
-      for (var search = n, lim = n - 40; search > lim; --search) {
-        if (search == 0) return 0;
-        var line = getLine(search-1);
-        if (line.stateAfter) return search;
-        var indented = line.indentation(options.tabSize);
-        if (minline == null || minindent > indented) {
-          minline = search - 1;
-          minindent = indented;
-        }
-      }
-      return minline;
-    }
-    function getStateBefore(n) {
-      var pos = findStartLine(n), state = pos && getLine(pos-1).stateAfter;
-      if (!state) state = startState(mode);
-      else state = copyState(mode, state);
-      doc.iter(pos, n, function(line) {
-        line.process(mode, state, options.tabSize);
-        line.stateAfter = (pos == n - 1 || pos % 5 == 0) ? copyState(mode, state) : null;
-      });
-      return state;
-    }
-    function highlightWorker() {
-      if (frontier >= showingTo) return;
-      var end = +new Date + options.workTime, state = copyState(mode, getStateBefore(frontier));
-      var startFrontier = frontier;
-      doc.iter(frontier, showingTo, function(line) {
-        if (frontier >= showingFrom) { // Visible
-          line.highlight(mode, state, options.tabSize);
-          line.stateAfter = copyState(mode, state);
-        } else {
-          line.process(mode, state, options.tabSize);
-          line.stateAfter = frontier % 5 == 0 ? copyState(mode, state) : null;
-        }
-        ++frontier;
-        if (+new Date > end) {
-          startWorker(options.workDelay);
-          return true;
-        }
-      });
-      if (showingTo > startFrontier && frontier >= showingFrom)
-        operation(function() {changes.push({from: startFrontier, to: frontier});})();
-    }
-    function startWorker(time) {
-      if (frontier < showingTo)
-        highlight.set(time, highlightWorker);
-    }
-
-    // Operations are used to wrap changes in such a way that each
-    // change won't have to update the cursor and display (which would
-    // be awkward, slow, and error-prone), but instead updates are
-    // batched and then all combined and executed at once.
-    function startOperation() {
-      updateInput = userSelChange = textChanged = null;
-      changes = []; selectionChanged = false; callbacks = [];
-    }
-    function endOperation() {
-      if (updateMaxLine) computeMaxLength();
-      if (maxLineChanged && !options.lineWrapping) {
-        var cursorWidth = widthForcer.offsetWidth, left = measureLine(maxLine, maxLine.text.length).left;
-        if (!ie_lt8) {
-          widthForcer.style.left = left + "px";
-          lineSpace.style.minWidth = (left + cursorWidth) + "px";
-        }
-        maxLineChanged = false;
-      }
-      var newScrollPos, updated;
-      if (selectionChanged) {
-        var coords = calculateCursorCoords();
-        newScrollPos = calculateScrollPos(coords.x, coords.y, coords.x, coords.yBot);
-      }
-      if (changes.length || newScrollPos && newScrollPos.scrollTop != null)
-        updated = updateDisplay(changes, true, newScrollPos && newScrollPos.scrollTop);
-      if (!updated) {
-        if (selectionChanged) updateSelection();
-        if (gutterDirty) updateGutter();
-      }
-      if (newScrollPos) scrollCursorIntoView();
-      if (selectionChanged) restartBlink();
-
-      if (focused && (updateInput === true || (updateInput !== false && selectionChanged)))
-        resetInput(userSelChange);
-
-      if (selectionChanged && options.matchBrackets)
-        setTimeout(operation(function() {
-          if (bracketHighlighted) {bracketHighlighted(); bracketHighlighted = null;}
-          if (posEq(sel.from, sel.to)) matchBrackets(false);
-        }), 20);
-      var sc = selectionChanged, cbs = callbacks; // these can be reset by callbacks
-      if (textChanged && options.onChange && instance)
-        options.onChange(instance, textChanged);
-      if (sc && options.onCursorActivity)
-        options.onCursorActivity(instance);
-      for (var i = 0; i < cbs.length; ++i) cbs[i](instance);
-      if (updated && options.onUpdate) options.onUpdate(instance);
-    }
-    var nestedOperation = 0;
-    function operation(f) {
-      return function() {
-        if (!nestedOperation++) startOperation();
-        try {var result = f.apply(this, arguments);}
-        finally {if (!--nestedOperation) endOperation();}
-        return result;
-      };
-    }
-
-    function compoundChange(f) {
-      history.startCompound();
-      try { return f(); } finally { history.endCompound(); }
-    }
-
-    for (var ext in extensions)
-      if (extensions.propertyIsEnumerable(ext) &&
-          !instance.propertyIsEnumerable(ext))
-        instance[ext] = extensions[ext];
-    for (var i = 0; i < initHooks.length; ++i) initHooks[i](instance);
-    return instance;
-  } // (end of function CodeMirror)
-
-  // The default configuration options.
-  CodeMirror.defaults = {
-    value: "",
-    mode: null,
-    theme: "default",
-    indentUnit: 2,
-    indentWithTabs: false,
-    smartIndent: true,
-    tabSize: 4,
-    keyMap: "default",
-    extraKeys: null,
-    electricChars: true,
-    autoClearEmptyLines: false,
-    onKeyEvent: null,
-    onDragEvent: null,
-    lineWrapping: false,
-    lineNumbers: false,
-    gutter: false,
-    fixedGutter: false,
-    firstLineNumber: 1,
-    readOnly: false,
-    dragDrop: true,
-    onChange: null,
-    onCursorActivity: null,
-    onViewportChange: null,
-    onGutterClick: null,
-    onUpdate: null,
-    onFocus: null, onBlur: null, onScroll: null,
-    matchBrackets: false,
-    cursorBlinkRate: 530,
-    workTime: 100,
-    workDelay: 200,
-    pollInterval: 100,
-    undoDepth: 40,
-    tabindex: null,
-    autofocus: null,
-    lineNumberFormatter: function(integer) { return integer; }
-  };
-
-  var ios = /AppleWebKit/.test(navigator.userAgent) && /Mobile\/\w+/.test(navigator.userAgent);
-  var mac = ios || /Mac/.test(navigator.platform);
-  var win = /Win/.test(navigator.platform);
-
-  // Known modes, by name and by MIME
-  var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
-  CodeMirror.defineMode = function(name, mode) {
-    if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
-    if (arguments.length > 2) {
-      mode.dependencies = [];
-      for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
-    }
-    modes[name] = mode;
-  };
-  CodeMirror.defineMIME = function(mime, spec) {
-    mimeModes[mime] = spec;
-  };
-  CodeMirror.resolveMode = function(spec) {
-    if (typeof spec == "string" && mimeModes.hasOwnProperty(spec))
-      spec = mimeModes[spec];
-    else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec))
-      return CodeMirror.resolveMode("application/xml");
-    if (typeof spec == "string") return {name: spec};
-    else return spec || {name: "null"};
-  };
-  CodeMirror.getMode = function(options, spec) {
-    var spec = CodeMirror.resolveMode(spec);
-    var mfactory = modes[spec.name];
-    if (!mfactory) return CodeMirror.getMode(options, "text/plain");
-    var modeObj = mfactory(options, spec);
-    if (modeExtensions.hasOwnProperty(spec.name)) {
-      var exts = modeExtensions[spec.name];
-      for (var prop in exts) if (exts.hasOwnProperty(prop)) modeObj[prop] = exts[prop];
-    }
-    modeObj.name = spec.name;
-    return modeObj;
-  };
-  CodeMirror.listModes = function() {
-    var list = [];
-    for (var m in modes)
-      if (modes.propertyIsEnumerable(m)) list.push(m);
-    return list;
-  };
-  CodeMirror.listMIMEs = function() {
-    var list = [];
-    for (var m in mimeModes)
-      if (mimeModes.propertyIsEnumerable(m)) list.push({mime: m, mode: mimeModes[m]});
-    return list;
-  };
-
-  var extensions = CodeMirror.extensions = {};
-  CodeMirror.defineExtension = function(name, func) {
-    extensions[name] = func;
-  };
-
-  var initHooks = [];
-  CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
-
-  var modeExtensions = CodeMirror.modeExtensions = {};
-  CodeMirror.extendMode = function(mode, properties) {
-    var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
-    for (var prop in properties) if (properties.hasOwnProperty(prop))
-      exts[prop] = properties[prop];
-  };
-
-  var commands = CodeMirror.commands = {
-    selectAll: function(cm) {cm.setSelection({line: 0, ch: 0}, {line: cm.lineCount() - 1});},
-    killLine: function(cm) {
-      var from = cm.getCursor(true), to = cm.getCursor(false), sel = !posEq(from, to);
-      if (!sel && cm.getLine(from.line).length == from.ch) cm.replaceRange("", from, {line: from.line + 1, ch: 0});
-      else cm.replaceRange("", from, sel ? to : {line: from.line});
-    },
-    deleteLine: function(cm) {var l = cm.getCursor().line; cm.replaceRange("", {line: l, ch: 0}, {line: l});},
-    undo: function(cm) {cm.undo();},
-    redo: function(cm) {cm.redo();},
-    goDocStart: function(cm) {cm.setCursor(0, 0, true);},
-    goDocEnd: function(cm) {cm.setSelection({line: cm.lineCount() - 1}, null, true);},
-    goLineStart: function(cm) {cm.setCursor(cm.getCursor().line, 0, true);},
-    goLineStartSmart: function(cm) {
-      var cur = cm.getCursor();
-      var text = cm.getLine(cur.line), firstNonWS = Math.max(0, text.search(/\S/));
-      cm.setCursor(cur.line, cur.ch <= firstNonWS && cur.ch ? 0 : firstNonWS, true);
-    },
-    goLineEnd: function(cm) {cm.setSelection({line: cm.getCursor().line}, null, true);},
-    goLineUp: function(cm) {cm.moveV(-1, "line");},
-    goLineDown: function(cm) {cm.moveV(1, "line");},
-    goPageUp: function(cm) {cm.moveV(-1, "page");},
-    goPageDown: function(cm) {cm.moveV(1, "page");},
-    goCharLeft: function(cm) {cm.moveH(-1, "char");},
-    goCharRight: function(cm) {cm.moveH(1, "char");},
-    goColumnLeft: function(cm) {cm.moveH(-1, "column");},
-    goColumnRight: function(cm) {cm.moveH(1, "column");},
-    goWordLeft: function(cm) {cm.moveH(-1, "word");},
-    goWordRight: function(cm) {cm.moveH(1, "word");},
-    delCharLeft: function(cm) {cm.deleteH(-1, "char");},
-    delCharRight: function(cm) {cm.deleteH(1, "char");},
-    delWordLeft: function(cm) {cm.deleteH(-1, "word");},
-    delWordRight: function(cm) {cm.deleteH(1, "word");},
-    indentAuto: function(cm) {cm.indentSelection("smart");},
-    indentMore: function(cm) {cm.indentSelection("add");},
-    indentLess: function(cm) {cm.indentSelection("subtract");},
-    insertTab: function(cm) {cm.replaceSelection("\t", "end");},
-    defaultTab: function(cm) {
-      if (cm.somethingSelected()) cm.indentSelection("add");
-      else cm.replaceSelection("\t", "end");
-    },
-    transposeChars: function(cm) {
-      var cur = cm.getCursor(), line = cm.getLine(cur.line);
-      if (cur.ch > 0 && cur.ch < line.length - 1)
-        cm.replaceRange(line.charAt(cur.ch) + line.charAt(cur.ch - 1),
-                        {line: cur.line, ch: cur.ch - 1}, {line: cur.line, ch: cur.ch + 1});
-    },
-    newlineAndIndent: function(cm) {
-      cm.replaceSelection("\n", "end");
-      cm.indentLine(cm.getCursor().line);
-    },
-    toggleOverwrite: function(cm) {cm.toggleOverwrite();}
-  };
-
-  var keyMap = CodeMirror.keyMap = {};
-  keyMap.basic = {
-    "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
-    "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
-    "Delete": "delCharRight", "Backspace": "delCharLeft", "Tab": "defaultTab", "Shift-Tab": "indentAuto",
-    "Enter": "newlineAndIndent", "Insert": "toggleOverwrite"
-  };
-  // Note that the save and find-related commands aren't defined by
-  // default. Unknown commands are simply ignored.
-  keyMap.pcDefault = {
-    "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
-    "Ctrl-Home": "goDocStart", "Alt-Up": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Down": "goDocEnd",
-    "Ctrl-Left": "goWordLeft", "Ctrl-Right": "goWordRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
-    "Ctrl-Backspace": "delWordLeft", "Ctrl-Delete": "delWordRight", "Ctrl-S": "save", "Ctrl-F": "find",
-    "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
-    "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
-    fallthrough: "basic"
-  };
-  keyMap.macDefault = {
-    "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
-    "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goWordLeft",
-    "Alt-Right": "goWordRight", "Cmd-Left": "goLineStart", "Cmd-Right": "goLineEnd", "Alt-Backspace": "delWordLeft",
-    "Ctrl-Alt-Backspace": "delWordRight", "Alt-Delete": "delWordRight", "Cmd-S": "save", "Cmd-F": "find",
-    "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
-    "Cmd-[": "indentLess", "Cmd-]": "indentMore",
-    fallthrough: ["basic", "emacsy"]
-  };
-  keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
-  keyMap.emacsy = {
-    "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
-    "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
-    "Ctrl-V": "goPageUp", "Shift-Ctrl-V": "goPageDown", "Ctrl-D": "delCharRight", "Ctrl-H": "delCharLeft",
-    "Alt-D": "delWordRight", "Alt-Backspace": "delWordLeft", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
-  };
-
-  function getKeyMap(val) {
-    if (typeof val == "string") return keyMap[val];
-    else return val;
-  }
-  function lookupKey(name, extraMap, map, handle, stop) {
-    function lookup(map) {
-      map = getKeyMap(map);
-      var found = map[name];
-      if (found === false) {
-        if (stop) stop();
-        return true;
-      }
-      if (found != null && handle(found)) return true;
-      if (map.nofallthrough) {
-        if (stop) stop();
-        return true;
-      }
-      var fallthrough = map.fallthrough;
-      if (fallthrough == null) return false;
-      if (Object.prototype.toString.call(fallthrough) != "[object Array]")
-        return lookup(fallthrough);
-      for (var i = 0, e = fallthrough.length; i < e; ++i) {
-        if (lookup(fallthrough[i])) return true;
-      }
-      return false;
-    }
-    if (extraMap && lookup(extraMap)) return true;
-    return lookup(map);
-  }
-  function isModifierKey(event) {
-    var name = keyNames[e_prop(event, "keyCode")];
-    return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
-  }
-  CodeMirror.isModifierKey = isModifierKey;
-
-  CodeMirror.fromTextArea = function(textarea, options) {
-    if (!options) options = {};
-    options.value = textarea.value;
-    if (!options.tabindex && textarea.tabindex)
-      options.tabindex = textarea.tabindex;
-    // Set autofocus to true if this textarea is focused, or if it has
-    // autofocus and no other element is focused.
-    if (options.autofocus == null) {
-      var hasFocus = document.body;
-      // doc.activeElement occasionally throws on IE
-      try { hasFocus = document.activeElement; } catch(e) {}
-      options.autofocus = hasFocus == textarea ||
-        textarea.getAttribute("autofocus") != null && hasFocus == document.body;
-    }
-
-    function save() {textarea.value = instance.getValue();}
-    if (textarea.form) {
-      // Deplorable hack to make the submit method do the right thing.
-      var rmSubmit = connect(textarea.form, "submit", save, true);
-      if (typeof textarea.form.submit == "function") {
-        var realSubmit = textarea.form.submit;
-        textarea.form.submit = function wrappedSubmit() {
-          save();
-          textarea.form.submit = realSubmit;
-          textarea.form.submit();
-          textarea.form.submit = wrappedSubmit;
-        };
-      }
-    }
-
-    textarea.style.display = "none";
-    var instance = CodeMirror(function(node) {
-      textarea.parentNode.insertBefore(node, textarea.nextSibling);
-    }, options);
-    instance.save = save;
-    instance.getTextArea = function() { return textarea; };
-    instance.toTextArea = function() {
-      save();
-      textarea.parentNode.removeChild(instance.getWrapperElement());
-      textarea.style.display = "";
-      if (textarea.form) {
-        rmSubmit();
-        if (typeof textarea.form.submit == "function")
-          textarea.form.submit = realSubmit;
-      }
-    };
-    return instance;
-  };
-
-  var gecko = /gecko\/\d{7}/i.test(navigator.userAgent);
-  var ie = /MSIE \d/.test(navigator.userAgent);
-  var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
-  var ie_lt9 = /MSIE [1-8]\b/.test(navigator.userAgent);
-  var quirksMode = ie && document.documentMode == 5;
-  var webkit = /WebKit\//.test(navigator.userAgent);
-  var chrome = /Chrome\//.test(navigator.userAgent);
-  var opera = /Opera\//.test(navigator.userAgent);
-  var safari = /Apple Computer/.test(navigator.vendor);
-  var khtml = /KHTML\//.test(navigator.userAgent);
-  var mac_geLion = /Mac OS X 10\D([7-9]|\d\d)\D/.test(navigator.userAgent);
-
-  // Utility functions for working with state. Exported because modes
-  // sometimes need to do this.
-  function copyState(mode, state) {
-    if (state === true) return state;
-    if (mode.copyState) return mode.copyState(state);
-    var nstate = {};
-    for (var n in state) {
-      var val = state[n];
-      if (val instanceof Array) val = val.concat([]);
-      nstate[n] = val;
-    }
-    return nstate;
-  }
-  CodeMirror.copyState = copyState;
-  function startState(mode, a1, a2) {
-    return mode.startState ? mode.startState(a1, a2) : true;
-  }
-  CodeMirror.startState = startState;
-  CodeMirror.innerMode = function(mode, state) {
-    while (mode.innerMode) {
-      var info = mode.innerMode(state);
-      state = info.state;
-      mode = info.mode;
-    }
-    return info || {mode: mode, state: state};
-  };
-
-  // The character stream used by a mode's parser.
-  function StringStream(string, tabSize) {
-    this.pos = this.start = 0;
-    this.string = string;
-    this.tabSize = tabSize || 8;
-  }
-  StringStream.prototype = {
-    eol: function() {return this.pos >= this.string.length;},
-    sol: function() {return this.pos == 0;},
-    peek: function() {return this.string.charAt(this.pos) || undefined;},
-    next: function() {
-      if (this.pos < this.string.length)
-        return this.string.charAt(this.pos++);
-    },
-    eat: function(match) {
-      var ch = this.string.charAt(this.pos);
-      if (typeof match == "string") var ok = ch == match;
-      else var ok = ch && (match.test ? match.test(ch) : match(ch));
-      if (ok) {++this.pos; return ch;}
-    },
-    eatWhile: function(match) {
-      var start = this.pos;
-      while (this.eat(match)){}
-      return this.pos > start;
-    },
-    eatSpace: function() {
-      var start = this.pos;
-      while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-      return this.pos > start;
-    },
-    skipToEnd: function() {this.pos = this.string.length;},
-    skipTo: function(ch) {
-      var found = this.string.indexOf(ch, this.pos);
-      if (found > -1) {this.pos = found; return true;}
-    },
-    backUp: function(n) {this.pos -= n;},
-    column: function() {return countColumn(this.string, this.start, this.tabSize);},
-    indentation: function() {return countColumn(this.string, null, this.tabSize);},
-    match: function(pattern, consume, caseInsensitive) {
-      if (typeof pattern == "string") {
-        var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-        if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) {
-          if (consume !== false) this.pos += pattern.length;
-          return true;
-        }
-      } else {
-        var match = this.string.slice(this.pos).match(pattern);
-        if (match && match.index > 0) return null;
-        if (match && consume !== false) this.pos += match[0].length;
-        return match;
-      }
-    },
-    current: function(){return this.string.slice(this.start, this.pos);}
-  };
-  CodeMirror.StringStream = StringStream;
-
-  function MarkedSpan(from, to, marker) {
-    this.from = from; this.to = to; this.marker = marker;
-  }
-
-  function getMarkedSpanFor(spans, marker) {
-    if (spans) for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i];
-      if (span.marker == marker) return span;
-    }
-  }
-
-  function removeMarkedSpan(spans, span) {
-    var r;
-    for (var i = 0; i < spans.length; ++i)
-      if (spans[i] != span) (r || (r = [])).push(spans[i]);
-    return r;
-  }
-
-  function markedSpansBefore(old, startCh, endCh) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
-      if (startsBefore || marker.type == "bookmark" && span.from == startCh && span.from != endCh) {
-        var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
-        (nw || (nw = [])).push({from: span.from,
-                                to: endsAfter ? null : span.to,
-                                marker: marker});
-      }
-    }
-    return nw;
-  }
-
-  function markedSpansAfter(old, endCh) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
-      if (endsAfter || marker.type == "bookmark" && span.from == endCh) {
-        var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);
-        (nw || (nw = [])).push({from: startsBefore ? null : span.from - endCh,
-                                to: span.to == null ? null : span.to - endCh,
-                                marker: marker});
-      }
-    }
-    return nw;
-  }
-
-  function updateMarkedSpans(oldFirst, oldLast, startCh, endCh, newText) {
-    if (!oldFirst && !oldLast) return newText;
-    // Get the spans that 'stick out' on both sides
-    var first = markedSpansBefore(oldFirst, startCh);
-    var last = markedSpansAfter(oldLast, endCh);
-
-    // Next, merge those two ends
-    var sameLine = newText.length == 1, offset = lst(newText).length + (sameLine ? startCh : 0);
-    if (first) {
-      // Fix up .to properties of first
-      for (var i = 0; i < first.length; ++i) {
-        var span = first[i];
-        if (span.to == null) {
-          var found = getMarkedSpanFor(last, span.marker);
-          if (!found) span.to = startCh;
-          else if (sameLine) span.to = found.to == null ? null : found.to + offset;
-        }
-      }
-    }
-    if (last) {
-      // Fix up .from in last (or move them into first in case of sameLine)
-      for (var i = 0; i < last.length; ++i) {
-        var span = last[i];
-        if (span.to != null) span.to += offset;
-        if (span.from == null) {
-          var found = getMarkedSpanFor(first, span.marker);
-          if (!found) {
-            span.from = offset;
-            if (sameLine) (first || (first = [])).push(span);
-          }
-        } else {
-          span.from += offset;
-          if (sameLine) (first || (first = [])).push(span);
-        }
-      }
-    }
-
-    var newMarkers = [newHL(newText[0], first)];
-    if (!sameLine) {
-      // Fill gap with whole-line-spans
-      var gap = newText.length - 2, gapMarkers;
-      if (gap > 0 && first)
-        for (var i = 0; i < first.length; ++i)
-          if (first[i].to == null)
-            (gapMarkers || (gapMarkers = [])).push({from: null, to: null, marker: first[i].marker});
-      for (var i = 0; i < gap; ++i)
-        newMarkers.push(newHL(newText[i+1], gapMarkers));
-      newMarkers.push(newHL(lst(newText), last));
-    }
-    return newMarkers;
-  }
-
-  // hl stands for history-line, a data structure that can be either a
-  // string (line without markers) or a {text, markedSpans} object.
-  function hlText(val) { return typeof val == "string" ? val : val.text; }
-  function hlSpans(val) {
-    if (typeof val == "string") return null;
-    var spans = val.markedSpans, out = null;
-    for (var i = 0; i < spans.length; ++i) {
-      if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i); }
-      else if (out) out.push(spans[i]);
-    }
-    return !out ? spans : out.length ? out : null;
-  }
-  function newHL(text, spans) { return spans ? {text: text, markedSpans: spans} : text; }
-
-  function detachMarkedSpans(line) {
-    var spans = line.markedSpans;
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i) {
-      var lines = spans[i].marker.lines;
-      var ix = indexOf(lines, line);
-      lines.splice(ix, 1);
-    }
-    line.markedSpans = null;
-  }
-
-  function attachMarkedSpans(line, spans) {
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      var marker = spans[i].marker.lines.push(line);
-    line.markedSpans = spans;
-  }
-
-  // When measuring the position of the end of a line, different
-  // browsers require different approaches. If an empty span is added,
-  // many browsers report bogus offsets. Of those, some (Webkit,
-  // recent IE) will accept a space without moving the whole span to
-  // the next line when wrapping it, others work with a zero-width
-  // space.
-  var eolSpanContent = " ";
-  if (gecko || (ie && !ie_lt8)) eolSpanContent = "\u200b";
-  else if (opera) eolSpanContent = "";
-
-  // Line objects. These hold state related to a line, including
-  // highlighting info (the styles array).
-  function Line(text, markedSpans) {
-    this.text = text;
-    this.height = 1;
-    attachMarkedSpans(this, markedSpans);
-  }
-  Line.prototype = {
-    update: function(text, markedSpans) {
-      this.text = text;
-      this.stateAfter = this.styles = null;
-      detachMarkedSpans(this);
-      attachMarkedSpans(this, markedSpans);
-    },
-    // Run the given mode's parser over a line, update the styles
-    // array, which contains alternating fragments of text and CSS
-    // classes.
-    highlight: function(mode, state, tabSize) {
-      var stream = new StringStream(this.text, tabSize), st = this.styles || (this.styles = []);
-      var pos = st.length = 0;
-      if (this.text == "" && mode.blankLine) mode.blankLine(state);
-      while (!stream.eol()) {
-        var style = mode.token(stream, state), substr = stream.current();
-        stream.start = stream.pos;
-        if (pos && st[pos-1] == style) {
-          st[pos-2] += substr;
-        } else if (substr) {
-          st[pos++] = substr; st[pos++] = style;
-        }
-        // Give up when line is ridiculously long
-        if (stream.pos > 5000) {
-          st[pos++] = this.text.slice(stream.pos); st[pos++] = null;
-          break;
-        }
-      }
-    },
-    process: function(mode, state, tabSize) {
-      var stream = new StringStream(this.text, tabSize);
-      if (this.text == "" && mode.blankLine) mode.blankLine(state);
-      while (!stream.eol() && stream.pos <= 5000) {
-        mode.token(stream, state);
-        stream.start = stream.pos;
-      }
-    },
-    // Fetch the parser token for a given character. Useful for hacks
-    // that want to inspect the mode state (say, for completion).
-    getTokenAt: function(mode, state, tabSize, ch) {
-      var txt = this.text, stream = new StringStream(txt, tabSize);
-      while (stream.pos < ch && !stream.eol()) {
-        stream.start = stream.pos;
-        var style = mode.token(stream, state);
-      }
-      return {start: stream.start,
-              end: stream.pos,
-              string: stream.current(),
-              className: style || null,
-              state: state};
-    },
-    indentation: function(tabSize) {return countColumn(this.text, null, tabSize);},
-    // Produces an HTML fragment for the line, taking selection,
-    // marking, and highlighting into account.
-    getContent: function(tabSize, wrapAt, compensateForWrapping) {
-      var first = true, col = 0, specials = /[\t\u0000-\u0019\u200b\u2028\u2029\uFEFF]/g;
-      var pre = elt("pre");
-      function span_(html, text, style) {
-        if (!text) return;
-        // Work around a bug where, in some compat modes, IE ignores leading spaces
-        if (first && ie && text.charAt(0) == " ") text = "\u00a0" + text.slice(1);
-        first = false;
-        if (!specials.test(text)) {
-          col += text.length;
-          var content = document.createTextNode(text);
-        } else {
-          var content = document.createDocumentFragment(), pos = 0;
-          while (true) {
-            specials.lastIndex = pos;
-            var m = specials.exec(text);
-            var skipped = m ? m.index - pos : text.length - pos;
-            if (skipped) {
-              content.appendChild(document.createTextNode(text.slice(pos, pos + skipped)));
-              col += skipped;
-            }
-            if (!m) break;
-            pos += skipped + 1;
-            if (m[0] == "\t") {
-              var tabWidth = tabSize - col % tabSize;
-              content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
-              col += tabWidth;
-            } else {
-              var token = elt("span", "\u2022", "cm-invalidchar");
-              token.title = "\\u" + m[0].charCodeAt(0).toString(16);
-              content.appendChild(token);
-              col += 1;
-            }
-          }
-        }
-        if (style) html.appendChild(elt("span", [content], style));
-        else html.appendChild(content);
-      }
-      var span = span_;
-      if (wrapAt != null) {
-        var outPos = 0, anchor = pre.anchor = elt("span");
-        span = function(html, text, style) {
-          var l = text.length;
-          if (wrapAt >= outPos && wrapAt < outPos + l) {
-            var cut = wrapAt - outPos;
-            if (cut) {
-              span_(html, text.slice(0, cut), style);
-              // See comment at the definition of spanAffectsWrapping
-              if (compensateForWrapping) {
-                var view = text.slice(cut - 1, cut + 1);
-                if (spanAffectsWrapping.test(view)) html.appendChild(elt("wbr"));
-                else if (!ie_lt8 && /\w\w/.test(view)) html.appendChild(document.createTextNode("\u200d"));
-              }
-            }
-            html.appendChild(anchor);
-            span_(anchor, opera ? text.slice(cut, cut + 1) : text.slice(cut), style);
-            if (opera) span_(html, text.slice(cut + 1), style);
-            wrapAt--;
-            outPos += l;
-          } else {
-            outPos += l;
-            span_(html, text, style);
-            if (outPos == wrapAt && outPos == len) {
-              setTextContent(anchor, eolSpanContent);
-              html.appendChild(anchor);
-            }
-            // Stop outputting HTML when gone sufficiently far beyond measure
-            else if (outPos > wrapAt + 10 && /\s/.test(text)) span = function(){};
-          }
-        };
-      }
-
-      var st = this.styles, allText = this.text, marked = this.markedSpans;
-      var len = allText.length;
-      function styleToClass(style) {
-        if (!style) return null;
-        return "cm-" + style.replace(/ +/g, " cm-");
-      }
-      if (!allText && wrapAt == null) {
-        span(pre, " ");
-      } else if (!marked || !marked.length) {
-        for (var i = 0, ch = 0; ch < len; i+=2) {
-          var str = st[i], style = st[i+1], l = str.length;
-          if (ch + l > len) str = str.slice(0, len - ch);
-          ch += l;
-          span(pre, str, styleToClass(style));
-        }
-      } else {
-        marked.sort(function(a, b) { return a.from - b.from; });
-        var pos = 0, i = 0, text = "", style, sg = 0;
-        var nextChange = marked[0].from || 0, marks = [], markpos = 0;
-        var advanceMarks = function() {
-          var m;
-          while (markpos < marked.length &&
-                 ((m = marked[markpos]).from == pos || m.from == null)) {
-            if (m.marker.type == "range") marks.push(m);
-            ++markpos;
-          }
-          nextChange = markpos < marked.length ? marked[markpos].from : Infinity;
-          for (var i = 0; i < marks.length; ++i) {
-            var to = marks[i].to;
-            if (to == null) to = Infinity;
-            if (to == pos) marks.splice(i--, 1);
-            else nextChange = Math.min(to, nextChange);
-          }
-        };
-        var m = 0;
-        while (pos < len) {
-          if (nextChange == pos) advanceMarks();
-          var upto = Math.min(len, nextChange);
-          while (true) {
-            if (text) {
-              var end = pos + text.length;
-              var appliedStyle = style;
-              for (var j = 0; j < marks.length; ++j) {
-                var mark = marks[j];
-                appliedStyle = (appliedStyle ? appliedStyle + " " : "") + mark.marker.style;
-                if (mark.marker.endStyle && mark.to === Math.min(end, upto)) appliedStyle += " " + mark.marker.endStyle;
-                if (mark.marker.startStyle && mark.from === pos) appliedStyle += " " + mark.marker.startStyle;
-              }
-              span(pre, end > upto ? text.slice(0, upto - pos) : text, appliedStyle);
-              if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
-              pos = end;
-            }
-            text = st[i++]; style = styleToClass(st[i++]);
-          }
-        }
-      }
-      return pre;
-    },
-    cleanUp: function() {
-      this.parent = null;
-      detachMarkedSpans(this);
-    }
-  };
-
-  // Data structure that holds the sequence of lines.
-  function LeafChunk(lines) {
-    this.lines = lines;
-    this.parent = null;
-    for (var i = 0, e = lines.length, height = 0; i < e; ++i) {
-      lines[i].parent = this;
-      height += lines[i].height;
-    }
-    this.height = height;
-  }
-  LeafChunk.prototype = {
-    chunkSize: function() { return this.lines.length; },
-    remove: function(at, n, callbacks) {
-      for (var i = at, e = at + n; i < e; ++i) {
-        var line = this.lines[i];
-        this.height -= line.height;
-        line.cleanUp();
-        if (line.handlers)
-          for (var j = 0; j < line.handlers.length; ++j) callbacks.push(line.handlers[j]);
-      }
-      this.lines.splice(at, n);
-    },
-    collapse: function(lines) {
-      lines.splice.apply(lines, [lines.length, 0].concat(this.lines));
-    },
-    insertHeight: function(at, lines, height) {
-      this.height += height;
-      this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
-      for (var i = 0, e = lines.length; i < e; ++i) lines[i].parent = this;
-    },
-    iterN: function(at, n, op) {
-      for (var e = at + n; at < e; ++at)
-        if (op(this.lines[at])) return true;
-    }
-  };
-  function BranchChunk(children) {
-    this.children = children;
-    var size = 0, height = 0;
-    for (var i = 0, e = children.length; i < e; ++i) {
-      var ch = children[i];
-      size += ch.chunkSize(); height += ch.height;
-      ch.parent = this;
-    }
-    this.size = size;
-    this.height = height;
-    this.parent = null;
-  }
-  BranchChunk.prototype = {
-    chunkSize: function() { return this.size; },
-    remove: function(at, n, callbacks) {
-      this.size -= n;
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at < sz) {
-          var rm = Math.min(n, sz - at), oldHeight = child.height;
-          child.remove(at, rm, callbacks);
-          this.height -= oldHeight - child.height;
-          if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }
-          if ((n -= rm) == 0) break;
-          at = 0;
-        } else at -= sz;
-      }
-      if (this.size - n < 25) {
-        var lines = [];
-        this.collapse(lines);
-        this.children = [new LeafChunk(lines)];
-        this.children[0].parent = this;
-      }
-    },
-    collapse: function(lines) {
-      for (var i = 0, e = this.children.length; i < e; ++i) this.children[i].collapse(lines);
-    },
-    insert: function(at, lines) {
-      var height = 0;
-      for (var i = 0, e = lines.length; i < e; ++i) height += lines[i].height;
-      this.insertHeight(at, lines, height);
-    },
-    insertHeight: function(at, lines, height) {
-      this.size += lines.length;
-      this.height += height;
-      for (var i = 0, e = this.children.length; i < e; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at <= sz) {
-          child.insertHeight(at, lines, height);
-          if (child.lines && child.lines.length > 50) {
-            while (child.lines.length > 50) {
-              var spilled = child.lines.splice(child.lines.length - 25, 25);
-              var newleaf = new LeafChunk(spilled);
-              child.height -= newleaf.height;
-              this.children.splice(i + 1, 0, newleaf);
-              newleaf.parent = this;
-            }
-            this.maybeSpill();
-          }
-          break;
-        }
-        at -= sz;
-      }
-    },
-    maybeSpill: function() {
-      if (this.children.length <= 10) return;
-      var me = this;
-      do {
-        var spilled = me.children.splice(me.children.length - 5, 5);
-        var sibling = new BranchChunk(spilled);
-        if (!me.parent) { // Become the parent node
-          var copy = new BranchChunk(me.children);
-          copy.parent = me;
-          me.children = [copy, sibling];
-          me = copy;
-        } else {
-          me.size -= sibling.size;
-          me.height -= sibling.height;
-          var myIndex = indexOf(me.parent.children, me);
-          me.parent.children.splice(myIndex + 1, 0, sibling);
-        }
-        sibling.parent = me.parent;
-      } while (me.children.length > 10);
-      me.parent.maybeSpill();
-    },
-    iter: function(from, to, op) { this.iterN(from, to - from, op); },
-    iterN: function(at, n, op) {
-      for (var i = 0, e = this.children.length; i < e; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at < sz) {
-          var used = Math.min(n, sz - at);
-          if (child.iterN(at, used, op)) return true;
-          if ((n -= used) == 0) break;
-          at = 0;
-        } else at -= sz;
-      }
-    }
-  };
-
-  function getLineAt(chunk, n) {
-    while (!chunk.lines) {
-      for (var i = 0;; ++i) {
-        var child = chunk.children[i], sz = child.chunkSize();
-        if (n < sz) { chunk = child; break; }
-        n -= sz;
-      }
-    }
-    return chunk.lines[n];
-  }
-  function lineNo(line) {
-    if (line.parent == null) return null;
-    var cur = line.parent, no = indexOf(cur.lines, line);
-    for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
-      for (var i = 0, e = chunk.children.length; ; ++i) {
-        if (chunk.children[i] == cur) break;
-        no += chunk.children[i].chunkSize();
-      }
-    }
-    return no;
-  }
-  function lineAtHeight(chunk, h) {
-    var n = 0;
-    outer: do {
-      for (var i = 0, e = chunk.children.length; i < e; ++i) {
-        var child = chunk.children[i], ch = child.height;
-        if (h < ch) { chunk = child; continue outer; }
-        h -= ch;
-        n += child.chunkSize();
-      }
-      return n;
-    } while (!chunk.lines);
-    for (var i = 0, e = chunk.lines.length; i < e; ++i) {
-      var line = chunk.lines[i], lh = line.height;
-      if (h < lh) break;
-      h -= lh;
-    }
-    return n + i;
-  }
-  function heightAtLine(chunk, n) {
-    var h = 0;
-    outer: do {
-      for (var i = 0, e = chunk.children.length; i < e; ++i) {
-        var child = chunk.children[i], sz = child.chunkSize();
-        if (n < sz) { chunk = child; continue outer; }
-        n -= sz;
-        h += child.height;
-      }
-      return h;
-    } while (!chunk.lines);
-    for (var i = 0; i < n; ++i) h += chunk.lines[i].height;
-    return h;
-  }
-
-  // The history object 'chunks' changes that are made close together
-  // and at almost the same time into bigger undoable units.
-  function History() {
-    this.time = 0;
-    this.done = []; this.undone = [];
-    this.compound = 0;
-    this.closed = false;
-  }
-  History.prototype = {
-    addChange: function(start, added, old) {
-      this.undone.length = 0;
-      var time = +new Date, cur = lst(this.done), last = cur && lst(cur);
-      var dtime = time - this.time;
-
-      if (cur && !this.closed && this.compound) {
-        cur.push({start: start, added: added, old: old});
-      } else if (dtime > 400 || !last || this.closed ||
-                 last.start > start + old.length || last.start + last.added < start) {
-        this.done.push([{start: start, added: added, old: old}]);
-        this.closed = false;
-      } else {
-        var startBefore = Math.max(0, last.start - start),
-            endAfter = Math.max(0, (start + old.length) - (last.start + last.added));
-        for (var i = startBefore; i > 0; --i) last.old.unshift(old[i - 1]);
-        for (var i = endAfter; i > 0; --i) last.old.push(old[old.length - i]);
-        if (startBefore) last.start = start;
-        last.added += added - (old.length - startBefore - endAfter);
-      }
-      this.time = time;
-    },
-    startCompound: function() {
-      if (!this.compound++) this.closed = true;
-    },
-    endCompound: function() {
-      if (!--this.compound) this.closed = true;
-    }
-  };
-
-  function stopMethod() {e_stop(this);}
-  // Ensure an event has a stop method.
-  function addStop(event) {
-    if (!event.stop) event.stop = stopMethod;
-    return event;
-  }
-
-  function e_preventDefault(e) {
-    if (e.preventDefault) e.preventDefault();
-    else e.returnValue = false;
-  }
-  function e_stopPropagation(e) {
-    if (e.stopPropagation) e.stopPropagation();
-    else e.cancelBubble = true;
-  }
-  function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}
-  CodeMirror.e_stop = e_stop;
-  CodeMirror.e_preventDefault = e_preventDefault;
-  CodeMirror.e_stopPropagation = e_stopPropagation;
-
-  function e_target(e) {return e.target || e.srcElement;}
-  function e_button(e) {
-    var b = e.which;
-    if (b == null) {
-      if (e.button & 1) b = 1;
-      else if (e.button & 2) b = 3;
-      else if (e.button & 4) b = 2;
-    }
-    if (mac && e.ctrlKey && b == 1) b = 3;
-    return b;
-  }
-
-  // Allow 3rd-party code to override event properties by adding an override
-  // object to an event object.
-  function e_prop(e, prop) {
-    var overridden = e.override && e.override.hasOwnProperty(prop);
-    return overridden ? e.override[prop] : e[prop];
-  }
-
-  // Event handler registration. If disconnect is true, it'll return a
-  // function that unregisters the handler.
-  function connect(node, type, handler, disconnect) {
-    if (typeof node.addEventListener == "function") {
-      node.addEventListener(type, handler, false);
-      if (disconnect) return function() {node.removeEventListener(type, handler, false);};
-    } else {
-      var wrapHandler = function(event) {handler(event || window.event);};
-      node.attachEvent("on" + type, wrapHandler);
-      if (disconnect) return function() {node.detachEvent("on" + type, wrapHandler);};
-    }
-  }
-  CodeMirror.connect = connect;
-
-  function Delayed() {this.id = null;}
-  Delayed.prototype = {set: function(ms, f) {clearTimeout(this.id); this.id = setTimeout(f, ms);}};
-
-  var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}};
-
-  // Detect drag-and-drop
-  var dragAndDrop = function() {
-    // There is *some* kind of drag-and-drop support in IE6-8, but I
-    // couldn't get it to work yet.
-    if (ie_lt9) return false;
-    var div = elt('div');
-    return "draggable" in div || "dragDrop" in div;
-  }();
-
-  // Feature-detect whether newlines in textareas are converted to \r\n
-  var lineSep = function () {
-    var te = elt("textarea");
-    te.value = "foo\nbar";
-    if (te.value.indexOf("\r") > -1) return "\r\n";
-    return "\n";
-  }();
-
-  // For a reason I have yet to figure out, some browsers disallow
-  // word wrapping between certain characters *only* if a new inline
-  // element is started between them. This makes it hard to reliably
-  // measure the position of things, since that requires inserting an
-  // extra span. This terribly fragile set of regexps matches the
-  // character combinations that suffer from this phenomenon on the
-  // various browsers.
-  var spanAffectsWrapping = /^$/; // Won't match any two-character string
-  if (gecko) spanAffectsWrapping = /$'/;
-  else if (safari) spanAffectsWrapping = /\-[^ \-?]|\?[^ !'\"\),.\-\/:;\?\]\}]/;
-  else if (chrome) spanAffectsWrapping = /\-[^ \-\.?]|\?[^ \-\.?\]\}:;!'\"\),\/]|[\.!\"#&%\)*+,:;=>\]|\}~][\(\{\[<]|\$'/;
-
-  // Counts the column offset in a string, taking tabs into account.
-  // Used mostly to find indentation.
-  function countColumn(string, end, tabSize) {
-    if (end == null) {
-      end = string.search(/[^\s\u00a0]/);
-      if (end == -1) end = string.length;
-    }
-    for (var i = 0, n = 0; i < end; ++i) {
-      if (string.charAt(i) == "\t") n += tabSize - (n % tabSize);
-      else ++n;
-    }
-    return n;
-  }
-
-  function eltOffset(node, screen) {
-    // Take the parts of bounding client rect that we are interested in so we are able to edit if need be,
-    // since the returned value cannot be changed externally (they are kept in sync as the element moves within the page)
-    try { var box = node.getBoundingClientRect(); box = { top: box.top, left: box.left }; }
-    catch(e) { box = {top: 0, left: 0}; }
-    if (!screen) {
-      // Get the toplevel scroll, working around browser differences.
-      if (window.pageYOffset == null) {
-        var t = document.documentElement || document.body.parentNode;
-        if (t.scrollTop == null) t = document.body;
-        box.top += t.scrollTop; box.left += t.scrollLeft;
-      } else {
-        box.top += window.pageYOffset; box.left += window.pageXOffset;
-      }
-    }
-    return box;
-  }
-
-  function eltText(node) {
-    return node.textContent || node.innerText || node.nodeValue || "";
-  }
-
-  var spaceStrs = [""];
-  function spaceStr(n) {
-    while (spaceStrs.length <= n)
-      spaceStrs.push(lst(spaceStrs) + " ");
-    return spaceStrs[n];
-  }
-
-  function lst(arr) { return arr[arr.length-1]; }
-
-  function selectInput(node) {
-    if (ios) { // Mobile Safari apparently has a bug where select() is broken.
-      node.selectionStart = 0;
-      node.selectionEnd = node.value.length;
-    } else node.select();
-  }
-
-  // Operations on {line, ch} objects.
-  function posEq(a, b) {return a.line == b.line && a.ch == b.ch;}
-  function posLess(a, b) {return a.line < b.line || (a.line == b.line && a.ch < b.ch);}
-  function copyPos(x) {return {line: x.line, ch: x.ch};}
-
-  function elt(tag, content, className, style) {
-    var e = document.createElement(tag);
-    if (className) e.className = className;
-    if (style) e.style.cssText = style;
-    if (typeof content == "string") setTextContent(e, content);
-    else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
-    return e;
-  }
-  function removeChildren(e) {
-    e.innerHTML = "";
-    return e;
-  }
-  function removeChildrenAndAdd(parent, e) {
-    removeChildren(parent).appendChild(e);
-  }
-  function setTextContent(e, str) {
-    if (ie_lt9) {
-      e.innerHTML = "";
-      e.appendChild(document.createTextNode(str));
-    } else e.textContent = str;
-  }
-
-  // Used to position the cursor after an undo/redo by finding the
-  // last edited character.
-  function editEnd(from, to) {
-    if (!to) return 0;
-    if (!from) return to.length;
-    for (var i = from.length, j = to.length; i >= 0 && j >= 0; --i, --j)
-      if (from.charAt(i) != to.charAt(j)) break;
-    return j + 1;
-  }
-
-  function indexOf(collection, elt) {
-    if (collection.indexOf) return collection.indexOf(elt);
-    for (var i = 0, e = collection.length; i < e; ++i)
-      if (collection[i] == elt) return i;
-    return -1;
-  }
-  function isWordChar(ch) {
-    return /\w/.test(ch) || ch.toUpperCase() != ch.toLowerCase() || /[\u4E00-\u9FA5]/.test(ch);
-  }
-
-  // See if "".split is the broken IE version, if so, provide an
-  // alternative way to split lines.
-  var splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
-    var pos = 0, result = [], l = string.length;
-    while (pos <= l) {
-      var nl = string.indexOf("\n", pos);
-      if (nl == -1) nl = string.length;
-      var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);
-      var rt = line.indexOf("\r");
-      if (rt != -1) {
-        result.push(line.slice(0, rt));
-        pos += rt + 1;
-      } else {
-        result.push(line);
-        pos = nl + 1;
-      }
-    }
-    return result;
-  } : function(string){return string.split(/\r\n?|\n/);};
-  CodeMirror.splitLines = splitLines;
-
-  var hasSelection = window.getSelection ? function(te) {
-    try { return te.selectionStart != te.selectionEnd; }
-    catch(e) { return false; }
-  } : function(te) {
-    try {var range = te.ownerDocument.selection.createRange();}
-    catch(e) {}
-    if (!range || range.parentElement() != te) return false;
-    return range.compareEndPoints("StartToEnd", range) != 0;
-  };
-
-  CodeMirror.defineMode("null", function() {
-    return {token: function(stream) {stream.skipToEnd();}};
-  });
-  CodeMirror.defineMIME("text/plain", "null");
-
-  var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
-                  19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
-                  36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
-                  46: "Delete", 59: ";", 91: "Mod", 92: "Mod", 93: "Mod", 109: "-", 107: "=", 127: "Delete",
-                  186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
-                  221: "]", 222: "'", 63276: "PageUp", 63277: "PageDown", 63275: "End", 63273: "Home",
-                  63234: "Left", 63232: "Up", 63235: "Right", 63233: "Down", 63302: "Insert", 63272: "Delete"};
-  CodeMirror.keyNames = keyNames;
-  (function() {
-    // Number keys
-    for (var i = 0; i < 10; i++) keyNames[i + 48] = String(i);
-    // Alphabetic keys
-    for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i);
-    // Function keys
-    for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
-  })();
-
-  CodeMirror.version = "2.35";
-
-  return CodeMirror;
-})();
Index: lugins/themeEditor/codemirror/css.js
===================================================================
--- plugins/themeEditor/codemirror/css.js	(revision 948)
+++ 	(revision )
@@ -1,448 +1,0 @@
-CodeMirror.defineMode("css", function(config) {
-  var indentUnit = config.indentUnit, type;
-  
-  var atMediaTypes = keySet([
-    "all", "aural", "braille", "handheld", "print", "projection", "screen",
-    "tty", "tv", "embossed"
-  ]);
-  
-  var atMediaFeatures = keySet([
-    "width", "min-width", "max-width", "height", "min-height", "max-height",
-    "device-width", "min-device-width", "max-device-width", "device-height",
-    "min-device-height", "max-device-height", "aspect-ratio",
-    "min-aspect-ratio", "max-aspect-ratio", "device-aspect-ratio",
-    "min-device-aspect-ratio", "max-device-aspect-ratio", "color", "min-color",
-    "max-color", "color-index", "min-color-index", "max-color-index",
-    "monochrome", "min-monochrome", "max-monochrome", "resolution",
-    "min-resolution", "max-resolution", "scan", "grid"
-  ]);
-
-  var propertyKeywords = keySet([
-    "align-content", "align-items", "align-self", "alignment-adjust",
-    "alignment-baseline", "anchor-point", "animation", "animation-delay",
-    "animation-direction", "animation-duration", "animation-iteration-count",
-    "animation-name", "animation-play-state", "animation-timing-function",
-    "appearance", "azimuth", "backface-visibility", "background",
-    "background-attachment", "background-clip", "background-color",
-    "background-image", "background-origin", "background-position",
-    "background-repeat", "background-size", "baseline-shift", "binding",
-    "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
-    "bookmark-target", "border", "border-bottom", "border-bottom-color",
-    "border-bottom-left-radius", "border-bottom-right-radius",
-    "border-bottom-style", "border-bottom-width", "border-collapse",
-    "border-color", "border-image", "border-image-outset",
-    "border-image-repeat", "border-image-slice", "border-image-source",
-    "border-image-width", "border-left", "border-left-color",
-    "border-left-style", "border-left-width", "border-radius", "border-right",
-    "border-right-color", "border-right-style", "border-right-width",
-    "border-spacing", "border-style", "border-top", "border-top-color",
-    "border-top-left-radius", "border-top-right-radius", "border-top-style",
-    "border-top-width", "border-width", "bottom", "box-decoration-break",
-    "box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
-    "caption-side", "clear", "clip", "color", "color-profile", "column-count",
-    "column-fill", "column-gap", "column-rule", "column-rule-color",
-    "column-rule-style", "column-rule-width", "column-span", "column-width",
-    "columns", "content", "counter-increment", "counter-reset", "crop", "cue",
-    "cue-after", "cue-before", "cursor", "direction", "display",
-    "dominant-baseline", "drop-initial-after-adjust",
-    "drop-initial-after-align", "drop-initial-before-adjust",
-    "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
-    "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
-    "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
-    "float", "float-offset", "font", "font-feature-settings", "font-family",
-    "font-kerning", "font-language-override", "font-size", "font-size-adjust",
-    "font-stretch", "font-style", "font-synthesis", "font-variant",
-    "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
-    "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
-    "font-weight", "grid-cell", "grid-column", "grid-column-align",
-    "grid-column-sizing", "grid-column-span", "grid-columns", "grid-flow",
-    "grid-row", "grid-row-align", "grid-row-sizing", "grid-row-span",
-    "grid-rows", "grid-template", "hanging-punctuation", "height", "hyphens",
-    "icon", "image-orientation", "image-rendering", "image-resolution",
-    "inline-box-align", "justify-content", "left", "letter-spacing",
-    "line-break", "line-height", "line-stacking", "line-stacking-ruby",
-    "line-stacking-shift", "line-stacking-strategy", "list-style",
-    "list-style-image", "list-style-position", "list-style-type", "margin",
-    "margin-bottom", "margin-left", "margin-right", "margin-top",
-    "marker-offset", "marks", "marquee-direction", "marquee-loop",
-    "marquee-play-count", "marquee-speed", "marquee-style", "max-height",
-    "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index",
-    "nav-left", "nav-right", "nav-up", "opacity", "order", "orphans", "outline",
-    "outline-color", "outline-offset", "outline-style", "outline-width",
-    "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y",
-    "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
-    "page", "page-break-after", "page-break-before", "page-break-inside",
-    "page-policy", "pause", "pause-after", "pause-before", "perspective",
-    "perspective-origin", "pitch", "pitch-range", "play-during", "position",
-    "presentation-level", "punctuation-trim", "quotes", "rendering-intent",
-    "resize", "rest", "rest-after", "rest-before", "richness", "right",
-    "rotation", "rotation-point", "ruby-align", "ruby-overhang",
-    "ruby-position", "ruby-span", "size", "speak", "speak-as", "speak-header",
-    "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
-    "tab-size", "table-layout", "target", "target-name", "target-new",
-    "target-position", "text-align", "text-align-last", "text-decoration",
-    "text-decoration-color", "text-decoration-line", "text-decoration-skip",
-    "text-decoration-style", "text-emphasis", "text-emphasis-color",
-    "text-emphasis-position", "text-emphasis-style", "text-height",
-    "text-indent", "text-justify", "text-outline", "text-shadow",
-    "text-space-collapse", "text-transform", "text-underline-position",
-    "text-wrap", "top", "transform", "transform-origin", "transform-style",
-    "transition", "transition-delay", "transition-duration",
-    "transition-property", "transition-timing-function", "unicode-bidi",
-    "vertical-align", "visibility", "voice-balance", "voice-duration",
-    "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
-    "voice-volume", "volume", "white-space", "widows", "width", "word-break",
-    "word-spacing", "word-wrap", "z-index"
-  ]);
-
-  var colorKeywords = keySet([
-    "black", "silver", "gray", "white", "maroon", "red", "purple", "fuchsia",
-    "green", "lime", "olive", "yellow", "navy", "blue", "teal", "aqua"
-  ]);
-  
-  var valueKeywords = keySet([
-    "above", "absolute", "activeborder", "activecaption", "afar",
-    "after-white-space", "ahead", "alias", "all", "all-scroll", "alternate",
-    "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
-    "arabic-indic", "armenian", "asterisks", "auto", "avoid", "background",
-    "backwards", "baseline", "below", "bidi-override", "binary", "bengali",
-    "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
-    "both", "bottom", "break-all", "break-word", "button", "button-bevel",
-    "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "cambodian",
-    "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
-    "cell", "center", "checkbox", "circle", "cjk-earthly-branch",
-    "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
-    "col-resize", "collapse", "compact", "condensed", "contain", "content",
-    "content-box", "context-menu", "continuous", "copy", "cover", "crop",
-    "cross", "crosshair", "currentcolor", "cursive", "dashed", "decimal",
-    "decimal-leading-zero", "default", "default-button", "destination-atop",
-    "destination-in", "destination-out", "destination-over", "devanagari",
-    "disc", "discard", "document", "dot-dash", "dot-dot-dash", "dotted",
-    "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
-    "element", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
-    "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er",
-    "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",
-    "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et",
-    "ethiopic-halehame-gez", "ethiopic-halehame-om-et",
-    "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
-    "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et",
-    "ethiopic-halehame-tig", "ew-resize", "expanded", "extra-condensed",
-    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "footnotes",
-    "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
-    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew",
-    "help", "hidden", "hide", "higher", "highlight", "highlighttext",
-    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "icon", "ignore",
-    "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
-    "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
-    "inline-block", "inline-table", "inset", "inside", "intrinsic", "invert",
-    "italic", "justify", "kannada", "katakana", "katakana-iroha", "khmer",
-    "landscape", "lao", "large", "larger", "left", "level", "lighter",
-    "line-through", "linear", "lines", "list-item", "listbox", "listitem",
-    "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
-    "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
-    "lower-roman", "lowercase", "ltr", "malayalam", "match",
-    "media-controls-background", "media-current-time-display",
-    "media-fullscreen-button", "media-mute-button", "media-play-button",
-    "media-return-to-realtime-button", "media-rewind-button",
-    "media-seek-back-button", "media-seek-forward-button", "media-slider",
-    "media-sliderthumb", "media-time-remaining-display", "media-volume-slider",
-    "media-volume-slider-container", "media-volume-sliderthumb", "medium",
-    "menu", "menulist", "menulist-button", "menulist-text",
-    "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",
-    "mix", "mongolian", "monospace", "move", "multiple", "myanmar", "n-resize",
-    "narrower", "navy", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
-    "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
-    "ns-resize", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
-    "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
-    "outside", "overlay", "overline", "padding", "padding-box", "painted",
-    "paused", "persian", "plus-darker", "plus-lighter", "pointer", "portrait",
-    "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button",
-    "radio", "read-only", "read-write", "read-write-plaintext-only", "relative",
-    "repeat", "repeat-x", "repeat-y", "reset", "reverse", "rgb", "rgba",
-    "ridge", "right", "round", "row-resize", "rtl", "run-in", "running",
-    "s-resize", "sans-serif", "scroll", "scrollbar", "se-resize", "searchfield",
-    "searchfield-cancel-button", "searchfield-decoration",
-    "searchfield-results-button", "searchfield-results-decoration",
-    "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
-    "single", "skip-white-space", "slide", "slider-horizontal",
-    "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
-    "small", "small-caps", "small-caption", "smaller", "solid", "somali",
-    "source-atop", "source-in", "source-out", "source-over", "space", "square",
-    "square-button", "start", "static", "status-bar", "stretch", "stroke",
-    "sub", "subpixel-antialiased", "super", "sw-resize", "table",
-    "table-caption", "table-cell", "table-column", "table-column-group",
-    "table-footer-group", "table-header-group", "table-row", "table-row-group",
-    "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai",
-    "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
-    "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
-    "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
-    "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
-    "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
-    "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
-    "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
-    "visibleStroke", "visual", "w-resize", "wait", "wave", "white", "wider",
-    "window", "windowframe", "windowtext", "x-large", "x-small", "xor",
-    "xx-large", "xx-small", "yellow"
-  ]);
-
-  function keySet(array) { var keys = {}; for (var i = 0; i < array.length; ++i) keys[array[i]] = true; return keys; }
-  function ret(style, tp) {type = tp; return style;}
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == "@") {stream.eatWhile(/[\w\\\-]/); return ret("def", stream.current());}
-    else if (ch == "/" && stream.eat("*")) {
-      state.tokenize = tokenCComment;
-      return tokenCComment(stream, state);
-    }
-    else if (ch == "<" && stream.eat("!")) {
-      state.tokenize = tokenSGMLComment;
-      return tokenSGMLComment(stream, state);
-    }
-    else if (ch == "=") ret(null, "compare");
-    else if ((ch == "~" || ch == "|") && stream.eat("=")) return ret(null, "compare");
-    else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    else if (ch == "#") {
-      stream.eatWhile(/[\w\\\-]/);
-      return ret("atom", "hash");
-    }
-    else if (ch == "!") {
-      stream.match(/^\s*\w*/);
-      return ret("keyword", "important");
-    }
-    else if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w.%]/);
-      return ret("number", "unit");
-    }
-    else if (ch === "-") {
-      if (/\d/.test(stream.peek())) {
-        stream.eatWhile(/[\w.%]/);
-        return ret("number", "unit");
-      } else if (stream.match(/^[^-]+-/)) {
-        return ret("meta", type);
-      }
-    }
-    else if (/[,+>*\/]/.test(ch)) {
-      return ret(null, "select-op");
-    }
-    else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) {
-      return ret("qualifier", type);
-    }
-    else if (ch == ":") {
-      return ret("operator", ch);
-    }
-    else if (/[;{}\[\]\(\)]/.test(ch)) {
-      return ret(null, ch);
-    }
-    else {
-      stream.eatWhile(/[\w\\\-]/);
-      return ret("property", "variable");
-    }
-  }
-
-  function tokenCComment(stream, state) {
-    var maybeEnd = false, ch;
-    while ((ch = stream.next()) != null) {
-      if (maybeEnd && ch == "/") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenSGMLComment(stream, state) {
-    var dashes = 0, ch;
-    while ((ch = stream.next()) != null) {
-      if (dashes >= 2 && ch == ">") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      dashes = (ch == "-") ? dashes + 1 : 0;
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped)
-          break;
-        escaped = !escaped && ch == "\\";
-      }
-      if (!escaped) state.tokenize = tokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  return {
-    startState: function(base) {
-      return {tokenize: tokenBase,
-              baseIndent: base || 0,
-              stack: []};
-    },
-
-    token: function(stream, state) {
-      
-      // Use these terms when applicable (see http://www.xanthir.com/blog/b4E50)
-      // 
-      // rule** or **ruleset:
-      // A selector + braces combo, or an at-rule.
-      // 
-      // declaration block:
-      // A sequence of declarations.
-      // 
-      // declaration:
-      // A property + colon + value combo.
-      // 
-      // property value:
-      // The entire value of a property.
-      // 
-      // component value:
-      // A single piece of a property value. Like the 5px in
-      // text-shadow: 0 0 5px blue;. Can also refer to things that are
-      // multiple terms, like the 1-4 terms that make up the background-size
-      // portion of the background shorthand.
-      // 
-      // term:
-      // The basic unit of author-facing CSS, like a single number (5),
-      // dimension (5px), string ("foo"), or function. Officially defined
-      //  by the CSS 2.1 grammar (look for the 'term' production)
-      // 
-      // 
-      // simple selector:
-      // A single atomic selector, like a type selector, an attr selector, a
-      // class selector, etc.
-      // 
-      // compound selector:
-      // One or more simple selectors without a combinator. div.example is
-      // compound, div > .example is not.
-      // 
-      // complex selector:
-      // One or more compound selectors chained with combinators.
-      // 
-      // combinator:
-      // The parts of selectors that express relationships. There are four
-      // currently - the space (descendant combinator), the greater-than
-      // bracket (child combinator), the plus sign (next sibling combinator),
-      // and the tilda (following sibling combinator).
-      // 
-      // sequence of selectors:
-      // One or more of the named type of selector chained with commas.
-
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-
-      // Changing style returned based on context
-      var context = state.stack[state.stack.length-1];
-      if (style == "property") {
-        if (context == "propertyValue"){
-          if (valueKeywords[stream.current()]) {
-            style = "string-2";
-          } else if (colorKeywords[stream.current()]) {
-            style = "keyword";
-          } else {
-            style = "variable-2";
-          }
-        } else if (context == "rule") {
-          if (!propertyKeywords[stream.current()]) {
-            style += " error";
-          }
-        } else if (!context || context == "@media{") {
-          style = "tag";
-        } else if (context == "@media") {
-          if (atMediaTypes[stream.current()]) {
-            style = "attribute"; // Known attribute
-          } else if (/^(only|not)$/i.test(stream.current())) {
-            style = "keyword";
-          } else if (stream.current().toLowerCase() == "and") {
-            style = "error"; // "and" is only allowed in @mediaType
-          } else if (atMediaFeatures[stream.current()]) {
-            style = "error"; // Known property, should be in @mediaType(
-          } else {
-            // Unknown, expecting keyword or attribute, assuming attribute
-            style = "attribute error";
-          }
-        } else if (context == "@mediaType") {
-          if (atMediaTypes[stream.current()]) {
-            style = "attribute";
-          } else if (stream.current().toLowerCase() == "and") {
-            style = "operator";
-          } else if (/^(only|not)$/i.test(stream.current())) {
-            style = "error"; // Only allowed in @media
-          } else if (atMediaFeatures[stream.current()]) {
-            style = "error"; // Known property, should be in parentheses
-          } else {
-            // Unknown attribute or property, but expecting property (preceded
-            // by "and"). Should be in parentheses
-            style = "error";
-          }
-        } else if (context == "@mediaType(") {
-          if (propertyKeywords[stream.current()]) {
-            // do nothing, remains "property"
-          } else if (atMediaTypes[stream.current()]) {
-            style = "error"; // Known property, should be in parentheses
-          } else if (stream.current().toLowerCase() == "and") {
-            style = "operator";
-          } else if (/^(only|not)$/i.test(stream.current())) {
-            style = "error"; // Only allowed in @media
-          } else {
-            style += " error";
-          }
-        } else {
-          style = "error";
-        }
-      } else if (style == "atom") {
-        if(!context || context == "@media{") {
-          style = "builtin";
-        } else if (context == "propertyValue") {
-          if (!/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
-            style += " error";
-          }
-        } else {
-          style = "error";
-        }
-      } else if (context == "@media" && type == "{") {
-        style = "error";
-      }
-
-      // Push/pop context stack
-      if (type == "{") {
-        if (context == "@media" || context == "@mediaType") {
-          state.stack.pop();
-          state.stack[state.stack.length-1] = "@media{";
-        }
-        else state.stack.push("rule");
-      }
-      else if (type == "}") {
-        state.stack.pop();
-        if (context == "propertyValue") state.stack.pop();
-      }
-      else if (type == "@media") state.stack.push("@media");
-      else if (context == "@media" && /\b(keyword|attribute)\b/.test(style))
-        state.stack.push("@mediaType");
-      else if (context == "@mediaType" && stream.current() == ",") state.stack.pop();
-      else if (context == "@mediaType" && type == "(") state.stack.push("@mediaType(");
-      else if (context == "@mediaType(" && type == ")") state.stack.pop();
-      else if (context == "rule" && type == ":") state.stack.push("propertyValue");
-      else if (context == "propertyValue" && type == ";") state.stack.pop();
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var n = state.stack.length;
-      if (/^\}/.test(textAfter))
-        n -= state.stack[state.stack.length-1] == "propertyValue" ? 2 : 1;
-      return state.baseIndent + n * indentUnit;
-    },
-
-    electricChars: "}"
-  };
-});
-
-CodeMirror.defineMIME("text/css", "css");
Index: lugins/themeEditor/codemirror/htmlmixed.js
===================================================================
--- plugins/themeEditor/codemirror/htmlmixed.js	(revision 948)
+++ 	(revision )
@@ -1,84 +1,0 @@
-CodeMirror.defineMode("htmlmixed", function(config) {
-  var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true});
-  var jsMode = CodeMirror.getMode(config, "javascript");
-  var cssMode = CodeMirror.getMode(config, "css");
-
-  function html(stream, state) {
-    var style = htmlMode.token(stream, state.htmlState);
-    if (style == "tag" && stream.current() == ">" && state.htmlState.context) {
-      if (/^script$/i.test(state.htmlState.context.tagName)) {
-        state.token = javascript;
-        state.localState = jsMode.startState(htmlMode.indent(state.htmlState, ""));
-      }
-      else if (/^style$/i.test(state.htmlState.context.tagName)) {
-        state.token = css;
-        state.localState = cssMode.startState(htmlMode.indent(state.htmlState, ""));
-      }
-    }
-    return style;
-  }
-  function maybeBackup(stream, pat, style) {
-    var cur = stream.current();
-    var close = cur.search(pat), m;
-    if (close > -1) stream.backUp(cur.length - close);
-    else if (m = cur.match(/<\/?$/)) {
-      stream.backUp(cur[0].length);
-      if (!stream.match(pat, false)) stream.match(cur[0]);
-    }
-    return style;
-  }
-  function javascript(stream, state) {
-    if (stream.match(/^<\/\s*script\s*>/i, false)) {
-      state.token = html;
-      state.localState = null;
-      return html(stream, state);
-    }
-    return maybeBackup(stream, /<\/\s*script\s*>/,
-                       jsMode.token(stream, state.localState));
-  }
-  function css(stream, state) {
-    if (stream.match(/^<\/\s*style\s*>/i, false)) {
-      state.token = html;
-      state.localState = null;
-      return html(stream, state);
-    }
-    return maybeBackup(stream, /<\/\s*style\s*>/,
-                       cssMode.token(stream, state.localState));
-  }
-
-  return {
-    startState: function() {
-      var state = htmlMode.startState();
-      return {token: html, localState: null, mode: "html", htmlState: state};
-    },
-
-    copyState: function(state) {
-      if (state.localState)
-        var local = CodeMirror.copyState(state.token == css ? cssMode : jsMode, state.localState);
-      return {token: state.token, localState: local, mode: state.mode,
-              htmlState: CodeMirror.copyState(htmlMode, state.htmlState)};
-    },
-
-    token: function(stream, state) {
-      return state.token(stream, state);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.token == html || /^\s*<\//.test(textAfter))
-        return htmlMode.indent(state.htmlState, textAfter);
-      else if (state.token == javascript)
-        return jsMode.indent(state.localState, textAfter);
-      else
-        return cssMode.indent(state.localState, textAfter);
-    },
-
-    electricChars: "/{}:",
-
-    innerMode: function(state) {
-      var mode = state.token == html ? htmlMode : state.token == javascript ? jsMode : cssMode;
-      return {state: state.localState || state.htmlState, mode: mode};
-    }
-  };
-}, "xml", "javascript", "css");
-
-CodeMirror.defineMIME("text/html", "htmlmixed");
Index: lugins/themeEditor/codemirror/javascript.js
===================================================================
--- plugins/themeEditor/codemirror/javascript.js	(revision 948)
+++ 	(revision )
@@ -1,409 +1,0 @@
-// TODO actually recognize syntax of TypeScript constructs
-
-CodeMirror.defineMode("javascript", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var jsonMode = parserConfig.json;
-  var isTS = parserConfig.typescript;
-
-  // Tokenizer
-
-  var keywords = function(){
-    function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
-    var operator = kw("operator"), atom = {type: "atom", style: "atom"};
-    
-    var jsKeywords = {
-      "if": A, "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C,
-      "var": kw("var"), "const": kw("var"), "let": kw("var"),
-      "function": kw("function"), "catch": kw("catch"),
-      "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
-      "in": operator, "typeof": operator, "instanceof": operator,
-      "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom
-    };
-
-    // Extend the 'normal' keywords with the TypeScript language extensions
-    if (isTS) {
-      var type = {type: "variable", style: "variable-3"};
-      var tsKeywords = {
-        // object-like things
-        "interface": kw("interface"),
-        "class": kw("class"),
-        "extends": kw("extends"),
-        "constructor": kw("constructor"),
-
-        // scope modifiers
-        "public": kw("public"),
-        "private": kw("private"),
-        "protected": kw("protected"),
-        "static": kw("static"),
-
-        "super": kw("super"),
-
-        // types
-        "string": type, "number": type, "bool": type, "any": type
-      };
-
-      for (var attr in tsKeywords) {
-        jsKeywords[attr] = tsKeywords[attr];
-      }
-    }
-
-    return jsKeywords;
-  }();
-
-  var isOperatorChar = /[+\-*&%=<>!?|]/;
-
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-
-  function nextUntilUnescaped(stream, end) {
-    var escaped = false, next;
-    while ((next = stream.next()) != null) {
-      if (next == end && !escaped)
-        return false;
-      escaped = !escaped && next == "\\";
-    }
-    return escaped;
-  }
-
-  // Used as scratch variables to communicate multiple values without
-  // consing up tons of objects.
-  var type, content;
-  function ret(tp, style, cont) {
-    type = tp; content = cont;
-    return style;
-  }
-
-  function jsTokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'")
-      return chain(stream, state, jsTokenString(ch));
-    else if (/[\[\]{}\(\),;\:\.]/.test(ch))
-      return ret(ch);
-    else if (ch == "0" && stream.eat(/x/i)) {
-      stream.eatWhile(/[\da-f]/i);
-      return ret("number", "number");
-    }      
-    else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) {
-      stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
-      return ret("number", "number");
-    }
-    else if (ch == "/") {
-      if (stream.eat("*")) {
-        return chain(stream, state, jsTokenComment);
-      }
-      else if (stream.eat("/")) {
-        stream.skipToEnd();
-        return ret("comment", "comment");
-      }
-      else if (state.lastType == "operator" || state.lastType == "keyword c" ||
-               /^[\[{}\(,;:]$/.test(state.lastType)) {
-        nextUntilUnescaped(stream, "/");
-        stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla
-        return ret("regexp", "string-2");
-      }
-      else {
-        stream.eatWhile(isOperatorChar);
-        return ret("operator", null, stream.current());
-      }
-    }
-    else if (ch == "#") {
-        stream.skipToEnd();
-        return ret("error", "error");
-    }
-    else if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return ret("operator", null, stream.current());
-    }
-    else {
-      stream.eatWhile(/[\w\$_]/);
-      var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
-      return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
-                     ret("variable", "variable", word);
-    }
-  }
-
-  function jsTokenString(quote) {
-    return function(stream, state) {
-      if (!nextUntilUnescaped(stream, quote))
-        state.tokenize = jsTokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  function jsTokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = jsTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  // Parser
-
-  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true};
-
-  function JSLexical(indented, column, type, align, prev, info) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.prev = prev;
-    this.info = info;
-    if (align != null) this.align = align;
-  }
-
-  function inScope(state, varname) {
-    for (var v = state.localVars; v; v = v.next)
-      if (v.name == varname) return true;
-  }
-
-  function parseJS(state, style, type, content, stream) {
-    var cc = state.cc;
-    // Communicate our context to the combinators.
-    // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc;
-  
-    if (!state.lexical.hasOwnProperty("align"))
-      state.lexical.align = true;
-
-    while(true) {
-      var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement;
-      if (combinator(type, content)) {
-        while(cc.length && cc[cc.length - 1].lex)
-          cc.pop()();
-        if (cx.marked) return cx.marked;
-        if (type == "variable" && inScope(state, content)) return "variable-2";
-        return style;
-      }
-    }
-  }
-
-  // Combinator utils
-
-  var cx = {state: null, column: null, marked: null, cc: null};
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-  function register(varname) {
-    var state = cx.state;
-    if (state.context) {
-      cx.marked = "def";
-      for (var v = state.localVars; v; v = v.next)
-        if (v.name == varname) return;
-      state.localVars = {name: varname, next: state.localVars};
-    }
-  }
-
-  // Combinators
-
-  var defaultVars = {name: "this", next: {name: "arguments"}};
-  function pushcontext() {
-    cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
-    cx.state.localVars = defaultVars;
-  }
-  function popcontext() {
-    cx.state.localVars = cx.state.context.vars;
-    cx.state.context = cx.state.context.prev;
-  }
-  function pushlex(type, info) {
-    var result = function() {
-      var state = cx.state;
-      state.lexical = new JSLexical(state.indented, cx.stream.column(), type, null, state.lexical, info);
-    };
-    result.lex = true;
-    return result;
-  }
-  function poplex() {
-    var state = cx.state;
-    if (state.lexical.prev) {
-      if (state.lexical.type == ")")
-        state.indented = state.lexical.indented;
-      state.lexical = state.lexical.prev;
-    }
-  }
-  poplex.lex = true;
-
-  function expect(wanted) {
-    return function expecting(type) {
-      if (type == wanted) return cont();
-      else if (wanted == ";") return pass();
-      else return cont(arguments.callee);
-    };
-  }
-
-  function statement(type) {
-    if (type == "var") return cont(pushlex("vardef"), vardef1, expect(";"), poplex);
-    if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex);
-    if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    if (type == ";") return cont();
-    if (type == "function") return cont(functiondef);
-    if (type == "for") return cont(pushlex("form"), expect("("), pushlex(")"), forspec1, expect(")"),
-                                      poplex, statement, poplex);
-    if (type == "variable") return cont(pushlex("stat"), maybelabel);
-    if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
-                                         block, poplex, poplex);
-    if (type == "case") return cont(expression, expect(":"));
-    if (type == "default") return cont(expect(":"));
-    if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
-                                        statement, poplex, popcontext);
-    return pass(pushlex("stat"), expression, expect(";"), poplex);
-  }
-  function expression(type) {
-    if (atomicTypes.hasOwnProperty(type)) return cont(maybeoperator);
-    if (type == "function") return cont(functiondef);
-    if (type == "keyword c") return cont(maybeexpression);
-    if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeoperator);
-    if (type == "operator") return cont(expression);
-    if (type == "[") return cont(pushlex("]"), commasep(expression, "]"), poplex, maybeoperator);
-    if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeoperator);
-    return cont();
-  }
-  function maybeexpression(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expression);
-  }
-    
-  function maybeoperator(type, value) {
-    if (type == "operator" && /\+\+|--/.test(value)) return cont(maybeoperator);
-    if (type == "operator" && value == "?") return cont(expression, expect(":"), expression);
-    if (type == ";") return;
-    if (type == "(") return cont(pushlex(")"), commasep(expression, ")"), poplex, maybeoperator);
-    if (type == ".") return cont(property, maybeoperator);
-    if (type == "[") return cont(pushlex("]"), expression, expect("]"), poplex, maybeoperator);
-  }
-  function maybelabel(type) {
-    if (type == ":") return cont(poplex, statement);
-    return pass(maybeoperator, expect(";"), poplex);
-  }
-  function property(type) {
-    if (type == "variable") {cx.marked = "property"; return cont();}
-  }
-  function objprop(type) {
-    if (type == "variable") cx.marked = "property";
-    if (atomicTypes.hasOwnProperty(type)) return cont(expect(":"), expression);
-  }
-  function commasep(what, end) {
-    function proceed(type) {
-      if (type == ",") return cont(what, proceed);
-      if (type == end) return cont();
-      return cont(expect(end));
-    }
-    return function commaSeparated(type) {
-      if (type == end) return cont();
-      else return pass(what, proceed);
-    };
-  }
-  function block(type) {
-    if (type == "}") return cont();
-    return pass(statement, block);
-  }
-  function maybetype(type) {
-    if (type == ":") return cont(typedef);
-    return pass();
-  }
-  function typedef(type) {
-    if (type == "variable"){cx.marked = "variable-3"; return cont();}
-    return pass();
-  }
-  function vardef1(type, value) {
-    if (type == "variable") {
-      register(value);
-      return isTS ? cont(maybetype, vardef2) : cont(vardef2);
-    }
-    return pass();
-  }
-  function vardef2(type, value) {
-    if (value == "=") return cont(expression, vardef2);
-    if (type == ",") return cont(vardef1);
-  }
-  function forspec1(type) {
-    if (type == "var") return cont(vardef1, expect(";"), forspec2);
-    if (type == ";") return cont(forspec2);
-    if (type == "variable") return cont(formaybein);
-    return cont(forspec2);
-  }
-  function formaybein(type, value) {
-    if (value == "in") return cont(expression);
-    return cont(maybeoperator, forspec2);
-  }
-  function forspec2(type, value) {
-    if (type == ";") return cont(forspec3);
-    if (value == "in") return cont(expression);
-    return cont(expression, expect(";"), forspec3);
-  }
-  function forspec3(type) {
-    if (type != ")") cont(expression);
-  }
-  function functiondef(type, value) {
-    if (type == "variable") {register(value); return cont(functiondef);}
-    if (type == "(") return cont(pushlex(")"), pushcontext, commasep(funarg, ")"), poplex, statement, popcontext);
-  }
-  function funarg(type, value) {
-    if (type == "variable") {register(value); return isTS ? cont(maybetype) : cont();}
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      return {
-        tokenize: jsTokenBase,
-        lastType: null,
-        cc: [],
-        lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
-        localVars: parserConfig.localVars,
-        context: parserConfig.localVars && {vars: parserConfig.localVars},
-        indented: 0
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (!state.lexical.hasOwnProperty("align"))
-          state.lexical.align = false;
-        state.indented = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      if (type == "comment") return style;
-      state.lastType = type;
-      return parseJS(state, style, type, content, stream);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize == jsTokenComment) return CodeMirror.Pass;
-      if (state.tokenize != jsTokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
-      if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
-      var type = lexical.type, closing = firstChar == type;
-      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? 4 : 0);
-      else if (type == "form" && firstChar == "{") return lexical.indented;
-      else if (type == "form") return lexical.indented + indentUnit;
-      else if (type == "stat")
-        return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? indentUnit : 0);
-      else if (lexical.info == "switch" && !closing)
-        return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
-      else if (lexical.align) return lexical.column + (closing ? 0 : 1);
-      else return lexical.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricChars: ":{}"
-  };
-});
-
-CodeMirror.defineMIME("text/javascript", "javascript");
-CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
-CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
-CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
Index: lugins/themeEditor/codemirror/php.js
===================================================================
--- plugins/themeEditor/codemirror/php.js	(revision 948)
+++ 	(revision )
@@ -1,148 +1,0 @@
-(function() {
-  function keywords(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  function heredoc(delim) {
-    return function(stream, state) {
-      if (stream.match(delim)) state.tokenize = null;
-      else stream.skipToEnd();
-      return "string";
-    };
-  }
-  var phpConfig = {
-    name: "clike",
-    keywords: keywords("abstract and array as break case catch class clone const continue declare default " +
-                       "do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final " +
-                       "for foreach function global goto if implements interface instanceof namespace " +
-                       "new or private protected public static switch throw trait try use var while xor " +
-                       "die echo empty exit eval include include_once isset list require require_once return " +
-                       "print unset __halt_compiler self static parent"),
-    blockKeywords: keywords("catch do else elseif for foreach if switch try while"),
-    atoms: keywords("true false null TRUE FALSE NULL"),
-    multiLineStrings: true,
-    hooks: {
-      "$": function(stream, state) {
-        stream.eatWhile(/[\w\$_]/);
-        return "variable-2";
-      },
-      "<": function(stream, state) {
-        if (stream.match(/<</)) {
-          stream.eatWhile(/[\w\.]/);
-          state.tokenize = heredoc(stream.current().slice(3));
-          return state.tokenize(stream, state);
-        }
-        return false;
-      },
-      "#": function(stream, state) {
-        while (!stream.eol() && !stream.match("?>", false)) stream.next();
-        return "comment";
-      },
-      "/": function(stream, state) {
-        if (stream.eat("/")) {
-          while (!stream.eol() && !stream.match("?>", false)) stream.next();
-          return "comment";
-        }
-        return false;
-      }
-    }
-  };
-
-  CodeMirror.defineMode("php", function(config, parserConfig) {
-    var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true});
-    var jsMode = CodeMirror.getMode(config, "javascript");
-    var cssMode = CodeMirror.getMode(config, "css");
-    var phpMode = CodeMirror.getMode(config, phpConfig);
-
-    function dispatch(stream, state) { // TODO open PHP inside text/css
-      var isPHP = state.curMode == phpMode;
-      if (stream.sol() && state.pending != '"') state.pending = null;
-      if (state.curMode == htmlMode) {
-        if (stream.match(/^<\?\w*/)) {
-          state.curMode = phpMode;
-          state.curState = state.php;
-          state.curClose = "?>";
-          return "meta";
-        }
-        if (state.pending == '"') {
-          while (!stream.eol() && stream.next() != '"') {}
-          var style = "string";
-        } else if (state.pending && stream.pos < state.pending.end) {
-          stream.pos = state.pending.end;
-          var style = state.pending.style;
-        } else {
-          var style = htmlMode.token(stream, state.curState);
-        }
-        state.pending = null;
-        var cur = stream.current(), openPHP = cur.search(/<\?/);
-        if (openPHP != -1) {
-          if (style == "string" && /\"$/.test(cur) && !/\?>/.test(cur)) state.pending = '"';
-          else state.pending = {end: stream.pos, style: style};
-          stream.backUp(cur.length - openPHP);
-        } else if (style == "tag" && stream.current() == ">" && state.curState.context) {
-          if (/^script$/i.test(state.curState.context.tagName)) {
-            state.curMode = jsMode;
-            state.curState = jsMode.startState(htmlMode.indent(state.curState, ""));
-            state.curClose = /^<\/\s*script\s*>/i;
-          }
-          else if (/^style$/i.test(state.curState.context.tagName)) {
-            state.curMode = cssMode;
-            state.curState = cssMode.startState(htmlMode.indent(state.curState, ""));
-            state.curClose = /^<\/\s*style\s*>/i;
-          }
-        }
-        return style;
-      } else if ((!isPHP || state.php.tokenize == null) &&
-                 stream.match(state.curClose, isPHP)) {
-        state.curMode = htmlMode;
-        state.curState = state.html;
-        state.curClose = null;
-        if (isPHP) return "meta";
-        else return dispatch(stream, state);
-      } else {
-        return state.curMode.token(stream, state.curState);
-      }
-    }
-
-    return {
-      startState: function() {
-        var html = htmlMode.startState();
-        return {html: html,
-                php: phpMode.startState(),
-                curMode: parserConfig.startOpen ? phpMode : htmlMode,
-                curState: parserConfig.startOpen ? phpMode.startState() : html,
-                curClose: parserConfig.startOpen ? /^\?>/ : null,
-		mode: parserConfig.startOpen ? "php" : "html",
-                pending: null};
-      },
-
-      copyState: function(state) {
-        var html = state.html, htmlNew = CodeMirror.copyState(htmlMode, html),
-            php = state.php, phpNew = CodeMirror.copyState(phpMode, php), cur;
-        if (state.curState == html) cur = htmlNew;
-        else if (state.curState == php) cur = phpNew;
-        else cur = CodeMirror.copyState(state.curMode, state.curState);
-        return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur,
-                curClose: state.curClose, mode: state.mode,
-                pending: state.pending};
-      },
-
-      token: dispatch,
-
-      indent: function(state, textAfter) {
-        if ((state.curMode != phpMode && /^\s*<\//.test(textAfter)) ||
-            (state.curMode == phpMode && /^\?>/.test(textAfter)))
-          return htmlMode.indent(state.html, textAfter);
-        return state.curMode.indent(state.curState, textAfter);
-      },
-
-      electricChars: "/{}:",
-
-      innerMode: function(state) { return {state: state.curState, mode: state.curMode}; }
-    };
-  }, "xml", "clike", "javascript", "css");
-  CodeMirror.defineMIME("application/x-httpd-php", "php");
-  CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true});
-  CodeMirror.defineMIME("text/x-php", phpConfig);
-})();
Index: lugins/themeEditor/codemirror/xml.js
===================================================================
--- plugins/themeEditor/codemirror/xml.js	(revision 948)
+++ 	(revision )
@@ -1,318 +1,0 @@
-CodeMirror.defineMode("xml", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var Kludges = parserConfig.htmlMode ? {
-    autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
-                      'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
-                      'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
-                      'track': true, 'wbr': true},
-    implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
-                       'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
-                       'th': true, 'tr': true},
-    contextGrabbers: {
-      'dd': {'dd': true, 'dt': true},
-      'dt': {'dd': true, 'dt': true},
-      'li': {'li': true},
-      'option': {'option': true, 'optgroup': true},
-      'optgroup': {'optgroup': true},
-      'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
-            'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
-            'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
-            'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
-            'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
-      'rp': {'rp': true, 'rt': true},
-      'rt': {'rp': true, 'rt': true},
-      'tbody': {'tbody': true, 'tfoot': true},
-      'td': {'td': true, 'th': true},
-      'tfoot': {'tbody': true},
-      'th': {'td': true, 'th': true},
-      'thead': {'tbody': true, 'tfoot': true},
-      'tr': {'tr': true}
-    },
-    doNotIndent: {"pre": true},
-    allowUnquoted: true,
-    allowMissing: true
-  } : {
-    autoSelfClosers: {},
-    implicitlyClosed: {},
-    contextGrabbers: {},
-    doNotIndent: {},
-    allowUnquoted: false,
-    allowMissing: false
-  };
-  var alignCDATA = parserConfig.alignCDATA;
-
-  // Return variables for tokenizers
-  var tagName, type;
-
-  function inText(stream, state) {
-    function chain(parser) {
-      state.tokenize = parser;
-      return parser(stream, state);
-    }
-
-    var ch = stream.next();
-    if (ch == "<") {
-      if (stream.eat("!")) {
-        if (stream.eat("[")) {
-          if (stream.match("CDATA[")) return chain(inBlock("atom", "]]>"));
-          else return null;
-        }
-        else if (stream.match("--")) return chain(inBlock("comment", "-->"));
-        else if (stream.match("DOCTYPE", true, true)) {
-          stream.eatWhile(/[\w\._\-]/);
-          return chain(doctype(1));
-        }
-        else return null;
-      }
-      else if (stream.eat("?")) {
-        stream.eatWhile(/[\w\._\-]/);
-        state.tokenize = inBlock("meta", "?>");
-        return "meta";
-      }
-      else {
-        type = stream.eat("/") ? "closeTag" : "openTag";
-        stream.eatSpace();
-        tagName = "";
-        var c;
-        while ((c = stream.eat(/[^\s\u00a0=<>\"\'\/?]/))) tagName += c;
-        state.tokenize = inTag;
-        return "tag";
-      }
-    }
-    else if (ch == "&") {
-      var ok;
-      if (stream.eat("#")) {
-        if (stream.eat("x")) {
-          ok = stream.eatWhile(/[a-fA-F\d]/) && stream.eat(";");          
-        } else {
-          ok = stream.eatWhile(/[\d]/) && stream.eat(";");
-        }
-      } else {
-        ok = stream.eatWhile(/[\w\.\-:]/) && stream.eat(";");
-      }
-      return ok ? "atom" : "error";
-    }
-    else {
-      stream.eatWhile(/[^&<]/);
-      return null;
-    }
-  }
-
-  function inTag(stream, state) {
-    var ch = stream.next();
-    if (ch == ">" || (ch == "/" && stream.eat(">"))) {
-      state.tokenize = inText;
-      type = ch == ">" ? "endTag" : "selfcloseTag";
-      return "tag";
-    }
-    else if (ch == "=") {
-      type = "equals";
-      return null;
-    }
-    else if (/[\'\"]/.test(ch)) {
-      state.tokenize = inAttribute(ch);
-      return state.tokenize(stream, state);
-    }
-    else {
-      stream.eatWhile(/[^\s\u00a0=<>\"\'\/?]/);
-      return "word";
-    }
-  }
-
-  function inAttribute(quote) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.next() == quote) {
-          state.tokenize = inTag;
-          break;
-        }
-      }
-      return "string";
-    };
-  }
-
-  function inBlock(style, terminator) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.match(terminator)) {
-          state.tokenize = inText;
-          break;
-        }
-        stream.next();
-      }
-      return style;
-    };
-  }
-  function doctype(depth) {
-    return function(stream, state) {
-      var ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == "<") {
-          state.tokenize = doctype(depth + 1);
-          return state.tokenize(stream, state);
-        } else if (ch == ">") {
-          if (depth == 1) {
-            state.tokenize = inText;
-            break;
-          } else {
-            state.tokenize = doctype(depth - 1);
-            return state.tokenize(stream, state);
-          }
-        }
-      }
-      return "meta";
-    };
-  }
-
-  var curState, setStyle;
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) curState.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-
-  function pushContext(tagName, startOfLine) {
-    var noIndent = Kludges.doNotIndent.hasOwnProperty(tagName) || (curState.context && curState.context.noIndent);
-    curState.context = {
-      prev: curState.context,
-      tagName: tagName,
-      indent: curState.indented,
-      startOfLine: startOfLine,
-      noIndent: noIndent
-    };
-  }
-  function popContext() {
-    if (curState.context) curState.context = curState.context.prev;
-  }
-
-  function element(type) {
-    if (type == "openTag") {
-      curState.tagName = tagName;
-      return cont(attributes, endtag(curState.startOfLine));
-    } else if (type == "closeTag") {
-      var err = false;
-      if (curState.context) {
-        if (curState.context.tagName != tagName) {
-          if (Kludges.implicitlyClosed.hasOwnProperty(curState.context.tagName.toLowerCase())) {
-            popContext();
-          }
-          err = !curState.context || curState.context.tagName != tagName;
-        }
-      } else {
-        err = true;
-      }
-      if (err) setStyle = "error";
-      return cont(endclosetag(err));
-    }
-    return cont();
-  }
-  function endtag(startOfLine) {
-    return function(type) {
-      if (type == "selfcloseTag" ||
-          (type == "endTag" && Kludges.autoSelfClosers.hasOwnProperty(curState.tagName.toLowerCase()))) {
-        maybePopContext(curState.tagName.toLowerCase());
-        return cont();
-      }
-      if (type == "endTag") {
-        maybePopContext(curState.tagName.toLowerCase());
-        pushContext(curState.tagName, startOfLine);
-        return cont();
-      }
-      return cont();
-    };
-  }
-  function endclosetag(err) {
-    return function(type) {
-      if (err) setStyle = "error";
-      if (type == "endTag") { popContext(); return cont(); }
-      setStyle = "error";
-      return cont(arguments.callee);
-    };
-  }
-  function maybePopContext(nextTagName) {
-    var parentTagName;
-    while (true) {
-      if (!curState.context) {
-        return;
-      }
-      parentTagName = curState.context.tagName.toLowerCase();
-      if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) ||
-          !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
-        return;
-      }
-      popContext();
-    }
-  }
-
-  function attributes(type) {
-    if (type == "word") {setStyle = "attribute"; return cont(attribute, attributes);}
-    if (type == "endTag" || type == "selfcloseTag") return pass();
-    setStyle = "error";
-    return cont(attributes);
-  }
-  function attribute(type) {
-    if (type == "equals") return cont(attvalue, attributes);
-    if (!Kludges.allowMissing) setStyle = "error";
-    return (type == "endTag" || type == "selfcloseTag") ? pass() : cont();
-  }
-  function attvalue(type) {
-    if (type == "string") return cont(attvaluemaybe);
-    if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return cont();}
-    setStyle = "error";
-    return (type == "endTag" || type == "selfCloseTag") ? pass() : cont();
-  }
-  function attvaluemaybe(type) {
-    if (type == "string") return cont(attvaluemaybe);
-    else return pass();
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: inText, cc: [], indented: 0, startOfLine: true, tagName: null, context: null};
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        state.startOfLine = true;
-        state.indented = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-
-      setStyle = type = tagName = null;
-      var style = state.tokenize(stream, state);
-      state.type = type;
-      if ((style || type) && style != "comment") {
-        curState = state;
-        while (true) {
-          var comb = state.cc.pop() || element;
-          if (comb(type || style)) break;
-        }
-      }
-      state.startOfLine = false;
-      return setStyle || style;
-    },
-
-    indent: function(state, textAfter, fullLine) {
-      var context = state.context;
-      if ((state.tokenize != inTag && state.tokenize != inText) ||
-          context && context.noIndent)
-        return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
-      if (alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
-      if (context && /^<\//.test(textAfter))
-        context = context.prev;
-      while (context && !context.startOfLine)
-        context = context.prev;
-      if (context) return context.indent + indentUnit;
-      else return 0;
-    },
-
-    electricChars: "/"
-  };
-});
-
-CodeMirror.defineMIME("text/xml", "xml");
-CodeMirror.defineMIME("application/xml", "xml");
-if (!CodeMirror.mimeModes.hasOwnProperty("text/html"))
-  CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true});
Index: plugins/themeEditor/index.php
===================================================================
--- plugins/themeEditor/index.php	(revision 948)
+++ plugins/themeEditor/index.php	(revision 500)
@@ -15,8 +15,4 @@
 
 $file_default = $file = array('c'=>null, 'w'=>false, 'type'=>null, 'f'=>null, 'default_file'=>false);
-
-# Get interface setting
-$core->auth->user_prefs->addWorkspace('interface');
-$user_ui_colorsyntax = $core->auth->user_prefs->interface->colorsyntax;
 
 # Loading themes
@@ -66,18 +62,7 @@
   <?php echo dcPage::jsVar('dotclear.msg.document_saved',__("Document saved")); ?>
   <?php echo dcPage::jsVar('dotclear.msg.error_occurred',__("An error occurred:")); ?>
-  <?php echo dcPage::jsVar('dotclear.colorsyntax',$user_ui_colorsyntax); ?>
   //]]>
   </script>
   <script type="text/javascript" src="index.php?pf=themeEditor/script.js"></script>
-<?php if ($user_ui_colorsyntax) { ?>
-  <link rel="stylesheet" type="text/css" href="index.php?pf=themeEditor/codemirror/codemirror.css" />
-  <link rel="stylesheet" type="text/css" href="index.php?pf=themeEditor/codemirror.css" />
-  <script type="text/JavaScript" src="index.php?pf=themeEditor/codemirror/codemirror.js"></script>
-  <script type="text/JavaScript" src="index.php?pf=themeEditor/codemirror/xml.js"></script>
-  <script type="text/JavaScript" src="index.php?pf=themeEditor/codemirror/javascript.js"></script>
-  <script type="text/JavaScript" src="index.php?pf=themeEditor/codemirror/css.js"></script>
-  <script type="text/JavaScript" src="index.php?pf=themeEditor/codemirror/php.js"></script>
-  <script type="text/JavaScript" src="index.php?pf=themeEditor/codemirror/htmlmixed.js"></script>
-<?php } ?>
 </head>
 
@@ -123,18 +108,4 @@
 	echo
 	'</fieldset></form>';
-
-	if ($user_ui_colorsyntax) {
-		$editorMode = (!empty($_REQUEST['css']) ? "css" : (!empty($_REQUEST['js']) ? "javascript" : "text/html"));
-		echo 
-		'<script>
-	    	var editor = CodeMirror.fromTextArea(document.getElementById("file_content"), {
-	    		mode: "'.$editorMode.'",
-	       		tabMode: "indent",
-	       		lineWrapping: "true",
-	       		lineNumbers: "true",
-	   			matchBrackets: "true"
-	   		});
-	    </script>';
-	}
 }
 ?>
Index: plugins/themeEditor/script.js
===================================================================
--- plugins/themeEditor/script.js	(revision 948)
+++ plugins/themeEditor/script.js	(revision 0)
@@ -5,5 +5,5 @@
 		
 		var data = {
-			file_content: (!dotclear.colorsyntax ? $(f).find('#file_content').get(0).value : editor.getValue()),
+			file_content: $(f).find('#file_content').get(0).value,
 			xd_check: $(f).find('input[name="xd_check"]').get(0).value,
 			write: 1
Index: plugins/userPref/_define.php
===================================================================
--- plugins/userPref/_define.php	(revision 967)
+++ plugins/userPref/_define.php	(revision 589)
@@ -16,5 +16,5 @@
 	/* Description*/		"Manage every user preference directive",
 	/* Author */			"Franck Paul",
-	/* Version */			'0.3'
+	/* Version */			'0.2'
 );
 ?>
Index: plugins/userPref/index.php
===================================================================
--- plugins/userPref/index.php	(revision 907)
+++ plugins/userPref/index.php	(revision 782)
@@ -117,9 +117,9 @@
 <?php
 if (!empty($_GET['upd'])) {
-	dcPage::message(__('Preferences successfully updated'));
+	echo '<p class="message">'.__('Preferences successfully updated').'</p>';
 }
 
 if (!empty($_GET['upda'])) {
-	dcPage::message(__('Preferences definition successfully updated'));
+	echo '<p class="message">'.__('Preferences definition successfully updated').'</p>';
 }
 ?>
@@ -128,5 +128,5 @@
 <div id="local" class="multi-part" title="<?php echo __('user preferences'); ?>">
 
-<?php 
+<?php
 $table_header = '<table class="prefs" id="%s"><caption>%s</caption>'.
 '<thead>'.
@@ -142,4 +142,5 @@
 
 $prefs = array();
+
 foreach ($core->auth->user_prefs->dumpWorkspaces() as $ws => $workspace) {
 	foreach ($workspace->dumpPrefs() as $k => $v) {
Index: plugins/widgets/_default_widgets.php
===================================================================
--- plugins/widgets/_default_widgets.php	(revision 954)
+++ plugins/widgets/_default_widgets.php	(revision 665)
@@ -18,59 +18,40 @@
 $__widgets = new dcWidgets;
 
-$__widgets->create('search',__('Search engine'),array('defaultWidgets','search'),null,'Search engine form');
+$__widgets->create('search',__('Search engine'),array('defaultWidgets','search'));
 $__widgets->search->setting('title',__('Title:'),__('Search'));
-$__widgets->search->setting('homeonly',__('Display on:'),0,'combo',
-	array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->search->setting('class',__('CSS class:'),'');
 
-$__widgets->create('navigation',__('Navigation links'),array('defaultWidgets','navigation'),null,'List of navigation links');
+$__widgets->create('navigation',__('Navigation links'),array('defaultWidgets','navigation'));
 $__widgets->navigation->setting('title',__('Title:'),'');
-$__widgets->navigation->setting('homeonly',__('Display on:'),0,'combo',
-	array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->navigation->setting('class',__('CSS class:'),'');
 
-$__widgets->create('bestof',__('Selected entries'),array('defaultWidgets','bestof'),null,'List of selected entries');
+$__widgets->create('bestof',__('Selected entries'),array('defaultWidgets','bestof'));
 $__widgets->bestof->setting('title',__('Title:'),__('Best of me'));
 $__widgets->bestof->setting('orderby',__('Sort:'),'asc','combo',array(__('Ascending') => 'asc', __('Descending') => 'desc'));
-$__widgets->bestof->setting('homeonly',__('Display on:'),1,'combo',
-	array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->bestof->setting('class',__('CSS class:'),'');
+$__widgets->bestof->setting('homeonly',__('Home page only'),1,'check');
 
-$__widgets->create('langs',__('Blog languages'),array('defaultWidgets','langs'),null,'List of available languages');
+$__widgets->create('langs',__('Blog languages'),array('defaultWidgets','langs'));
 $__widgets->langs->setting('title',__('Title:'),__('Languages'));
-$__widgets->langs->setting('homeonly',__('Display on:'),1,'combo',
-	array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->langs->setting('class',__('CSS class:'),'');
+$__widgets->langs->setting('homeonly',__('Home page only'),1,'check');
 
-$__widgets->create('categories',__('Categories list'),array('defaultWidgets','categories'),null,'List of categories');
+$__widgets->create('categories',__('Categories list'),array('defaultWidgets','categories'));
 $__widgets->categories->setting('title',__('Title:'),__('Categories'));
 $__widgets->categories->setting('postcount',__('With entries counts'),0,'check');
-$__widgets->categories->setting('homeonly',__('Display on:'),0,'combo',
-	array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->categories->setting('class',__('CSS class:'),'');
 
-$__widgets->create('subscribe',__('Subscribe links'),array('defaultWidgets','subscribe'),null,'RSS or Atom feed subscription links');
+$__widgets->create('subscribe',__('Subscribe links'),array('defaultWidgets','subscribe'));
 $__widgets->subscribe->setting('title',__('Title:'),__('Subscribe'));
 $__widgets->subscribe->setting('type',__('Feeds type:'),'atom','combo',array('Atom' => 'atom', 'RSS' => 'rss2'));
-$__widgets->subscribe->setting('homeonly',__('Display on:'),1,'combo',
-	array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->subscribe->setting('class',__('CSS class:'),'');
+$__widgets->subscribe->setting('homeonly',__('Home page only'),0,'check');
 
-$__widgets->create('feed',__('Feed reader'),array('defaultWidgets','feed'),null,'Last entries from feed');
+$__widgets->create('feed',__('Feed reader'),array('defaultWidgets','feed'));
 $__widgets->feed->setting('title',__('Title:'),__('Somewhere else'));
 $__widgets->feed->setting('url',__('Feed URL:'),'');
 $__widgets->feed->setting('limit',__('Entries limit:'),10);
-$__widgets->feed->setting('homeonly',__('Display on:'),1,'combo',
-	array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->feed->setting('class',__('CSS class:'),'');
+$__widgets->feed->setting('homeonly',__('Home page only'),1,'check');
 
-$__widgets->create('text',__('Text'),array('defaultWidgets','text'),null,'Simple text');
+$__widgets->create('text',__('Text'),array('defaultWidgets','text'));
 $__widgets->text->setting('title',__('Title:'),'');
 $__widgets->text->setting('text',__('Text:'),'','textarea');
-$__widgets->text->setting('homeonly',__('Display on:'),0,'combo',
-	array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->text->setting('class',__('CSS class:'),'');
+$__widgets->text->setting('homeonly',__('Home page only'),0,'check');
 
-$__widgets->create('lastposts',__('Last entries'),array('defaultWidgets','lastposts'),null,'List of last entries published');
+$__widgets->create('lastposts',__('Last entries'),array('defaultWidgets','lastposts'));
 $__widgets->lastposts->setting('title',__('Title:'),__('Last entries'));
 $rs = $core->blog->getCategories(array('post_type'=>'post'));
@@ -85,14 +66,11 @@
 }
 $__widgets->lastposts->setting('limit',__('Entries limit:'),10);
-$__widgets->lastposts->setting('homeonly',__('Display on:'),1,'combo',
-	array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->lastposts->setting('class',__('CSS class:'),'');
+$__widgets->lastposts->setting('homeonly',__('Home page only'),1,'check');
 
-$__widgets->create('lastcomments',__('Last comments'),array('defaultWidgets','lastcomments'),null,'List of last comments posted');
+
+$__widgets->create('lastcomments',__('Last comments'),array('defaultWidgets','lastcomments'));
 $__widgets->lastcomments->setting('title',__('Title:'),__('Last comments'));
 $__widgets->lastcomments->setting('limit',__('Comments limit:'),10);
-$__widgets->lastcomments->setting('homeonly',__('Display on:'),1,'combo',
-	array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->lastcomments->setting('class',__('CSS class:'),'');
+$__widgets->lastcomments->setting('homeonly',__('Home page only'),1,'check');
 
 # --BEHAVIOR-- initWidgets
Index: plugins/widgets/_define.php
===================================================================
--- plugins/widgets/_define.php	(revision 965)
+++ plugins/widgets/_define.php	(revision 665)
@@ -16,5 +16,5 @@
 	/* Description*/		"Widgets for your blog sidebars",
 	/* Author */			"Olivier Meunier & Dotclear Team",
-	/* Version */			'3.1',
+	/* Version */			'3',
 	array(
 		'permissions' =>	'admin',
Index: plugins/widgets/_public.php
===================================================================
--- plugins/widgets/_public.php	(revision 936)
+++ plugins/widgets/_public.php	(revision 671)
@@ -22,20 +22,13 @@
 	public static function tplWidgets($attr)
 	{
-		$type = isset($attr['type']) ? $attr['type'] : '';
-
+		$type = isset($attr['type']) ? $attr['type'] : 'nav';
+		
 		# widgets to disable
 		$disable = isset($attr['disable']) ? trim($attr['disable']) : '';
 		
-		if ($type == '') {
-			$res = "publicWidgets::widgetsHandler('nav','".addslashes($disable)."');"."\n".
-				"   publicWidgets::widgetsHandler('extra','".addslashes($disable)."');"."\n".
-				"   publicWidgets::widgetsHandler('custom','".addslashes($disable)."');"."\n";
-		} else {
-			if (!in_array($type, array('nav','extra','custom'))) {
-				$type = 'nav';
-			}
-			$res = "publicWidgets::widgetsHandler('".addslashes($type)."','".addslashes($disable)."');";
-		}
-		return '<?php '.$res.' ?>';
+		return
+		'<?php '.
+		"publicWidgets::widgetsHandler('".addslashes($type)."','".addslashes($disable)."'); ".
+		' ?>';
 	}
 	
Index: plugins/widgets/_widgets_functions.php
===================================================================
--- plugins/widgets/_widgets_functions.php	(revision 945)
+++ plugins/widgets/_widgets_functions.php	(revision 776)
@@ -18,13 +18,8 @@
 		global $core;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
-			return;
-		}
-
 		$value = isset($GLOBALS['_search']) ? html::escapeHTML($GLOBALS['_search']) : '';
 		
 		return
-		'<div id="search"'.($w->class ? ' class="'.html::escapeHTML($w->class).'"' : '').'>'.
+		'<div id="search">'.
 		($w->title ? '<h2><label for="q">'.html::escapeHTML($w->title).'</label></h2>' : '').
 		'<form action="'.$core->blog->url.'" method="get">'.
@@ -41,11 +36,6 @@
 		global $core;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
-			return;
-		}
-
-		$res =
-		'<div id="topnav"'.($w->class ? ' class="'.html::escapeHTML($w->class).'"' : '').'>'.
+		$res =
+		'<div id="topnav">'.
 		($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
 		'<ul>';
@@ -72,9 +62,4 @@
 		global $core, $_ctx;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
-			return;
-		}
-
 		$rs = $core->blog->getCategories(array('post_type'=>'post'));
 		if ($rs->isEmpty()) {
@@ -83,5 +68,5 @@
 		
 		$res =
-		'<div class="categories'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">'.
+		'<div class="categories">'.
 		($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '');
 		
@@ -126,6 +111,5 @@
 		global $core;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
+		if ($w->homeonly && $core->url->type != 'default') {
 			return;
 		}
@@ -144,5 +128,5 @@
 		
 		$res =
-		'<div class="selected'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">'.
+		'<div class="selected">'.
 		($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
 		'<ul>';
@@ -161,6 +145,5 @@
 		global $core, $_ctx;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default' && $core->url->type != 'lang') ||
-			($w->homeonly == 2 && ($core->url->type == 'default' || $core->url->type == 'lang'))) {
+		if ($w->homeonly && $core->url->type != 'default' && $core->url->type != 'lang') {
 			return;
 		}
@@ -174,5 +157,5 @@
 		$langs = l10n::getISOcodes();
 		$res =
-		'<div class="langs'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">'.
+		'<div class="langs">'.
 		($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
 		'<ul>';
@@ -202,6 +185,5 @@
 		global $core;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
+		if ($w->homeonly && $core->url->type != 'default') {
 			return;
 		}
@@ -214,5 +196,5 @@
 		
 		$res =
-		'<div class="syndicate'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">'.
+		'<div class="syndicate">'.
 		($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
 		'<ul>';
@@ -246,6 +228,5 @@
 		global $core;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
+		if ($w->homeonly && $core->url->type != 'default') {
 			return;
 		}
@@ -263,5 +244,5 @@
 		
 		$res =
-		'<div class="feed'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">'.
+		'<div class="feed">'.
 		($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
 		'<ul>';
@@ -269,16 +250,5 @@
 		$i = 0;
 		foreach ($feed->items as $item) {
-			$title = isset($item->title) && strlen(trim($item->title)) ? $item->title : '';
-			$link = isset($item->link) && strlen(trim($item->link)) ? $item->link : '';
-			
-			if (!$link && !$title) {
-				continue;
-			}
-			
-			if (!$title) {
-				$title = substr($link,0,25).'...';
-			}
-			
-			$li = $link ? '<a href="'.html::escapeHTML($item->link).'">'.$title.'</a>' : $title;
+			$li = isset($item->link) ? '<a href="'.html::escapeHTML($item->link).'">'.$item->title.'</a>' : $item->title;
 			$res .= ' <li>'.$li.'</li> ';
 			$i++;
@@ -297,11 +267,10 @@
 		global $core;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
-			return;
-		}
-		
-		$res =
-		'<div class="text'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">'.
+		if ($w->homeonly && $core->url->type != 'default') {
+			return;
+		}
+		
+		$res =
+		'<div class="text">'.
 		($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
 		$w->text.
@@ -315,6 +284,5 @@
 		global $core;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
+		if ($w->homeonly && $core->url->type != 'default') {
 			return;
 		}
@@ -350,5 +318,5 @@
 		
 		$res =
-		'<div class="lastposts'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">'.
+		'<div class="lastposts">'.
 		($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
 		'<ul>';
@@ -368,6 +336,5 @@
 		global $core;
 		
-		if (($w->homeonly == 1 && $core->url->type != 'default') ||
-			($w->homeonly == 2 && $core->url->type == 'default')) {
+		if ($w->homeonly && $core->url->type != 'default') {
 			return;
 		}
@@ -381,5 +348,5 @@
 		}
 		
-		$res = '<div class="lastcomments'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">'.
+		$res = '<div class="lastcomments">'.
 		($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
 		'<ul>';
Index: plugins/widgets/class.widgets.php
===================================================================
--- plugins/widgets/class.widgets.php	(revision 954)
+++ plugins/widgets/class.widgets.php	(revision 270)
@@ -36,7 +36,7 @@
 	}
 	
-	public function create($id,$name,$callback,$append_callback=null,$desc='')
-	{
-		$this->__widgets[$id] = new dcWidget($id,$name,$callback,$desc);
+	public function create($id,$name,$callback,$append_callback=null)
+	{
+		$this->__widgets[$id] = new dcWidget($id,$name,$callback);
 		$this->__widgets[$id]->append_callback = $append_callback;
 	}
@@ -135,5 +135,4 @@
 	private $id;
 	private $name;
-	private $desc;
 	private $public_callback = null;
 	public $append_callback = null;
@@ -149,10 +148,9 @@
 	}
 	
-	public function __construct($id,$name,$callback,$desc='')
+	public function __construct($id,$name,$callback)
 	{
 		$this->public_callback = $callback;
 		$this->id = $id;
 		$this->name = $name;
-		$this->desc = $desc;
 	}
 	
@@ -165,9 +163,4 @@
 	{
 		return $this->name;
-	}
-
-	public function desc()
-	{
-		return $this->desc;
 	}
 	
Index: plugins/widgets/index.php
===================================================================
--- plugins/widgets/index.php	(revision 954)
+++ plugins/widgets/index.php	(revision 735)
@@ -34,12 +34,4 @@
 	__('custom') => 'custom'
 );
-
-function literalNullString($v)
-{
-	if ($v == '') {
-		return '&lt;'.__('empty string').'&gt;';
-	}
-	return $v;
-}
 
 # Adding widgets to sidebars
@@ -201,5 +193,5 @@
 	'<div>'.form::hidden(array('w[void][0][id]'),html::escapeHTML($w->id())).
 	'<p class="widget-name">'.form::field(array('w[void][0][order]'),2,3,0,'hideControl').' '.
-	$w->name().($w->desc() != '' ? ' <span class="form-note">('.__($w->desc()).')</span>' : '').'</p>'.
+	$w->name().'</p>'.
 	'<p class="js-remove"><label class="classic">'.__('Append to:').' '.
 	form::combo(array('addw['.$w->id().']'),$append_combo).'</label></p>'.
@@ -267,6 +259,5 @@
 	$widget_elements->content .=
 	'<dt><strong>'.html::escapeHTML($w->name()).'</strong> ('.
-	__('Widget ID:').' <strong>'.html::escapeHTML($w->id()).'</strong>)'.
-	($w->desc() != '' ? ' <span class="form-note">'.__($w->desc()).'</span>' : '').'</dt>'.
+	__('Widget ID:').' <strong>'.html::escapeHTML($w->id()).'</strong>)</dt>'.
 	'<dd>';
 	
@@ -283,14 +274,13 @@
 			switch ($s['type']) {
 				case 'check':
-					$s_type = __('boolean').", ".__('possible values:')." <code>0</code> ".__('or')." <code>1</code>";
+					$s_type = '0|1';
 					break;
 				case 'combo':
-					$s['options'] = array_map("literalNullString", $s['options']);
-					$s_type = __('listitem').", ".__('possible values:')." <code>".implode('</code>, <code>',$s['options'])."</code>";
+					$s_type = implode('|',$s['options']);
 					break;
 				case 'text':
 				case 'textarea':
 				default:
-					$s_type = __('string');
+					$s_type = 'text';
 					break;
 			}
@@ -331,9 +321,9 @@
 		'<div>'.form::hidden(array($iname.'[id]'),html::escapeHTML($w->id())).
 		'<p class="widget-name">'.form::field(array($iname.'[order]'),2,3,(string) $i,'js-hide','',0,'title="'.__('order').'"').' '.
-		$w->name().($w->desc() != '' ? ' <span class="form-note">('.__($w->desc()).')</span>' : '').'</p>'.
+		$w->name().'</p>'.
 		'<p class="removeWidget js-remove"><label class="classic">'.
 		form::checkbox(array($iname.'[_rem]'),'1',0).' '.__('Remove widget').
 		'</label></p>'.
-		'<div class="widgetSettings">'.$w->formSettings($iname,$j).'</div>'.
+		'<div class="widgetSettings">'.$w->formSettings($iname,&$j).'</div>'.
 		'</div>';
 		
Index: themes/customCSS/_config.php
===================================================================
--- themes/customCSS/_config.php	(revision 907)
+++ themes/customCSS/_config.php	(revision 270)
@@ -28,5 +28,8 @@
 	fclose($fp);
 	
-	dcPage::message(__('Style sheet upgraded.'),true,true);
+	echo
+	'<div class="message"><p>'.
+	__('Style sheet upgraded.').
+	'</p></div>';
 }
 
Index: themes/customCSS/_define.php
===================================================================
--- themes/customCSS/_define.php	(revision 967)
+++ themes/customCSS/_define.php	(revision 270)
@@ -16,5 +16,5 @@
 	/* Description*/		"A CSS customizable theme",
 	/* Author */			"Olivier",
-	/* Version */			'1.1'
+	/* Version */			'1.0'
 );
 ?>
Index: themes/ductile/_config.php
===================================================================
--- themes/ductile/_config.php	(revision 907)
+++ themes/ductile/_config.php	(revision 776)
@@ -13,9 +13,6 @@
 l10n::set(dirname(__FILE__).'/locales/'.$_lang.'/admin');
 
-if (preg_match('#^http(s)?://#',$core->blog->settings->system->themes_url)) {
-	$img_url = http::concatURL($core->blog->settings->system->themes_url,'/'.$core->blog->settings->system->theme.'/img/');
-} else {
-	$img_url = http::concatURL($core->blog->url,$core->blog->settings->system->themes_url.'/'.$core->blog->settings->system->theme.'/img/');
-}
+$img_url = $core->blog->settings->system->themes_url.'/'.$core->blog->settings->system->theme.'/img/';
+$img_url = http::concatURL($core->blog->url,$img_url);
 $img_path = dirname(__FILE__).'/img/';
 
@@ -224,5 +221,4 @@
 	// HTML
 	'subtitle_hidden' => null,
-	'logo_src' => null,
 	// CSS
 	'body_font' => null,
@@ -326,5 +322,4 @@
 		if ($conf_tab == 'html') {
 			$ductile_user['subtitle_hidden'] = (integer) !empty($_POST['subtitle_hidden']);
-			$ductile_user['logo_src'] = $_POST['logo_src'];
 
 			$ductile_stickers = array();
@@ -405,5 +400,8 @@
 		$core->emptyTemplatesCache();
 		
-		dcPage::message(__('Theme configuration upgraded.'),true,true);
+		echo
+		'<div class="message"><p>'.
+		__('Theme configuration upgraded.').
+		'</p></div>';
 	}
 	catch (Exception $e)
@@ -429,6 +427,4 @@
 	echo '<p>'.sprintf(__('To configure the top menu go to the <a href="%s">Simple Menu administration page</a>.'),'plugin.php?p=simpleMenu').'</p>';
 }
-echo '<p class="field"><label for"logo_src">'.__('Logo URL:').' '.
-	form::field('logo_src',40,255,$ductile_user['logo_src']).'</label>'.'</p>';
 echo '</fieldset>';
 
Index: themes/ductile/_define.php
===================================================================
--- themes/ductile/_define.php	(revision 967)
+++ themes/ductile/_define.php	(revision 716)
@@ -15,5 +15,5 @@
 	/* Description*/		"Mediaqueries compliant elegant theme",
 	/* Author */			"Dotclear Team",
-	/* Version */			'1.3',
+	/* Version */			'1.0',
 	/* Properties */		array(
 								'standalone_config' => true
Index: themes/ductile/_public.php
===================================================================
--- themes/ductile/_public.php	(revision 830)
+++ themes/ductile/_public.php	(revision 776)
@@ -22,5 +22,4 @@
 $core->tpl->addBlock('EntryIfContentIsCut',array('tplDuctileTheme','EntryIfContentIsCut'));
 $core->tpl->addValue('ductileNbEntryPerPage',array('tplDuctileTheme','ductileNbEntryPerPage'));
-$core->tpl->addValue('ductileLogoSrc',array('tplDuctileTheme','ductileLogoSrc'));
 
 class tplDuctileTheme
@@ -28,21 +27,16 @@
 	public static function ductileNbEntryPerPage($attr)
 	{
-		return '<?php tplDuctileTheme::ductileNbEntryPerPageHelper(); ?>';
-	}
-	
-	public static function ductileNbEntryPerPageHelper()
-	{
-		global $_ctx;
-		
+		global $core;
+
 		$nb = 0;
-		$s = $GLOBALS['core']->blog->settings->themes->get($GLOBALS['core']->blog->settings->system->theme.'_entries_counts');
+		$s = $core->blog->settings->themes->get($core->blog->settings->system->theme.'_entries_counts');
 		if ($s !== null) {
 			$s = @unserialize($s);
 			if (is_array($s)) {
-				if (isset($s[$GLOBALS['core']->url->type])) {
+				if (isset($s[$core->url->type])) {
 					// Nb de billets par page défini par la config du thème
-					$nb = (integer) $s[$GLOBALS['core']->url->type];
+					$nb = (integer) $s[$core->url->type];
 				} else {
-					if (($GLOBALS['core']->url->type == 'default-page') && (isset($s['default']))) {
+					if (($core->url->type == 'default-page') && (isset($s['default']))) {
 						// Les pages 2 et suivantes de la home ont le même nombre de billet que la première page
 						$nb = (integer) $s['default'];
@@ -60,5 +54,5 @@
 
 		if ($nb > 0)
-			$_ctx->nb_entry_per_page = $nb;
+			return '<?php $_ctx->nb_entry_per_page = '.$nb.' ; ?>';
 	}
 	
@@ -91,88 +85,19 @@
 	{
 		global $core;
-		
-		$tpl_path = dirname(__FILE__).'/tpl/';
-		$list_types = array('title','short','full');
-
-		// Get all _entry-*.html in tpl folder of theme
-		$list_types_templates = files::scandir($tpl_path);
-		if (is_array($list_types_templates)) {
-			foreach ($list_types_templates as $v) {
-				if (preg_match('/^_entry\-(.*)\.html$/',$v,$m)) {
-					if (isset($m[1])) {
-						if (!in_array($m[1],$list_types)) {
-							// template not already in full list
-							$list_types[] = $m[1];
-						}
-					}
-				}
-			}
-		}
-
 		$default = isset($attr['default']) ? trim($attr['default']) : 'short';
-		$ret = '<?php '."\n".
-			'switch (tplDuctileTheme::ductileEntriesListHelper(\''.$default.'\')) {'."\n";
-
-		foreach ($list_types as $v) {
-			$ret .= '	case \''.$v.'\':'."\n".
-				'?>'."\n".
-						$core->tpl->includeFile(array('src' => '_entry-'.$v.'.html'))."\n".
-				'<?php '."\n".
-				'		break;'."\n";
-		}
-
-		$ret .= '}'."\n".
-			'?>';
-		
-		return $ret;
-	}
-	
-	public static function ductileEntriesListHelper($default)
-	{
-		$s = $GLOBALS['core']->blog->settings->themes->get($GLOBALS['core']->blog->settings->system->theme.'_entries_lists');
+
+		$model = '';
+		$s = $core->blog->settings->themes->get($core->blog->settings->system->theme.'_entries_lists');
 		if ($s !== null) {
 			$s = @unserialize($s);
 			if (is_array($s)) {
-				if (isset($s[$GLOBALS['core']->url->type])) {
-					$model = $s[$GLOBALS['core']->url->type];
-					return $model;
-				}
-			}
-		}
-		return $default;
-	}
-
-	public static function ductileLogoSrc($attr)
-	{
-		return '<?php echo tplDuctileTheme::ductileLogoSrcHelper(); ?>';
-	}
-
-	public static function ductileLogoSrcHelper()
-	{
-		$s = $GLOBALS['core']->blog->settings->themes->get($GLOBALS['core']->blog->settings->system->theme.'_style');
-		if ($s === null) {
-			return;
-		}
-		$s = @unserialize($s);
-		if (!is_array($s)) {
-			return;
-		}
-		
-		$img_url = $GLOBALS['core']->blog->settings->system->themes_url.'/'.$GLOBALS['core']->blog->settings->system->theme.'/img/logo.png';
-		if (isset($s['logo_src'])) {
-			if ($s['logo_src'] !== null) {
-				if ($s['logo_src'] != '') {
-					if ((substr($s['logo_src'],0,1) == '/') || (parse_url($s['logo_src'],PHP_URL_SCHEME) != '')) {
-						// absolute URL
-						$img_url = $s['logo_src'];
-					} else {
-						// relative URL (base = img folder of ductile theme)
-						$img_url = $GLOBALS['core']->blog->settings->system->themes_url.'/'.$GLOBALS['core']->blog->settings->system->theme.'/img/'.$s['logo_src'];
-					}
-				}
-			}
-		}
-		
-		return $img_url;
+				if (isset($s[$core->url->type])) {
+					$model = $s[$core->url->type];
+				}
+			}
+		}
+
+		$local_attr = array('src' => '_entry-'.($model ? $model : $default).'.html');
+		return $core->tpl->includeFile($local_attr);
 	}
 
@@ -192,5 +117,5 @@
 				$default = true;
 			} else {
-				$s = array_filter($s,"self::cleanStickers");
+				$s = array_filter($s,"tplDuctileTheme::cleanStickers");
 				if (count($s) == 0) {
 					$default = true;
Index: themes/ductile/locales/en/help/help.html
===================================================================
--- themes/ductile/locales/en/help/help.html	(revision 810)
+++ themes/ductile/locales/en/help/help.html	(revision 683)
@@ -15,6 +15,4 @@
 
 <p>If the plugin "Simple menu" is installed and active, you can click on the designated link to configure the header's menu. (main menu?)</p>
-
-<p>Specify an URL of the logo to be used instead of default one. If the URL doesn't start with an <code>/</code> then it will be a relative URL from the <code>img</code> folder of the theme (put <code>logo.png</code>, for example, is similar to using the default logo). Clear this field to come back to the default configuration.</p>
 
   <dt>Stickers</dt>
Index: hemes/ductile/locales/es/main.po
===================================================================
--- themes/ductile/locales/es/main.po	(revision 846)
+++ 	(revision )
@@ -1,41 +1,0 @@
-﻿msgid "Additionnal style directives"
-msgstr "Instrucciones CSS adicionales"
-
-msgid "reactions"
-msgstr "reacciones"
-
-msgid "Add ping"
-msgstr "Agregar un retroenlace"
-
-msgid "Suggestions:"
-msgstr "Sugerencias:"
-
-msgid "Go to homepage"
-msgstr "Regresar al inicio"
-
-msgid "Use search form"
-msgstr "Buscar"
-
-msgid "Explore archives"
-msgstr "Explorar los archivos"
-
-msgid "toDay"
-msgstr "al"
-
-msgid "FromDay"
-msgstr "Del"
-
-msgid "From"
-msgstr "Del"
-
-msgid "By category"
-msgstr "Por categoría"
-
-msgid "By date"
-msgstr "Por fecha"
-
-msgid "By tag"
-msgstr "Por tag"
-
-msgid "URL you've tried has typos, or the page has been deleted or moved."
-msgstr "Su URL está equivocada o la página fue borrada o desplazada."
Index: themes/ductile/locales/fr/admin.po
===================================================================
--- themes/ductile/locales/fr/admin.po	(revision 810)
+++ themes/ductile/locales/fr/admin.po	(revision 683)
@@ -10,7 +10,4 @@
 msgid "Hide blog description:"
 msgstr "Cacher la description du blog :"
-
-msgid "Logo URL:"
-msgstr "URL du logo :"
 
 msgid "To configure the top menu go to the <a href=\"%s\">Simple Menu administration page</a>."
Index: themes/ductile/locales/fr/help/help.html
===================================================================
--- themes/ductile/locales/fr/help/help.html	(revision 810)
+++ themes/ductile/locales/fr/help/help.html	(revision 683)
@@ -16,5 +16,4 @@
 <p>Cochez la case qui suit « Cacher la description du blog » pour ne pas afficher la description du blog habituellement affichée sous le titre.</p>
 <p>Vous pouvez, si l'extension « Menu Simple » est installée et active, cliquer sur le lien indiqué pour paramétrer le menu affiché en entête.</p>
-<p>Vous pouvez indiquer l'URL d'un logo à utiliser à la place du logo par défaut. Si l'URL ne débute pas par un <code>/</code> il s'agira d'une URL relative au dossier <code>img</code> du thème (mettre <code>logo.png</code> revient par exemple à utiliser le logo par défaut). Videz ce champ pour revenir à la configuration par défaut.</p>
 
 <h4>Étiquettes (« stickers »)</h4>
Index: themes/ductile/locales/fr/main.po
===================================================================
--- themes/ductile/locales/fr/main.po	(revision 881)
+++ themes/ductile/locales/fr/main.po	(revision 683)
@@ -4,13 +4,4 @@
 msgid "reactions"
 msgstr "réactions"
-
-msgid "no reactions"
-msgstr "pas de réaction"
-
-msgid "one reaction"
-msgstr "une réaction"
-
-msgid "%s reactions"
-msgstr "%s réactions"
 
 msgid "Add ping"
Index: themes/ductile/style.css
===================================================================
--- themes/ductile/style.css	(revision 889)
+++ themes/ductile/style.css	(revision 702)
@@ -276,5 +276,5 @@
 	}
 .post-title {
-	margin-bottom: .66em;
+	margin-bottom: .33em;
 	color: #14709e;
 	line-height: 1.17;
@@ -284,7 +284,4 @@
 	color: #ad3f4c;
 	}
-.post-content p:first-child {
-	margin-top: 0;
-}
 .post-icon { 	/* for entry short */
 	display: block;
@@ -298,7 +295,4 @@
 	box-shadow: 2px 2px 3px #ccc;
 	}
-.short .post-title {
-	margin-bottom: 0.33em;
-}
 .short .post-content p { 	/* for entry short */
 	margin-top: 0;
Index: themes/ductile/tpl/404.html
===================================================================
--- themes/ductile/tpl/404.html	(revision 803)
+++ themes/ductile/tpl/404.html	(revision 683)
@@ -24,4 +24,5 @@
 	{{tpl:include src="_head.html"}}
 </head>
+
 <body class="dc-404">
 	<div id="page">
Index: themes/ductile/tpl/_entry-full.html
===================================================================
--- themes/ductile/tpl/_entry-full.html	(revision 803)
+++ themes/ductile/tpl/_entry-full.html	(revision 701)
@@ -1,4 +1,3 @@
 <div id="p{{tpl:EntryID}}" class="post {{tpl:EntryIfOdd}} {{tpl:EntryIfFirst}} full" lang="{{tpl:EntryLang}}" xml:lang="{{tpl:EntryLang}}">
-
 	<!-- # New day date -->
 	<tpl:DateHeader><p class="day-date">{{tpl:EntryDate}}</p></tpl:DateHeader>
Index: themes/ductile/tpl/_entry-short.html
===================================================================
--- themes/ductile/tpl/_entry-short.html	(revision 803)
+++ themes/ductile/tpl/_entry-short.html	(revision 701)
@@ -1,4 +1,3 @@
 <div id="p{{tpl:EntryID}}" class="post short {{tpl:EntryIfOdd}} {{tpl:EntryIfFirst}}" lang="{{tpl:EntryLang}}" xml:lang="{{tpl:EntryLang}}">
-
 	<!-- # New day date -->
 	<tpl:DateHeader><p class="day-date">{{tpl:EntryDate}}</p></tpl:DateHeader>
Index: themes/ductile/tpl/_entry-title.html
===================================================================
--- themes/ductile/tpl/_entry-title.html	(revision 803)
+++ themes/ductile/tpl/_entry-title.html	(revision 683)
@@ -1,4 +1,3 @@
 <div id="p{{tpl:EntryID}}" class="post {{tpl:EntryIfOdd}} {{tpl:EntryIfFirst}} title" lang="{{tpl:EntryLang}}" xml:lang="{{tpl:EntryLang}}">
-
 	<!-- # New day date -->
 	<tpl:DateHeader><p class="day-date">{{tpl:EntryDate}}</p></tpl:DateHeader>
Index: themes/ductile/tpl/_footer.html
===================================================================
--- themes/ductile/tpl/_footer.html	(revision 803)
+++ themes/ductile/tpl/_footer.html	(revision 688)
@@ -2,4 +2,5 @@
 
 {{tpl:SimpleMenu id="sn-bottom" class="supranav nobig"}}
+
 <div id="footer">
 	<div id="blogcustom">
@@ -11,3 +12,4 @@
 	<p>{{tpl:SysPoweredBy}}</p>
 </div>
+
 {{tpl:SysBehavior behavior="publicFooterContent"}}
Index: themes/ductile/tpl/_head.html
===================================================================
--- themes/ductile/tpl/_head.html	(revision 803)
+++ themes/ductile/tpl/_head.html	(revision 683)
@@ -1,5 +1,4 @@
 <!-- media queries -->
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
 <!-- compat media queries -->
 <!--[if lt IE 9]>
Index: themes/ductile/tpl/_pagination.html
===================================================================
--- themes/ductile/tpl/_pagination.html	(revision 803)
+++ themes/ductile/tpl/_pagination.html	(revision 683)
@@ -2,5 +2,6 @@
 	<p class="pagination">
 		<tpl:PaginationIf end="0">
-			<a href="{{tpl:PaginationURL offset="+1"}}" class="prev">&#171; {{tpl:lang previous entries}}</a> - 
+			<a href="{{tpl:PaginationURL offset="+1"}}" class="prev">&#171;
+			{{tpl:lang previous entries}}</a> - 
 		</tpl:PaginationIf>
 		
Index: themes/ductile/tpl/_sidebar.html
===================================================================
--- themes/ductile/tpl/_sidebar.html	(revision 803)
+++ themes/ductile/tpl/_sidebar.html	(revision 683)
@@ -3,4 +3,5 @@
 		{{tpl:Widgets type="nav"}}
 	</div> <!-- End #blognav -->
+	
 	<div id="blogextra">
 		{{tpl:Widgets type="extra"}}
Index: themes/ductile/tpl/_simple-entry.html
===================================================================
--- themes/ductile/tpl/_simple-entry.html	(revision 881)
+++ themes/ductile/tpl/_simple-entry.html	(revision 702)
@@ -69,5 +69,5 @@
 		<tpl:CommentsHeader>
 			<div id="comments">
-				<h3>{{tpl:EntryCommentCount count_all="1" none="no reactions" one="one reaction" more="%s reactions"}}</h3>
+				<h3>{{tpl:EntryCommentCount count_all="1" one="%s" more="%s"}} {{tpl:lang reactions}}</h3>
 				<ul>
 		</tpl:CommentsHeader>
Index: themes/ductile/tpl/_top.html
===================================================================
--- themes/ductile/tpl/_top.html	(revision 810)
+++ themes/ductile/tpl/_top.html	(revision 683)
@@ -2,6 +2,6 @@
 	
 	<div id="top">
-		<p id="logo" class="nosmall"><a href="{{tpl:BlogURL}}"><img src="{{tpl:ductileLogoSrc}}" alt="{{tpl:lang Home}}" /></a></p>
-		<h1><a href="{{tpl:BlogURL}}"><span>{{tpl:BlogName encode_html="1"}}</span></a></h1>
+		<p id="logo" class="nosmall"><a href="{{tpl:BlogURL}}"><img src="{{tpl:BlogThemeURL}}/img/logo.png" alt="{{tpl:lang Home}}" /></a></p>
+		<h1><span><a href="{{tpl:BlogURL}}">{{tpl:BlogName encode_html="1"}}</a></span></h1>
 		<p id="blogdesc" class="nosmall">{{tpl:BlogDescription}}</p>
 	</div>
Index: themes/ductile/tpl/archive.html
===================================================================
--- themes/ductile/tpl/archive.html	(revision 803)
+++ themes/ductile/tpl/archive.html	(revision 683)
@@ -34,4 +34,5 @@
 	{{tpl:include src="_head.html"}}
 </head>
+
 <body class="dc-archive">
 	<div id="page">
Index: themes/ductile/tpl/archive_month.html
===================================================================
--- themes/ductile/tpl/archive_month.html	(revision 803)
+++ themes/ductile/tpl/archive_month.html	(revision 683)
@@ -33,4 +33,5 @@
 	{{tpl:include src="_head.html"}}
 </head>
+
 <body class="dc-archive-month">
 	<div id="page">
Index: themes/ductile/tpl/category.html
===================================================================
--- themes/ductile/tpl/category.html	(revision 803)
+++ themes/ductile/tpl/category.html	(revision 683)
@@ -46,4 +46,5 @@
 	{{tpl:include src="_head.html"}}
 </head>
+
 <body class="dc-category">
 	<div id="page">
Index: themes/ductile/tpl/home.html
===================================================================
--- themes/ductile/tpl/home.html	(revision 803)
+++ themes/ductile/tpl/home.html	(revision 683)
@@ -50,4 +50,5 @@
 	{{tpl:include src="_head.html"}}
 </head>
+
 <body class="dc-home <tpl:SysIf current_mode="default">dc-home-first</tpl:SysIf>">
 	<div id="page">
Index: themes/ductile/tpl/page.html
===================================================================
--- themes/ductile/tpl/page.html	(revision 803)
+++ themes/ductile/tpl/page.html	(revision 683)
@@ -37,4 +37,5 @@
 	</script>
 </head>
+
 <body class="dc-page">
 	<div id="page">
Index: themes/ductile/tpl/post.html
===================================================================
--- themes/ductile/tpl/post.html	(revision 803)
+++ themes/ductile/tpl/post.html	(revision 683)
@@ -40,4 +40,5 @@
 	</script>
 </head>
+
 <body class="dc-post">
 	<div id="page">
Index: themes/ductile/tpl/search.html
===================================================================
--- themes/ductile/tpl/search.html	(revision 803)
+++ themes/ductile/tpl/search.html	(revision 683)
@@ -44,4 +44,5 @@
 	{{tpl:include src="_head.html"}}
 </head>
+
 <body class="dc-search">
 	<div id="page">
Index: themes/ductile/tpl/tag.html
===================================================================
--- themes/ductile/tpl/tag.html	(revision 803)
+++ themes/ductile/tpl/tag.html	(revision 683)
@@ -45,4 +45,5 @@
 	{{tpl:include src="_head.html"}}
 </head>
+
 <body class="dc-tag">
 	<div id="page">
Index: themes/ductile/tpl/tags.html
===================================================================
--- themes/ductile/tpl/tags.html	(revision 803)
+++ themes/ductile/tpl/tags.html	(revision 683)
@@ -27,4 +27,5 @@
 	{{tpl:include src="_head.html"}}
 </head>
+
 <body class="dc-tags">
 	<div id="page">
