Merge lp:~quam-plures-core/quam-plures/qp-core-widgets into lp:quam-plures

[Yabs]

Author : Yabs
Reviewer :

Implements blueprint : Remove core widgets from the core

Changes :
Core widgets have been moved to the plugins folder
Trans ability added to widget class
All widgets have localised translation ability
Deprecated Public and Same owner widgets, replaced with Blog List widget

[Yabs (yabs)]

Implemented stage one of changing core widgets

[lp:~quam-plures-core/quam-plures/qp-core-widgets]

7400. By Yabs on 2009-12-17

merged trunk

[Tilman Blumenbach (tblue)]

When trying to upgrade the DB, I got the following error:

> MySQL error!
> Data truncated for column 'wi_type' at row 1(Errno=1265)
> Your query:
> ALTER TABLE evo_widget CHANGE COLUMN wi_type wi_type ENUM('widget', 'plugin') NOT NULL DEFAULT 'widget'

File: blogs/install/_functions_evoupgrade.php on line 2469

There may be more errors, but since I cannot test the changes because of the DB error, I cannot say for sure whether these really exist:
 - You removed the get_name() method from the widgets. I don't know whether you changed it to work through method inheritance, though.
 - You also removed the "Block title" widget setting. If you have managed to keep it working e. g. by letting the base class handle/list this option, that's great! :-)

review: Needs Fixing

[lp:~quam-plures-core/quam-plures/qp-core-widgets]

7401. By Yabs on 2009-12-18

correcting installer for conveting core to widget

7402. By Tilman Blumenbach on 2009-12-18

Optimized WidgetCache::load_widget() by removing the static $loaded_widgets array and relying on PHP to not include widget class files twice (require_once()). Frequent calls to file_exists() should not impact IO performance since PHP uses a stat() cache.

[Tilman Blumenbach (tblue)]

Looks better now, but there are new problems:
 - Fatal error: Call to undefined method Calendar::T_() in blogs/plugins/calendar_plugin/_calendar.plugin.php on line 486
 - The blog title is not centered anymore (see Blog 1).

review: Needs Fixing

[Tilman Blumenbach (tblue)]

> Looks better now, but there are new problems:
> - Fatal error: Call to undefined method Calendar::T_() in
> blogs/plugins/calendar_plugin/_calendar.plugin.php on line 486

Oops, that's not your fault. Actually, it's mine -- I overlooked this bug on the last code review.

[Tilman Blumenbach (tblue)]

The only issue of the above that remains is:
> - The blog title is not centered anymore (see Blog 1).

[lp:~quam-plures-core/quam-plures/qp-core-widgets]

7403. By Tilman Blumenbach on 2009-12-20

Rename CSS classes (widget_core_* -> widget_widget_*).

[Tilman Blumenbach (tblue)]

Seems like everything works now.

review: Approve (merge)

[lp:~quam-plures-core/quam-plures/qp-core-widgets]

7404. By Tilman Blumenbach on 2009-12-21

merged trunk

=== modified file 'blogs/inc/_core/_class5.funcs.php'
--- blogs/inc/_core/_class5.funcs.php	2009-12-06 09:37:19 +0000
+++ blogs/inc/_core/_class5.funcs.php	2009-12-21 15:13:15 +0000
@@ -82,26 +82,6 @@
 			'filecache' => $inc_path.'files/model/_filecache.class.php',
 			'filelist' => $inc_path.'files/model/_filelist.class.php',
 			'fileroot' => $inc_path.'files/model/_fileroot.class.php',
-			'coll_xml_feeds_widget' => $inc_path.'widgets/widgets/_coll_xml_feeds.widget.php',
-			'coll_longdesc_widget' => $inc_path.'widgets/widgets/_coll_longdesc.widget.php',
-			'coll_title_widget' => $inc_path.'widgets/widgets/_coll_title.widget.php',
-			'menu_link_widget' => $inc_path.'widgets/widgets/_menu_link.widget.php',
-			'user_tools_widget' => $inc_path.'widgets/widgets/_user_tools.widget.php',
-			'coll_media_index_widget' => $inc_path.'widgets/widgets/_coll_media_index.widget.php',
-			'coll_category_list_widget' => $inc_path.'widgets/widgets/_coll_category_list.widget.php',
-			'coll_common_links_widget' => $inc_path.'widgets/widgets/_coll_common_links.widget.php',
-			'colls_list_owner_widget' => $inc_path.'widgets/widgets/_colls_list_owner.widget.php',
-			'coll_post_list_widget' => $inc_path.'widgets/widgets/_coll_post_list.widget.php',
-			'coll_comment_list_widget' => $inc_path.'widgets/widgets/_coll_comment_list.widget.php',
-			'coll_search_form_widget' => $inc_path.'widgets/widgets/_coll_search_form.widget.php',
-			'colls_list_public_widget' => $inc_path.'widgets/widgets/_colls_list_public.widget.php',
-			'coll_logo_widget' => $inc_path.'widgets/widgets/_coll_logo.widget.php',
-			'links_widget' => $inc_path.'widgets/widgets/_links.widget.php',
-			'coll_tagline_widget' => $inc_path.'widgets/widgets/_coll_tagline.widget.php',
-			'free_html_widget' => $inc_path.'widgets/widgets/_free_html.widget.php',
-			'coll_page_list_widget' => $inc_path.'widgets/widgets/_coll_page_list.widget.php',
-			'coll_tag_cloud_widget' => $inc_path.'widgets/widgets/_coll_tag_cloud.widget.php',
-			'linkblog_widget' => $inc_path.'widgets/widgets/_linkblog.widget.php',
 			'widgetcache' => $inc_path.'widgets/model/_widgetcache.class.php',
 			'componentwidget' => $inc_path.'widgets/model/_widget.class.php',
 			'session' => $inc_path.'sessions/model/_session.class.php',
@@ -149,10 +129,7 @@
 			'adminui' => $adminskins_path.'/evo/_adminUI.class.php',
 			'adminui' => $adminskins_path.'/legacy/_adminUI.class.php',
 			'adminui' => $adminskins_path.'/chicago/_adminUI.class.php',
-			'coll_item_list_widget' => $inc_path.'widgets/widgets/_coll_item_list.widget.php',
 			'menu' => $inc_path.'_core/ui/_menu.class.php',
-			'coll_related_post_list_widget' => $inc_path.'widgets/widgets/_coll_related_post_list.widget.php',
-			'coll_link_list_widget' => $inc_path.'widgets/widgets/_coll_link_list.widget.php',
 			'rfc822_addresses_class' => $inc_path.'_ext/mime_parser/rfc822_addresses.php',
 			'mime_parser_class' => $inc_path.'_ext/mime_parser/mime_parser.php',
 			/* AUTOGENERATED LIST END */
 
=== modified file 'blogs/inc/_core/model/__core.install.php'
--- blogs/inc/_core/model/__core.install.php	2009-12-06 09:37:19 +0000
+++ blogs/inc/_core/model/__core.install.php	2009-12-21 15:13:15 +0000
@@ -202,7 +202,7 @@
 			wi_sco_name   VARCHAR( 40 ) NOT NULL,
 			wi_order      INT(10) NOT NULL,
 			wi_enabled    TINYINT(1) NOT NULL DEFAULT 1,
-			wi_type       ENUM( 'core', 'plugin' ) NOT NULL DEFAULT 'core',
+			wi_type       ENUM( 'widget', 'plugin' ) NOT NULL DEFAULT 'widget',
 			wi_code       VARCHAR(32) NOT NULL,
 			wi_params     TEXT NULL,
 			PRIMARY KEY ( wi_ID ),
 
=== modified file 'blogs/inc/skins/_skin.funcs.php'
--- blogs/inc/skins/_skin.funcs.php	2009-12-10 02:40:40 +0000
+++ blogs/inc/skins/_skin.funcs.php	2009-12-21 15:13:15 +0000
@@ -661,23 +661,21 @@
  */
 function skin_widget( $params )
 {
-	global $inc_path;
-
 	if( empty( $params['widget'] ) )
 	{
 		echo 'No widget code provided!';
 		return false;
 	}
 
+	$wiCache = get_Cache('WidgetCache');
 	$widget_code = $params['widget'];
 	unset( $params['widget'] );
 
-	if( ! file_exists( $inc_path.'widgets/widgets/_'.$widget_code.'.widget.php' ) )
+	if( ! $wiCache->load_widget( $widget_code ) )
 	{	// For some reason, that widget doesn't seem to exist... (any more?)
 		echo "Invalid widget code provided [$widget_code]!";
 		return false;
 	}
-	require_once $inc_path.'widgets/widgets/_'.$widget_code.'.widget.php';
 
 	$widget_classname = $widget_code.'_Widget';
 
 
=== modified file 'blogs/inc/widgets/model/_widget.class.php'
--- blogs/inc/widgets/model/_widget.class.php	2009-12-06 09:37:19 +0000
+++ blogs/inc/widgets/model/_widget.class.php	2009-12-21 15:13:15 +0000
@@ -39,12 +39,15 @@
 	var $sco_name;
 	var $order;
 	/**
-	 * @var string Type of the plugin ("core" or "plugin")
+	 * @var string Type of the widget ("widget" or "plugin")
 	 */
 	var $type;
 	var $code;
 	var $params;
 
+	var $widget_name;
+	var $widget_title;
+
 	/**
 	 * Indicates whether the widget is enabled.
 	 *
@@ -74,11 +77,27 @@
 
 
 	/**
+	 * The translations keyed by locale. They get loaded through include() of _global.php.
+	 * @see ComponentWidget::T_()
+	 * @var array
+	 */
+	var $_trans = array();
+
+	/**
+	 * Has the global /locales/_global.php file (where translation for
+	 * all languages can be put into) been loaded?
+	 *
+	 * @var boolean
+	 */
+	var $_trans_loaded_global = false;
+
+
+	/**
 	 * Constructor
 	 *
 	 * @param object data row from db
 	 */
-	function ComponentWidget( $db_row = NULL, $type = 'core', $code = NULL )
+	function ComponentWidget( $db_row = NULL, $type = 'widget', $code = NULL )
 	{
 		// Call parent constructor:
 		parent::DataObject( 'T_widget', 'wi_', 'wi_ID' );
@@ -150,17 +169,36 @@
 	 */
 	function get_name()
 	{
-		if( $this->type == 'plugin' )
-		{
-			// Make sure Plugin is loaded:
-			if( $this->get_Plugin() )
+		if( $this->widget_name )
+		{ // we have a name
+			$name = $this->widget_name;
+		}
+		else
+		{ // we don't have a name
+			if( $this->type == 'plugin' )
 			{
-				return $this->Plugin->name;
-			}
-			return T_('Inactive / Uninstalled plugin');
-		}
-
-		return T_('Unknown');
+				// Make sure Plugin is loaded:
+				if( $this->get_Plugin() )
+				{
+					$name = $this->Plugin->name;
+				}
+				else
+				{
+					$name = T_('Inactive / Uninstalled plugin');
+				}
+			}
+			else
+			{ // it's a widget
+				$name = T_('Unknown widget');
+			}
+		}
+
+		if( $this->disp_params['widget_name'] && $name != $this->disp_params['widget_name'] )
+		{ // user has renamed us
+			$name .= ' : '.$this->disp_params['widget_name'];
+		}
+
+		return $name;
 	}
 
 
@@ -228,6 +266,18 @@
 	function get_param_definitions( $params )
 	{
 		$r = array(
+				'widget_name' => array(
+					'label' => T_( 'Name' ),
+					'size' => 20,
+					'note' => T_( 'Displayed in the widget list.'),
+					'defaultvalue' => $this->widget_name,
+				),
+				'widget_title' => array(
+					'label' => T_( 'Title' ),
+					'size' => 20,
+					'note' => T_( 'Displayed in your template.'),
+					'defaultvalue' => $this->widget_title,
+				),
 				'widget_css_class' => array(
 					'label' => '<span class="dimmed">'.T_( 'CSS Class' ).'</span>',
 					'size' => 20,
@@ -458,7 +508,7 @@
 	{
 		if( is_null($title) )
 		{
-			$title = & $this->disp_params['title'];
+			$title = $this->disp_params['widget_title'];
 		}
 
 		if( $this->disp_params['block_display_title'] && !empty( $title ) )
@@ -471,83 +521,6 @@
 
 
 	/**
-	 * List of collections/blogs
-	 *
-	 * @param array MUST contain at least the basic display params
-	 */
-	function disp_coll_list( $filter = 'public' )
-	{
-		/**
-		 * @var Blog
-		 */
-		global $Blog, $baseurl;
-
-		echo $this->disp_params['block_start'];
-
-		$this->disp_title();
-
-		/**
-		 * @var BlogCache
-		 */
-		$BlogCache = & get_Cache( 'BlogCache' );
-
-		if( $filter == 'owner' )
-		{	// Load blogs of same owner
-			$blog_array = $BlogCache->load_owner_blogs( $Blog->owner_user_ID, 'ID' );
-		}
-		else
-		{	// Load all public blogs
-			$blog_array = $BlogCache->load_public( 'ID' );
-		}
-
-		{
-			echo $this->disp_params['list_start'];
-
-			foreach( $blog_array as $l_blog_ID )
-			{	// Loop through all public blogs:
-
-				$l_Blog = & $BlogCache->get_by_ID( $l_blog_ID );
-
-				if( $Blog && $l_blog_ID == $Blog->ID )
-				{ // This is the blog being displayed on this page:
-				echo $this->disp_params['item_selected_start'];
-					$link_class = $this->disp_params['link_selected_class'];
-				}
-				else
-				{
-					echo $this->disp_params['item_start'];
-					$link_class = $this->disp_params['link_default_class'];;
-				}
-
-				echo '<a href="'.$l_Blog->gen_blogurl().'" class="'.$link_class.'" title="'
-											.$l_Blog->dget( 'name', 'htmlattr' ).'">';
-
-				if( $Blog && $l_blog_ID == $Blog->ID )
-				{ // This is the blog being displayed on this page:
-					echo $this->disp_params['item_selected_text_start'];
-					printf( $this->disp_params['item_selected_text'], $l_Blog->dget( 'shortname', 'htmlbody' ) );
-					echo $this->disp_params['item_selected_text_end'];
-					echo '</a>';
-					echo $this->disp_params['item_selected_end'];
-				}
-				else
-				{
-					echo $this->disp_params['item_text_start'];
-					printf( $this->disp_params['item_text'], $l_Blog->dget( 'shortname', 'htmlbody' ) );
-					echo $this->disp_params['item_text_end'];
-					echo '</a>';
-					echo $this->disp_params['item_end'];
-				}
-			}
-
-			echo $this->disp_params['list_end'];
-		}
-
-		echo $this->disp_params['block_end'];
-	}
-
-
-	/**
 	 * Insert object into DB based on previously recorded changes.
 	 *
 	 * @return boolean true on success
@@ -577,7 +550,73 @@
 
 		return $res;
 	}
+
+
+	/**
+	 * Translate a given string, in the Widget's context.
+	 *
+	 * This means, that the translation is obtained from the Widget's "locales" folder.
+	 * @link [doclink] Localization#Extensions
+	 *
+	 * It uses the global/regular {@link T_()} function as a fallback.
+	 *
+	 * @param string The string (english), that should be translated
+	 * @param string Requested locale ({@link $current_locale} gets used by default)
+	 * @return string The translated string.
+	 * @uses T_()
+	 */
+	function T_( $string, $req_locale = '' )
+	{
+		if( $this->type == 'plugin' )
+		{ // use plugin translation function
+			return $this->Plugin->T_( $string, $req_locale );
+		}
+
+		global $plugins_path,$Debuglog;
+
+		$globalfile_path = $plugins_path.$this->code.'_widget/locales/_global.php';
+		$trans = & $this->_trans;
+
+		// Load the global messages file, if existing:
+		if( ! $this->_trans_loaded_global )
+		{
+			$this->_trans_loaded_global = true;
+
+			if( file_exists( $globalfile_path ) && is_readable( $globalfile_path ) )
+			{
+				include_once $globalfile_path;
+			}
+			else
+			{
+				$Debuglog->add( 'Global messages file '.$globalfile_path.' does not exist or is not readable!', 'locale' );
+			}
+		}
+
+		if ( ( $return = T_( $string, $req_locale, array(
+								'ext_transarray' => & $this->_trans,
+								'alt_basedir'    => $plugins_path.$this->code.'_widget',
+							) ) ) == $string )
+		{	// Fallback to global translation file:
+			return T_( $string, $req_locale );
+		}
+		return $return;
+	}
+
+
+	/**
+	 * Translate and escape single quotes.
+	 *
+	 * This is to be used mainly for Javascript strings.
+	 *
+	 * @uses ComponentWidget::T_()
+	 *
+	 * @param string String to translate
+	 * @param string Locale to use
+	 * @return string The translated and escaped string.
+	 */
+	function TS_( $string, $req_locale = '' )
+	{
+		return str_replace( "'", "\\'", $this->T_( $string, $req_locale ) );
+	}
 }
-
-
 ?>
 
=== modified file 'blogs/inc/widgets/model/_widgetcache.class.php'
--- blogs/inc/widgets/model/_widgetcache.class.php	2009-12-06 09:37:19 +0000
+++ blogs/inc/widgets/model/_widgetcache.class.php	2009-12-21 15:13:15 +0000
@@ -109,18 +109,16 @@
 	 */
 	function & new_obj( $row = NULL )
 	{
-		global $inc_path;
 
-		if( $row->wi_type == 'core' )
+		if( $row->wi_type == 'widget' )
 		{
-			if( ! file_exists( $inc_path.'widgets/widgets/_'.$row->wi_code.'.widget.php' ) )
-			{	// For some reason, that widget doesn't seem to exist... (any more?)
+			if( !$this->load_widget( $row->wi_code ) )
+			{
 				// echo "Widget $row->wi_code could not be loaded! ";
 				// TODO: replace with dummy widget in order to give a chance to clean up.
 				$r = NULL;
 				return $r;
 			}
-			require_once $inc_path.'widgets/widgets/_'.$row->wi_code.'.widget.php';
 			$objtype = $row->wi_code.'_Widget';
 		}
 		else
@@ -136,6 +134,32 @@
 
 
 	/**
+	 * Loads appropriate widget class file.
+	 *
+	 * @param string $wi_code widget to load
+	 * @return boolean Whether the class file could be loaded. Note that this method will return true
+	 *                 if the file has been included before (there is no way to find out whether require_once()
+	 *                 really included a file).
+	 */
+	function load_widget( $wi_code )
+	{
+		global $plugins_path, $Debuglog;
+
+		// Note: file_exists() should not have a big impact on IO performance since PHP caches the
+		//       results.
+		if( file_exists( $plugins_path.$wi_code.'_widget/_'.$wi_code.'.widget.php' ) )
+		{	// widget is in its own folder
+			//$Debuglog->add( 'Loading class: '.$wi_code, 'widgets' );
+			// require_once makes sure each widget class is only loaded once.
+			require_once $plugins_path.$wi_code.'_widget/_'.$wi_code.'.widget.php';
+			return true;
+		}
+
+		return false;
+	}
+
+
+	/**
 	 * @param integer Collection (blog) ID
 	 * @param string Container
 	 * @return array of Widget
@@ -148,6 +172,4 @@
 		return $this->cache_container_Widget_array[$coll_ID][$container];
 	}
 }
-
-
 ?>
 
=== modified file 'blogs/inc/widgets/views/_widget_list_available.view.php'
--- blogs/inc/widgets/views/_widget_list_available.view.php	2009-12-06 09:37:19 +0000
+++ blogs/inc/widgets/views/_widget_list_available.view.php	2009-12-21 15:13:15 +0000
@@ -44,11 +44,13 @@
 			'coll_tagline',
 			'coll_longdesc',
 		'*'.T_('Other'),
-			'colls_list_public',
-			'colls_list_owner',
+//			'colls_list_public', deprecated use colls_list
+//			'colls_list_owner', deprecated use colls_list
+			'colls_list',
 			'user_tools',
 	);
 $i = 0;
+$wiCache = get_Cache( 'WidgetCache');
 foreach( $core_componentwidget_defs as $code )
 {
 	$i++;
@@ -62,12 +64,12 @@
 	}
 	else
 	{
-		load_class( 'widgets/widgets/_'.$code.'.widget.php' );
+		$wiCache->load_widget( $code );
 		$classname = $code.'_Widget';
-		$ComponentWidget = & new $classname( NULL, 'core', $code );
+		$ComponentWidget = & new $classname( NULL, 'widget', $code );
 
 		echo '<li>';
-		echo '<a href="'.regenerate_url( '', 'action=create&amp;type=core&amp;code='.$ComponentWidget->code ).'" title="'.T_('Add this widget to the container').'">';
+		echo '<a href="'.regenerate_url( '', 'action=create&amp;type=widget&amp;code='.$ComponentWidget->code ).'" title="'.T_('Add this widget to the container').'">';
 		echo get_icon( 'new' ).'<strong>'.$ComponentWidget->get_name().'</strong>';
 		echo '</a> <span class="notes">'.$ComponentWidget->get_desc().'</span>';
 		echo '</li>';
 
=== removed directory 'blogs/inc/widgets/widgets'
=== modified file 'blogs/inc/widgets/widgets.ctrl.php'
--- blogs/inc/widgets/widgets.ctrl.php	2009-12-06 09:37:19 +0000
+++ blogs/inc/widgets/widgets.ctrl.php	2009-12-21 15:13:15 +0000
@@ -137,11 +137,18 @@
 
 		switch( $type )
 		{
-			case 'core':
+			case 'widget':
 				// Check the requested core widget is valid:
-				load_class( 'widgets/widgets/_'.$code.'.widget.php' );
-				$objtype = $code.'_Widget';
-				$edited_ComponentWidget = & new $objtype();
+				$WidgetCache = & get_Cache( 'WidgetCache' );
+				if( $WidgetCache->load_widget( $code ) )
+				{
+					$objtype = $code.'_Widget';
+					$edited_ComponentWidget = & new $objtype();
+				}
+				else
+				{
+					debug_die( 'Requested widget not found' );
+				}
 				break;
 
 			case 'plugin':
 
=== modified file 'blogs/install/_functions_evoupgrade.php'
--- blogs/install/_functions_evoupgrade.php	2009-12-06 09:37:19 +0000
+++ blogs/install/_functions_evoupgrade.php	2009-12-21 15:13:16 +0000
@@ -1836,7 +1836,7 @@
 						wi_coll_ID    INT(11) UNSIGNED NOT NULL,
 						wi_sco_name   VARCHAR( 40 ) NOT NULL,
 						wi_order			INT(10) UNSIGNED NOT NULL,
-						wi_type       ENUM( \'core\', \'plugin\' ) NOT NULL DEFAULT \'core\',
+						wi_type       ENUM( \'widget\', \'plugin\' ) NOT NULL DEFAULT \'widget\',
 						wi_code       VARCHAR(32) NOT NULL,
 						wi_params     TEXT NULL,
 						PRIMARY KEY ( wi_ID ),
@@ -2462,6 +2462,17 @@
 	 */
 
 
+	if( $old_db_version < 100000 )
+	{	// 0.0.0
+		task_begin( 'Updating widgets table...' );
+		$DB->query( "ALTER TABLE T_widget
+								CHANGE COLUMN wi_type wi_type  ENUM('widget', 'core', 'plugin') NOT NULL DEFAULT 'widget'" );
+		$DB->query( "UPDATE T_widget SET wi_type='widget' WHERE NOT( wi_type='plugin' )" );
+		$DB->query( "ALTER TABLE T_widget
+								CHANGE COLUMN wi_type wi_type  ENUM('widget', 'plugin') NOT NULL DEFAULT 'widget'" );
+		task_end();
+	}
+
 	// Just in case, make sure the db schema version is upto date at the end.
 	if( $old_db_version != $new_db_version )
 	{ // Update DB schema version to $new_db_version
 
=== modified file 'blogs/install/_functions_install.php'
--- blogs/install/_functions_install.php	2009-12-16 13:53:18 +0000
+++ blogs/install/_functions_install.php	2009-12-21 15:13:16 +0000
@@ -530,33 +530,33 @@
 
 	// Add blog list to all blog Page Tops:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
-							 SELECT blog_ID, "Page Top", 1, "core", "colls_list_public"
+							 SELECT blog_ID, "Page Top", 1, "widget", "colls_list_public"
 							   FROM T_blogs' );
 
 	// Add title to all blog Headers:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
-							 SELECT blog_ID, "Header", 1, "core", "coll_title"
+							 SELECT blog_ID, "Header", 1, "widget", "coll_title"
 							   FROM T_blogs' );
 	// Add tagline to all blogs Headers:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
-							 SELECT blog_ID, "Header", 2, "core", "coll_tagline"
+							 SELECT blog_ID, "Header", 2, "widget", "coll_tagline"
 							   FROM T_blogs' );
 
 	// Add home link to all blogs Menus:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
-							 SELECT blog_ID, "Menu", 1, "core", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'home'))).'"
+							 SELECT blog_ID, "Menu", 1, "widget", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'home'))).'"
 							   FROM T_blogs' );
 	// Add info pages to all blogs Menus:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
-							 SELECT blog_ID, "Menu", 2, "core", "coll_page_list"
+							 SELECT blog_ID, "Menu", 2, "widget", "coll_page_list"
 							   FROM T_blogs' );
 	// Add contact link to all blogs Menus:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
-							 SELECT blog_ID, "Menu", 3, "core", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'ownercontact'))).'"
+							 SELECT blog_ID, "Menu", 3, "widget", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'ownercontact'))).'"
 							   FROM T_blogs' );
 	// Add login link to all blogs Menus:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
-							 SELECT blog_ID, "Menu", 4, "core", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'login'))).'"
+							 SELECT blog_ID, "Menu", 4, "widget", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'login'))).'"
 							   FROM T_blogs' );
 
 	// Add Calendar plugin to all blog Sidebars except blog A:
@@ -566,54 +566,54 @@
 							  WHERE blog_ID > 1' );
 	// Add title to all blog Sidebars:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
-							 SELECT blog_ID, "Sidebar", 2, "core", "coll_title"
+							 SELECT blog_ID, "Sidebar", 2, "widget", "coll_title"
 							   FROM T_blogs' );
 	// Add longdesc to all blogs Sidebars:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
-							 SELECT blog_ID, "Sidebar", 3, "core", "coll_longdesc"
+							 SELECT blog_ID, "Sidebar", 3, "widget", "coll_longdesc"
 							   FROM T_blogs' );
 	// Add common links to all blogs Sidebars:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
-							 SELECT blog_ID, "Sidebar", 4, "core", "coll_common_links"
+							 SELECT blog_ID, "Sidebar", 4, "widget", "coll_common_links"
 							   FROM T_blogs' );
 	// Add search form to all blogs Sidebars:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
-							 SELECT blog_ID, "Sidebar", 5, "core", "coll_search_form"
+							 SELECT blog_ID, "Sidebar", 5, "widget", "coll_search_form"
 							   FROM T_blogs' );
 	// Add categories list to all blog Sidebars:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
-							 SELECT blog_ID, "Sidebar", 6, "core", "coll_category_list"
+							 SELECT blog_ID, "Sidebar", 6, "widget", "coll_category_list"
 							   FROM T_blogs' );
 	// Add Random photo to blog Sidebars except blog B:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
-							 SELECT blog_ID, "Sidebar", 7, "core", "coll_media_index", \'a:11:{s:5:"title";s:12:"Random photo";s:10:"thumb_size";s:11:"fit-160x120";s:12:"thumb_layout";s:4:"grid";s:12:"grid_nb_cols";s:1:"1";s:5:"limit";s:1:"1";s:8:"order_by";s:4:"RAND";s:9:"order_dir";s:3:"ASC";s:7:"blog_ID";s:1:"4";s:11:"widget_name";s:12:"Random photo";s:16:"widget_css_class";s:0:"";s:9:"widget_ID";s:0:"";}\'
+							 SELECT blog_ID, "Sidebar", 7, "widget", "coll_media_index", \'a:11:{s:5:"title";s:12:"Random photo";s:10:"thumb_size";s:11:"fit-160x120";s:12:"thumb_layout";s:4:"grid";s:12:"grid_nb_cols";s:1:"1";s:5:"limit";s:1:"1";s:8:"order_by";s:4:"RAND";s:9:"order_dir";s:3:"ASC";s:7:"blog_ID";s:1:"4";s:11:"widget_name";s:12:"Random photo";s:16:"widget_css_class";s:0:"";s:9:"widget_ID";s:0:"";}\'
 							   FROM T_blogs
 							  WHERE blog_ID <> 2' );
 	// Add linkblog to blog Sidebars for blog A & B:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
-							 SELECT blog_ID, "Sidebar", 8, "core", "linkblog", "'.$DB->escape(serialize(array('blog_ID'=>3))).'"
+							 SELECT blog_ID, "Sidebar", 8, "widget", "linkblog", "'.$DB->escape(serialize(array('blog_ID'=>3))).'"
 							   FROM T_blogs
 							  WHERE blog_ID <= 2' );
 	// Add XML feeds to all blogs Sidebars:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
-							 SELECT blog_ID, "Sidebar", 9, "core", "coll_xml_feeds"
+							 SELECT blog_ID, "Sidebar", 9, "widget", "coll_xml_feeds"
 							   FROM T_blogs' );
 
 	// All blog Sidebar 2:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
-							 SELECT blog_ID, "Sidebar 2", 1, "core", "coll_post_list"
+							 SELECT blog_ID, "Sidebar 2", 1, "widget", "coll_post_list"
 							   FROM T_blogs' );
 
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
-							 SELECT blog_ID, "Sidebar 2", 2, "core", "coll_comment_list"
-							   FROM T_blogs' );
-
-	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
-							 SELECT blog_ID, "Sidebar 2", 3, "core", "coll_media_index", \'a:11:{s:5:"title";s:13:"Recent photos";s:10:"thumb_size";s:10:"crop-80x80";s:12:"thumb_layout";s:4:"grid";s:12:"grid_nb_cols";s:1:"3";s:5:"limit";s:1:"9";s:8:"order_by";s:9:"datestart";s:9:"order_dir";s:4:"DESC";s:7:"blog_ID";s:1:"4";s:11:"widget_name";s:11:"Photo index";s:16:"widget_css_class";s:0:"";s:9:"widget_ID";s:0:"";}\'
-							   FROM T_blogs' );
-
-	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
-							 SELECT blog_ID, "Sidebar 2", 4, "core", "free_html", \'a:5:{s:5:"title";s:9:"Sidebar 2";s:7:"content";s:162:"This is the "Sidebar 2" container. You can place any widget you like in here. In the evo toolbar at the top of this page, select "Customize", then "Blog Widgets".";s:11:"widget_name";s:9:"Free HTML";s:16:"widget_css_class";s:0:"";s:9:"widget_ID";s:0:"";}\'
+							 SELECT blog_ID, "Sidebar 2", 2, "widget", "coll_comment_list"
+							   FROM T_blogs' );
+
+	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
+							 SELECT blog_ID, "Sidebar 2", 3, "widget", "coll_media_index", \'a:11:{s:5:"title";s:13:"Recent photos";s:10:"thumb_size";s:10:"crop-80x80";s:12:"thumb_layout";s:4:"grid";s:12:"grid_nb_cols";s:1:"3";s:5:"limit";s:1:"9";s:8:"order_by";s:9:"datestart";s:9:"order_dir";s:4:"DESC";s:7:"blog_ID";s:1:"4";s:11:"widget_name";s:11:"Photo index";s:16:"widget_css_class";s:0:"";s:9:"widget_ID";s:0:"";}\'
+							   FROM T_blogs' );
+
+	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
+							 SELECT blog_ID, "Sidebar 2", 4, "widget", "free_html", \'a:5:{s:5:"title";s:9:"Sidebar 2";s:7:"content";s:162:"This is the "Sidebar 2" container. You can place any widget you like in here. In the evo toolbar at the top of this page, select "Customize", then "Blog Widgets".";s:11:"widget_name";s:9:"Free HTML";s:16:"widget_css_class";s:0:"";s:9:"widget_ID";s:0:"";}\'
 							   FROM T_blogs' );
 
 	echo "OK.<br />\n";
 
=== added directory 'blogs/plugins/coll_category_list_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_category_list.widget.php' => 'blogs/plugins/coll_category_list_widget/_coll_category_list.widget.php'
--- blogs/inc/widgets/widgets/_coll_category_list.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_category_list_widget/_coll_category_list.widget.php	2009-12-21 15:13:16 +0000
@@ -41,18 +41,13 @@
 	 */
 	function coll_category_list_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Category list');
+		$this->widget_title = $this->T_('Categories');
+
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_category_list' );
-	}
-
-
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Category list');
-	}
+		parent::ComponentWidget( $db_row, 'widget', 'coll_category_list' );
+	}
+
 
 
 	/**
@@ -60,7 +55,7 @@
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -69,7 +64,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('List of all categories; click filters blog on selected category.');
+		return $this->T_('List of all categories; click filters blog on selected category.');
 	}
 
 
@@ -87,30 +82,24 @@
 	function get_param_definitions( $params )
 	{
 		$r = array_merge( array(
-			'title' => array(
-					'type' => 'text',
-					'label' => T_('Block title'),
-					'defaultvalue' => T_('Categories'),
-					'maxlength' => 100,
-				),
 			'option_all' => array(
 					'type' => 'text',
-					'label' => T_('Option "All"'),
-					'defaultvalue' => T_('All'),
+					'label' => $this->T_('Option "All"'),
+					'defaultvalue' => $this->T_('All'),
 					'maxlength' => 100,
-					'note' => T_('The "All categories" link allows to reset the filter. Leave blank if you want no such option.'),
+					'note' => $this->T_('The "All categories" link allows to reset the filter. Leave blank if you want no such option.'),
 				),
 			'use_form' => array(
 					'type' => 'checkbox',
-					'label' => T_('Use form'),
+					'label' => $this->T_('Use form'),
 					'defaultvalue' => 0,
-					'note' => T_('Add checkboxes to allow selection of multiple categories.'),
+					'note' => $this->T_('Add checkboxes to allow selection of multiple categories.'),
 				),
 			'disp_names_for_coll_list' => array(
 					'type' => 'checkbox',
-					'label' => T_('Display blog names'),
+					'label' => $this->T_('Display blog names'),
 					'defaultvalue' => 1, /* previous behaviour */
-					'note' => T_('Display blog names, if this is an aggregated blog.'),
+					'note' => $this->T_('Display blog names, if this is an aggregated blog.'),
 				),
 
 			// Hidden, used by the item list sidebar in the backoffice.
@@ -254,22 +243,22 @@
 		?>
 			<div class="tile">
 				<input type="radio" name="cat" value="" id="catANY" class="radio" <?php if( $cat_modifier != '-' && $cat_modifier != '*' ) echo 'checked="checked" '?> />
-				<label for="catANY"><?php echo T_('ANY') ?></label>
+				<label for="catANY"><?php echo $this->T_('ANY') ?></label>
 			</div>
 			<div class="tile">
 				<input type="radio" name="cat" value="-" id="catANYBUT" class="radio" <?php if( $cat_modifier == '-' ) echo 'checked="checked" '?> />
-				<label for="catANYBUT"><?php echo T_('ANY BUT') ?></label>
+				<label for="catANYBUT"><?php echo $this->T_('ANY BUT') ?></label>
 			</div>
 			<div class="tile">
 				<input type="radio" name="cat" value="*" id="catALL" class="radio" <?php if( $cat_modifier == '*' ) echo 'checked="checked" '?> />
-				<label for="catALL"><?php echo T_('ALL') ?></label>
+				<label for="catALL"><?php echo $this->T_('ALL') ?></label>
 			</div>
 		<?php
 			if( $this->disp_params['use_form'] )
 			{	// We want a complete form:
 			?>
 				<div class="tile">
-					<input type="submit" value="<?php echo T_( 'Filter categories' ); ?>" />
+					<input type="submit" value="<?php echo $this->T_( 'Filter categories' ); ?>" />
 				</div>
 				</form>
 			<?php
 
=== added directory 'blogs/plugins/coll_comment_list_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_comment_list.widget.php' => 'blogs/plugins/coll_comment_list_widget/_coll_comment_list.widget.php'
--- blogs/inc/widgets/widgets/_coll_comment_list.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_comment_list_widget/_coll_comment_list.widget.php	2009-12-21 15:13:16 +0000
@@ -40,8 +40,10 @@
 	 */
 	function coll_comment_list_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Comment list');
+		$this->widget_title = $this->T_('Recent comments');
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_comment_list' );
+		parent::ComponentWidget( $db_row, 'widget', 'coll_comment_list' );
 	}
 
 
@@ -54,41 +56,35 @@
 	function get_param_definitions( $params )
 	{
 		$r = array_merge( array(
-			'title' => array(
-				'label' => T_('Block title'),
-				'note' => T_( 'Title to display in your skin.' ),
-				'size' => 40,
-				'defaultvalue' => T_('Recent comments'),
-			),
 			'disp_order' => array(
-				'label' => T_('Order'),
-				'note' => T_('Order to display items'),
+				'label' => $this->T_('Order'),
+				'note' => $this->T_('Order to display items'),
 				'type' => 'select',
-				'options' => array( 'DESC' => T_( 'Newest to oldest' ), 'ASC' => T_( 'Oldest to newest' ), 'RAND' => T_( 'Random selection' ) ),
+				'options' => array( 'DESC' => $this->T_( 'Newest to oldest' ), 'ASC' => $this->T_( 'Oldest to newest' ), 'RAND' => $this->T_( 'Random selection' ) ),
 				'defaultvalue' => 'DESC',
 			),
 			'limit' => array(
-				'label' => T_( 'Max items' ),
-				'note' => T_( 'Maximum number of items to display.' ),
+				'label' => $this->T_( 'Max items' ),
+				'note' => $this->T_( 'Maximum number of items to display.' ),
 				'size' => 4,
 				'defaultvalue' => 20,
 			),
 			'author_links' => array(
-				'label' => T_( 'Link to author'),
-				'note' => T_( 'Link the author to their url' ),
+				'label' => $this->T_( 'Link to author'),
+				'note' => $this->T_( 'Link the author to their url' ),
 				'defaultvalue' => true,
 				'type' => 'checkbox',
 			),
 			'hover_text' => array(
-				'label' => T_( 'Hover text'),
-				'note' => T_( 'Text to show when hovering over the link' ),
+				'label' => $this->T_( 'Hover text'),
+				'note' => $this->T_( 'Text to show when hovering over the link' ),
 				'size' => 40,
-				'defaultvalue' => T_( 'Read the full comment' ),
+				'defaultvalue' => $this->T_( 'Read the full comment' ),
 				'type' => 'text',
 			),
 			'blog_ID' => array(
-				'label' => T_( 'Blog' ),
-				'note' => T_( 'ID of the blog to use, leave empty for the current blog.' ),
+				'label' => $this->T_( 'Blog' ),
+				'note' => $this->T_( 'ID of the blog to use, leave empty for the current blog.' ),
 				'size' => 4,
 			),
 		), parent::get_param_definitions( $params )	);
@@ -98,20 +94,11 @@
 
 
 	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Comment list');
-	}
-
-
-	/**
 	 * Get a very short desc. Used in the widget list.
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -120,7 +107,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('List of comments; click goes to comment.');
+		return $this->T_('List of comments; click goes to comment.');
 	}
 
 
@@ -161,7 +148,7 @@
 			$Comment->get_Item();
 			echo $this->disp_params[ 'item_start' ];
 			$Comment->author( '', ' ', '', ' ', 'htmlbody', $this->disp_params[ 'author_links' ] );
-			echo T_( 'on ' );
+			echo $this->T_( 'on ' );
 			$Comment->permanent_link( array(
 				'text'        => $Comment->Item->title,
 				'title'       => $this->disp_params[ 'hover_text' ],
 
=== added directory 'blogs/plugins/coll_common_links_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_common_links.widget.php' => 'blogs/plugins/coll_common_links_widget/_coll_common_links.widget.php'
--- blogs/inc/widgets/widgets/_coll_common_links.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_common_links_widget/_coll_common_links.widget.php	2009-12-21 15:13:16 +0000
@@ -43,17 +43,10 @@
 	 */
 	function coll_common_links_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Common Navigation Links');
+		$this->widget_title = '';
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_common_links' );
-	}
-
-
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Common Navigation Links');
+		parent::ComponentWidget( $db_row, 'widget', 'coll_common_links' );
 	}
 
 
@@ -62,7 +55,7 @@
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -71,7 +64,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Display these links: Recently, Archives, Categories, Latest Comments');
+		return $this->T_('Display these links: Recently, Archives, Categories, Latest Comments');
 	}
 
 
@@ -84,34 +77,28 @@
 	function get_param_definitions( $params )
 	{
 		$r = array_merge( array(
-				'title' => array(
-					'label' => T_('Block title'),
-					'note' => T_( 'Title to display in your skin.' ),
-					'size' => 40,
-					'defaultvalue' => '',
-				),
 				'show_recently' => array(
 					'type' => 'checkbox',
-					'label' => T_('Show "Recently"'),
-					'note' => T_('Go to the most recent posts / the blog\'s home.'),
+					'label' => $this->T_('Show "Recently"'),
+					'note' => $this->T_('Go to the most recent posts / the blog\'s home.'),
 					'defaultvalue' => '1',
 				),
 				'show_archives' => array(
 					'type' => 'checkbox',
-					'label' => T_('Show "Archives"'),
-					'note' => T_('Go to the monthly/weekly/daily archive list.'),
+					'label' => $this->T_('Show "Archives"'),
+					'note' => $this->T_('Go to the monthly/weekly/daily archive list.'),
 					'defaultvalue' => '1',
 				),
 				'show_categories' => array(
 					'type' => 'checkbox',
-					'label' => T_('Show "Categories"'),
-					'note' => T_('Go to the category tree.'),
+					'label' => $this->T_('Show "Categories"'),
+					'note' => $this->T_('Go to the category tree.'),
 					'defaultvalue' => '1',
 				),
 				'show_latestcomments' => array(
 					'type' => 'checkbox',
-					'label' => T_('Show "Latest comments"'),
-					'note' => T_('Go to the latest comments.'),
+					'label' => $this->T_('Show "Latest comments"'),
+					'note' => $this->T_('Go to the latest comments.'),
 					'defaultvalue' => '1',
 				),
 			), parent::get_param_definitions( $params )	);
@@ -143,7 +130,7 @@
 		if( $this->disp_params['show_recently'] )
 		{
 			echo $this->disp_params['item_start'];
-			echo '<strong><a href="'.$Blog->get('url').'">'.T_('Recently').'</a></strong>';
+			echo '<strong><a href="'.$Blog->get('url').'">'.$this->T_('Recently').'</a></strong>';
 			echo $this->disp_params['item_end'];
 		}
 
@@ -151,7 +138,7 @@
 		{
 			// fp> TODO: don't display this if archives plugin not installed... or depluginize archives (I'm not sure)
 			echo $this->disp_params['item_start'];
-			echo '<strong><a href="'.$Blog->get('arcdirurl').'">'.T_('Archives').'</a></strong>';
+			echo '<strong><a href="'.$Blog->get('arcdirurl').'">'.$this->T_('Archives').'</a></strong>';
 			echo $this->disp_params['item_end'];
 		}
 
@@ -159,14 +146,14 @@
 		{
 			// fp> TODO: don't display this if categories plugin not installed... or depluginize categories (I'm not sure)
 			echo $this->disp_params['item_start'];
-			echo '<strong><a href="'.$Blog->get('catdirurl').'">'.T_('Categories').'</a></strong>';
+			echo '<strong><a href="'.$Blog->get('catdirurl').'">'.$this->T_('Categories').'</a></strong>';
 			echo $this->disp_params['item_end'];
 		}
 
 		if( $this->disp_params['show_latestcomments'] )
 		{
 			echo $this->disp_params['item_start'];
-			echo '<strong><a href="'.$Blog->get('lastcommentsurl').'">'.T_('Latest comments').'</a></strong>';
+			echo '<strong><a href="'.$Blog->get('lastcommentsurl').'">'.$this->T_('Latest comments').'</a></strong>';
 			echo $this->disp_params['item_end'];
 		}
 
 
=== added directory 'blogs/plugins/coll_item_list_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_item_list.widget.php' => 'blogs/plugins/coll_item_list_widget/_coll_item_list.widget.php'
--- blogs/inc/widgets/widgets/_coll_item_list.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_item_list_widget/_coll_item_list.widget.php	2009-12-21 15:13:16 +0000
@@ -39,8 +39,14 @@
 	 */
 	function coll_item_list_Widget( $db_row = NULL )
 	{
+		if( empty( $this->widget_name ) && empty( $this->widget_title ) )
+		{ // this widget gets extended by others :-S
+			$this->widget_name = $this->T_('Universal Item list');
+			$this->widget_title = $this->T_('Items');
+		}
+
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_item_list' );
+		parent::ComponentWidget( $db_row, 'widget', 'coll_item_list' );
 	}
 
 
@@ -58,98 +64,92 @@
 		$ItemTypeCache = & get_Cache( 'ItemTypeCache' );
 
 		$item_type_options = array(
-			'#' => T_('Default'),
-			''  => T_('All'),
+			'#' => $this->T_('Default'),
+			''  => $this->T_('All'),
 			) + $ItemTypeCache->get_option_array();
 
 		$r = array_merge( array(
-				'title' => array(
-					'label' => T_('Block title'),
-					'note' => T_('Title to display in your skin.'),
-					'size' => 60,
-					'defaultvalue' => T_('Items'),
-				),
 				'title_link' => array(
-					'label' => T_('Link to blog'),
-					'note' => T_('Link the block title to the blog?'),
+					'label' => $this->T_('Link to blog'),
+					'note' => $this->T_('Link the block title to the blog?'),
 					'type' => 'checkbox',
 					'defaultvalue' => false,
 				),
 				'item_type' => array(
-					'label' => T_('Item type'),
-					'note' => T_('What kind of items do you want to list?'),
+					'label' => $this->T_('Item type'),
+					'note' => $this->T_('What kind of items do you want to list?'),
 					'type' => 'select',
 					'options' => $item_type_options,
 					'defaultvalue' => '#',
 				),
 				'follow_mainlist' => array(
-					'label' => T_('Follow Main List'),
-					'note' => T_('Do you want to restrict to contents related to what is displayed in the main area?'),
+					'label' => $this->T_('Follow Main List'),
+					'note' => $this->T_('Do you want to restrict to contents related to what is displayed in the main area?'),
 					'type' => 'select', // should be a radio button set
-					'options' => array( 'no'  => T_('No'), 'tags' => T_('By tags') ), // may be extended
+					'options' => array( 'no'  => $this->T_('No'), 'tags' => $this->T_('By tags') ), // may be extended
 					'defaultvalue' => 'none',
 				),
 				'blog_ID' => array(
-					'label' => T_( 'Blog' ),
-					'note' => T_( 'ID of the blog to use, leave empty for the current blog.' ),
+					'label' => $this->T_( 'Blog' ),
+					'note' => $this->T_( 'ID of the blog to use, leave empty for the current blog.' ),
 					'size' => 4,
 				),
 				'item_group_by' => array(
-					'label' => T_('Group by'),
-					'note' => T_('Do you want to group the Items?'),
+					'label' => $this->T_('Group by'),
+					'note' => $this->T_('Do you want to group the Items?'),
 					'type' => 'select', // should be a radio button set
-					'options' => array( 'none'  => T_('None'), 'chapter' => T_('By category/chapter') ),
+					'options' => array( 'none'  => $this->T_('None'), 'chapter' => $this->T_('By category/chapter') ),
 					'defaultvalue' => 'none',
 				),
 				'order_by' => array(
-					'label' => T_('Order by'),
-					'note' => T_('How to sort the items'),
+					'label' => $this->T_('Order by'),
+					'note' => $this->T_('How to sort the items'),
 					'type' => 'select',
 					'options' => get_available_sort_options(),
 					'defaultvalue' => 'datestart',
 				),
 				'order_dir' => array(
-					'label' => T_('Direction'),
-					'note' => T_('How to sort the items'),
+					'label' => $this->T_('Direction'),
+					'note' => $this->T_('How to sort the items'),
 					'type' => 'select', // should be a radio button set
-					'options' => array( 'ASC'  => T_('Ascending'), 'DESC' => T_('Descending') ),
+					'options' => array( 'ASC'  => $this->T_('Ascending'), 'DESC' => $this->T_('Descending') ),
 					'defaultvalue' => 'DESC',
 				),
 				'limit' => array(
-					'label' => T_( 'Max items' ),
-					'note' => T_( 'Maximum number of items to display.' ),
+					'label' => $this->T_( 'Max items' ),
+					'note' => $this->T_( 'Maximum number of items to display.' ),
 					'size' => 4,
 					'defaultvalue' => 20,
 				),
 				'item_title_link_type' => array(
-					'label' => T_('Link titles'),
-					'note' => T_('Where should titles be linked to?'),
+					'label' => $this->T_('Link titles'),
+					'note' => $this->T_('Where should titles be linked to?'),
 					'type' => 'select',
 					'options' => array(
-							'auto'        => T_('Automatic'),
-							'permalink'   => T_('Item permalink'),
-							'linkto_url'  => T_('Item URL'),
-							'none'        => T_('Nowhere'),
+							'auto'        => $this->T_('Automatic'),
+							'permalink'   => $this->T_('Item permalink'),
+							'linkto_url'  => $this->T_('Item URL'),
+							'none'        => $this->T_('Nowhere'),
 						),
 					'defaultvalue' => 'auto',
 				),
 				'disp_excerpt' => array(
-					'label' => T_( 'Excerpt' ),
-					'note' => T_( 'Display excerpt for each item.' ),
+					'label' => $this->T_( 'Excerpt' ),
+					'note' => $this->T_( 'Display excerpt for each item.' ),
 					'type' => 'checkbox',
 					'defaultvalue' => false,
 				),
 				'disp_teaser' => array(
-					'label' => T_( 'Content teaser' ),
+					'label' => $this->T_( 'Content teaser' ),
 					'type' => 'checkbox',
 					'defaultvalue' => false,
-					'note' => T_( 'Display content teaser for each item.' ),
+					'note' => $this->T_( 'Display content teaser for each item.' ),
 				),
 				'disp_teaser_maxwords' => array(
-					'label' => T_( 'Max Words' ),
+					'label' => $this->T_( 'Max Words' ),
 					'type' => 'integer',
 					'defaultvalue' => 20,
-					'note' => T_( 'Max number of words for the teasers.' ),
+					'note' => $this->T_( 'Max number of words for the teasers.' ),
 				),
 			), parent::get_param_definitions( $params )	);
 
@@ -160,20 +160,11 @@
 
 
 	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Universal Item list');
-	}
-
-
-	/**
 	 * Get a very short desc. Used in the widget list.
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -182,7 +173,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Can list Items (Posts/Pages/Links...) in a variety of ways.');
+		return $this->T_('Can list Items (Posts/Pages/Links...) in a variety of ways.');
 	}
 
 
@@ -207,7 +198,7 @@
 		if( empty($listBlog) )
 		{
 			echo $this->disp_params['block_start'];
-			echo T_('The requested Blog doesn\'t exist any more!');
+			echo $this->T_('The requested Blog doesn\'t exist any more!');
 			echo $this->disp_params['block_end'];
 			return;
 		}
@@ -294,7 +285,7 @@
 
 		echo $this->disp_params['block_start'];
 
-		$title = sprintf( ( $this->disp_params[ 'title_link' ] ? '<a href="'.$listBlog->gen_blogurl().'" rel="nofollow">%s</a>' : '%s' ), $this->disp_params[ 'title' ] );
+		$title = sprintf( ( $this->disp_params[ 'title_link' ] ? '<a href="'.$listBlog->gen_blogurl().'" rel="nofollow">%s</a>' : '%s' ), $this->disp_params[ 'widget_title' ] );
 		$this->disp_title( $title );
 
 		echo $this->disp_params['list_start'];
@@ -378,7 +369,7 @@
 			$Item->more_link( array(
 					'before'    => '',
 					'after'     => '',
-					'link_text' => T_('more').' &raquo;',
+					'link_text' => $this->T_('more').' &raquo;',
 				) );
 				*/
 		}
 
=== added directory 'blogs/plugins/coll_link_list_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_link_list.widget.php' => 'blogs/plugins/coll_link_list_widget/_coll_link_list.widget.php'
--- blogs/inc/widgets/widgets/_coll_link_list.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_link_list_widget/_coll_link_list.widget.php	2009-12-21 15:13:16 +0000
@@ -23,7 +23,8 @@
  */
 if( !defined('EVO_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
 
-load_class( 'widgets/widgets/_coll_item_list.widget.php' );
+$wiCache = get_Cache('WidgetCache');
+$wiCache->load_widget( 'coll_item_list' );
 
 /**
  * links_widget class
@@ -39,8 +40,11 @@
 	 */
 	function coll_link_list_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Simple Sidebar Links list');
+		$this->widget_title = $this->T_('Links');
+
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_link_list' );
+		parent::ComponentWidget( $db_row, 'widget', 'coll_link_list' );
 	}
 
 
@@ -55,7 +59,6 @@
 		// This is derived from coll_post_list_Widget, so we DO NOT ADD ANY param here!
 		$r = parent::get_param_definitions( $params );
 		// We only change the defaults and hide some params.
-		$r['title']['defaultvalue'] = T_('Links');
 		$r['title_link']['no_edit'] = true;
 		$r['item_type']['no_edit'] = true;
 		$r['follow_mainlist']['no_edit'] = true;
@@ -71,13 +74,6 @@
 	}
 
 
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Simple Sidebar Links list');
-	}
 
 
 	/**
@@ -85,7 +81,7 @@
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -94,7 +90,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Simplified Item list for listing Sidebar links.');
+		return $this->T_('Simplified Item list for listing Sidebar links.');
 	}
 
 
 
=== added directory 'blogs/plugins/coll_logo_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_logo.widget.php' => 'blogs/plugins/coll_logo_widget/_coll_logo.widget.php'
--- blogs/inc/widgets/widgets/_coll_logo.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_logo_widget/_coll_logo.widget.php	2009-12-21 15:13:16 +0000
@@ -39,17 +39,9 @@
 	 */
 	function coll_logo_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Image / Blog logo');
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_logo' );
-	}
-
-
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Image / Blog logo');
+		parent::ComponentWidget( $db_row, 'widget', 'coll_logo' );
 	}
 
 
@@ -77,7 +69,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Include an image/logo from the blog\'s file root.');
+		return $this->T_('Include an image/logo from the blog\'s file root.');
 	}
 
 
@@ -91,8 +83,8 @@
 	{
 		$r = array_merge( array(
 				'logo_file' => array(
-					'label' => T_('Image filename'),
-					'note' => T_('The image/logo file must be uploaded to the root of the Blog\'s media dir'),
+					'label' => $this->T_('Image filename'),
+					'note' => $this->T_('The image/logo file must be uploaded to the root of the Blog\'s media dir'),
 					'defaultvalue' => 'logo.png',
 					'valid_pattern' => array( 'pattern'=>'¤^[a-z0-9_\-][a-z0-9_.\-]*$¤i',
 																		'error'=>T_('Invalid filename.') ),
 
=== added directory 'blogs/plugins/coll_longdesc_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_longdesc.widget.php' => 'blogs/plugins/coll_longdesc_widget/_coll_longdesc.widget.php'
--- blogs/inc/widgets/widgets/_coll_longdesc.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_longdesc_widget/_coll_longdesc.widget.php	2009-12-21 15:13:16 +0000
@@ -39,17 +39,10 @@
 	 */
 	function coll_longdesc_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Long Description of this Blog');
+		$this->widget_title = '';
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_longdesc' );
-	}
-
-
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Long Description of this Blog');
+		parent::ComponentWidget( $db_row, 'widget', 'coll_longdesc' );
 	}
 
 
@@ -58,7 +51,7 @@
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -68,33 +61,11 @@
 	function get_desc()
 	{
 		global $Blog;
-		return sprintf( T_('Long description from the blog\'s <a %s>general settings</a>.'),
+		return sprintf( $this->T_('Long description from the blog\'s <a %s>general settings</a>.'),
 						'href="?ctrl=coll_settings&tab=general&blog='.$Blog->ID.'"' );
 	}
 
 
-  /**
-   * Get definitions for editable params
-   *
-	 * @see Plugin::GetDefaultSettings()
-	 * @param local params like 'for_editing' => true
-	 */
-	function get_param_definitions( $params )
-	{
-		$r = array_merge( array(
-				'title' => array(
-					'label' => T_('Block title'),
-					'note' => T_( 'Title to display in your skin.' ),
-					'size' => 40,
-					'defaultvalue' => '',
-				),
-
-			), parent::get_param_definitions( $params )	);
-
-		return $r;
-	}
-
-
 	/**
 	 * Display the widget!
 	 *
@@ -119,6 +90,4 @@
 		return true;
 	}
 }
-
-
 ?>
 \ No newline at end of file
 
=== added directory 'blogs/plugins/coll_media_index_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_media_index.widget.php' => 'blogs/plugins/coll_media_index_widget/_coll_media_index.widget.php'
--- blogs/inc/widgets/widgets/_coll_media_index.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_media_index_widget/_coll_media_index.widget.php	2009-12-21 15:13:16 +0000
@@ -40,8 +40,10 @@
 	 */
 	function coll_media_index_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Photo index');
+		$this->widget_title = $this->T_('Recent photos');
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_media_index' );
+		parent::ComponentWidget( $db_row, 'widget', 'coll_media_index' );
 	}
 
 
@@ -56,55 +58,49 @@
 		load_funcs( 'files/model/_image.funcs.php' );
 
 		$r = array_merge( array(
-			'title' => array(
-				'label' => T_('Block title'),
-				'note' => T_( 'Title to display in your skin.' ),
-				'size' => 40,
-				'defaultvalue' => T_('Recent photos'),
-			),
 			'thumb_size' => array(
-				'label' => T_('Thumbnail size'),
-				'note' => T_('Cropping and sizing of thumbnails'),
+				'label' => $this->T_('Thumbnail size'),
+				'note' => $this->T_('Cropping and sizing of thumbnails'),
 				'type' => 'select',
 				'options' => get_available_thumb_sizes(),
 				'defaultvalue' => 'crop-80x80',
 			),
 			'thumb_layout' => array(
-				'label' => T_('Layout'),
-				'note' => T_('How to lay out the thumbnails'),
+				'label' => $this->T_('Layout'),
+				'note' => $this->T_('How to lay out the thumbnails'),
 				'type' => 'select',
-				'options' => array( 'grid' => T_( 'Grid' ), 'list' => T_( 'List' ) ),
+				'options' => array( 'grid' => $this->T_( 'Grid' ), 'list' => $this->T_( 'List' ) ),
 				'defaultvalue' => 'grid',
 			),
 			'grid_nb_cols' => array(
-				'label' => T_( 'Columns' ),
-				'note' => T_( 'Number of columns in grid mode.' ),
+				'label' => $this->T_( 'Columns' ),
+				'note' => $this->T_( 'Number of columns in grid mode.' ),
 				'size' => 4,
 				'defaultvalue' => 2,
 			),
 			'limit' => array(
-				'label' => T_( 'Max items' ),
-				'note' => T_( 'Maximum number of items to display.' ),
+				'label' => $this->T_( 'Max items' ),
+				'note' => $this->T_( 'Maximum number of items to display.' ),
 				'size' => 4,
 				'defaultvalue' => 3,
 			),
 			'order_by' => array(
-				'label' => T_('Order by'),
-				'note' => T_('How to sort the items'),
+				'label' => $this->T_('Order by'),
+				'note' => $this->T_('How to sort the items'),
 				'type' => 'select',
 				'options' => get_available_sort_options(),
 				'defaultvalue' => 'datestart',
 			),
 			'order_dir' => array(
-				'label' => T_('Direction'),
-				'note' => T_('How to sort the items'),
+				'label' => $this->T_('Direction'),
+				'note' => $this->T_('How to sort the items'),
 				'type' => 'select',
-				'options' => array( 'ASC'  => T_('Ascending'), 'DESC' => T_('Descending') ),
+				'options' => array( 'ASC'  => $this->T_('Ascending'), 'DESC' => $this->T_('Descending') ),
 				'defaultvalue' => 'DESC',
 			),
 			'blog_ID' => array(
-				'label' => T_( 'Blogs' ),
-				'note' => T_( 'IDs of the blogs to use, leave empty for the current blog. Separate multiple blogs by commas.' ),
+				'label' => $this->T_( 'Blogs' ),
+				'note' => $this->T_( 'IDs of the blogs to use, leave empty for the current blog. Separate multiple blogs by commas.' ),
 				'size' => 4,
 			),
 		), parent::get_param_definitions( $params )	);
@@ -114,20 +110,11 @@
 
 
 	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Photo index');
-	}
-
-
-	/**
 	 * Get a very short desc. Used in the widget list.
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -136,7 +123,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Index of photos; click goes to original image post.');
+		return $this->T_('Index of photos; click goes to original image post.');
 	}
 
 
 
=== added directory 'blogs/plugins/coll_page_list_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_page_list.widget.php' => 'blogs/plugins/coll_page_list_widget/_coll_page_list.widget.php'
--- blogs/inc/widgets/widgets/_coll_page_list.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_page_list_widget/_coll_page_list.widget.php	2009-12-21 15:13:16 +0000
@@ -23,7 +23,8 @@
  */
 if( !defined('EVO_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
 
-load_class( 'widgets/widgets/_coll_item_list.widget.php' );
+$wiCache = get_Cache('WidgetCache');
+$wiCache->load_widget( 'coll_item_list' );
 
 /**
  * ComponentWidget Class
@@ -39,8 +40,10 @@
 	 */
 	function coll_page_list_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Simple Page list');
+		$this->widget_title = $this->T_('Pages');
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_page_list' );
+		parent::ComponentWidget( $db_row, 'widget', 'coll_page_list' );
 	}
 
 
@@ -55,7 +58,6 @@
 		// This is derived from coll_post_list_Widget, so we DO NOT ADD ANY param here!
 		$r = parent::get_param_definitions( $params );
 		// We only change the defaults and hide some params.
-		$r['title']['defaultvalue'] = T_('Pages');
 		$r['title_link']['no_edit'] = true;
 		$r['item_type']['no_edit'] = true;
 		$r['follow_mainlist']['no_edit'] = true;
@@ -72,20 +74,11 @@
 
 
 	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Simple Page list');
-	}
-
-
-	/**
 	 * Get a very short desc. Used in the widget list.
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -94,7 +87,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Simplified Item list for listing pages.');
+		return $this->T_('Simplified Item list for listing pages.');
 	}
 
 
 
=== added directory 'blogs/plugins/coll_post_list_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_post_list.widget.php' => 'blogs/plugins/coll_post_list_widget/_coll_post_list.widget.php'
--- blogs/inc/widgets/widgets/_coll_post_list.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_post_list_widget/_coll_post_list.widget.php	2009-12-21 15:13:16 +0000
@@ -23,7 +23,8 @@
  */
 if( !defined('EVO_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
 
-load_class( 'widgets/widgets/_coll_item_list.widget.php' );
+$wiCache = get_Cache('WidgetCache');
+$wiCache->load_widget( 'coll_item_list' );
 
 /**
  * ComponentWidget Class
@@ -39,8 +40,10 @@
 	 */
 	function coll_post_list_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Simple Post list');
+		$this->widget_title = $this->T_('Contents');
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_post_list' );
+		parent::ComponentWidget( $db_row, 'widget', 'coll_post_list' );
 	}
 
 
@@ -55,7 +58,6 @@
 		// This is derived from coll_post_list_Widget, so we DO NOT ADD ANY param here!
 		$r = parent::get_param_definitions( $params );
 		// We only change the defaults and hide some params.
-		$r['title']['defaultvalue'] = T_('Contents');
 		$r['title_link']['no_edit'] = true;
 		$r['item_type']['no_edit'] = true;
 		$r['follow_mainlist']['no_edit'] = true;
@@ -72,20 +74,11 @@
 
 
 	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Simple Post list');
-	}
-
-
-	/**
 	 * Get a very short desc. Used in the widget list.
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -94,7 +87,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Simplified Item list for listing posts.');
+		return $this->T_('Simplified Item list for listing posts.');
 	}
 
 
 
=== added directory 'blogs/plugins/coll_related_post_list_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_related_post_list.widget.php' => 'blogs/plugins/coll_related_post_list_widget/_coll_related_post_list.widget.php'
--- blogs/inc/widgets/widgets/_coll_related_post_list.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_related_post_list_widget/_coll_related_post_list.widget.php	2009-12-21 15:13:16 +0000
@@ -23,7 +23,8 @@
  */
 if( !defined('EVO_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
 
-load_class( 'widgets/widgets/_coll_item_list.widget.php' );
+$wiCache = get_Cache('WidgetCache');
+$wiCache->load_widget( 'coll_item_list' );
 
 /**
  * ComponentWidget Class
@@ -39,8 +40,10 @@
 	 */
 	function coll_related_post_list_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Simple Related Posts list');
+		$this->widget_title = $this->T_('Related posts');
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_related_post_list' );
+		parent::ComponentWidget( $db_row, 'widget', 'coll_related_post_list' );
 	}
 
 
@@ -55,7 +58,6 @@
 		// This is derived from coll_post_list_Widget, so we DO NOT ADD ANY param here!
 		$r = parent::get_param_definitions( $params );
 		// We only change the defaults and hide some params.
-		$r['title']['defaultvalue'] = T_('Related posts');
 		$r['title_link']['no_edit'] = true;
 		$r['item_type']['no_edit'] = true;
 		$r['follow_mainlist']['no_edit'] = true;
@@ -72,20 +74,11 @@
 
 
 	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Simple Related Posts list');
-	}
-
-
-	/**
 	 * Get a very short desc. Used in the widget list.
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -94,7 +87,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Simplified Item list for listing posts related to the Main list.');
+		return $this->T_('Simplified Item list for listing posts related to the Main list.');
 	}
 
 
 
=== added directory 'blogs/plugins/coll_search_form_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_search_form.widget.php' => 'blogs/plugins/coll_search_form_widget/_coll_search_form.widget.php'
--- blogs/inc/widgets/widgets/_coll_search_form.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_search_form_widget/_coll_search_form.widget.php	2009-12-21 15:13:16 +0000
@@ -39,17 +39,10 @@
 	 */
 	function coll_search_form_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Search Form');
+		$this->widget_title = $this->T_('Search');
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_search_form' );
-	}
-
-
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Search Form');
+		parent::ComponentWidget( $db_row, 'widget', 'coll_search_form' );
 	}
 
 
@@ -58,7 +51,7 @@
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -67,7 +60,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Display search form');
+		return $this->T_('Display search form');
 	}
 
 
@@ -80,15 +73,9 @@
 	function get_param_definitions( $params )
 	{
 		$r = array_merge( array(
-				'title' => array(
-					'label' => T_('Block title'),
-					'note' => T_( 'Title to display in your skin.' ),
-					'size' => 40,
-					'defaultvalue' => T_('Search'),
-				),
 				'disp_search_options' => array(
-					'label' => T_( 'Search options' ),
-					'note' => T_( 'Display radio buttons for "All Words", "Some Word" and "Entire Phrase"' ),
+					'label' => $this->T_( 'Search options' ),
+					'note' => $this->T_( 'Display radio buttons for "All Words", "Some Word" and "Entire Phrase"' ),
 					'type' => 'checkbox',
 					'defaultvalue' => true,
 				),
@@ -124,12 +111,12 @@
 		{
 			$sentence = get_param( 'sentence' );
 			echo '<div class="search_options">';
-			echo '<div class="search_option"><input type="radio" name="sentence" value="AND" id="sentAND" '.( $sentence=='AND' ? 'checked="checked" ' : '' ).'/><label for="sentAND">'.T_('All Words').'</label></div>';
-			echo '<div class="search_option"><input type="radio" name="sentence" value="OR" id="sentOR" '.( $sentence=='OR' ? 'checked="checked" ' : '' ).'/><label for="sentOR">'.T_('Some Word').'</label></div>';
-			echo '<div class="search_option"><input type="radio" name="sentence" value="sentence" id="sentence" '.( $sentence=='sentence' ? 'checked="checked" ' : '' ).'/><label for="sentence">'.T_('Entire phrase').'</label></div>';
+			echo '<div class="search_option"><input type="radio" name="sentence" value="AND" id="sentAND" '.( $sentence=='AND' ? 'checked="checked" ' : '' ).'/><label for="sentAND">'.$this->T_('All Words').'</label></div>';
+			echo '<div class="search_option"><input type="radio" name="sentence" value="OR" id="sentOR" '.( $sentence=='OR' ? 'checked="checked" ' : '' ).'/><label for="sentOR">'.$this->T_('Some Word').'</label></div>';
+			echo '<div class="search_option"><input type="radio" name="sentence" value="sentence" id="sentence" '.( $sentence=='sentence' ? 'checked="checked" ' : '' ).'/><label for="sentence">'.$this->T_('Entire phrase').'</label></div>';
 			echo '</div>';
 		}
-		echo '<input type="submit" name="submit" class="submit" value="'.T_('Search').'" />';
+		echo '<input type="submit" name="submit" class="submit" value="'.$this->T_('Search').'" />';
 		echo '</form>';
 
 		echo $this->disp_params['block_end'];
 
=== added directory 'blogs/plugins/coll_tag_cloud_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_tag_cloud.widget.php' => 'blogs/plugins/coll_tag_cloud_widget/_coll_tag_cloud.widget.php'
--- blogs/inc/widgets/widgets/_coll_tag_cloud.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_tag_cloud_widget/_coll_tag_cloud.widget.php	2009-12-21 15:13:16 +0000
@@ -39,8 +39,10 @@
 	 */
 	function coll_tag_cloud_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Tag cloud');
+		$this->widget_title = $this->T_('Tag cloud');
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_tag_cloud' );
+		parent::ComponentWidget( $db_row, 'widget', 'coll_tag_cloud' );
 	}
 
 
@@ -60,20 +62,11 @@
 
 
 	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Tag cloud');
-	}
-
-
-	/**
 	 * Get a very short desc. Used in the widget list.
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -82,7 +75,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Cloud of all tags; click filters blog on selected tag.');
+		return $this->T_('Cloud of all tags; click filters blog on selected tag.');
 	}
 
 
@@ -95,33 +88,27 @@
 	function get_param_definitions( $params )
 	{
 		$r = array_merge( array(
-			'title' => array(
-					'type' => 'text',
-					'label' => T_('Block title'),
-					'defaultvalue' => T_('Tag cloud'),
-					'maxlength' => 100,
-				),
 			'max_tags' => array(
 					'type' => 'integer',
-					'label' => T_('Max # of tags'),
+					'label' => $this->T_('Max # of tags'),
 					'size' => 4,
 					'defaultvalue' => 50,
 				),
 			'tag_separator' => array(
 					'type' => 'text',
-					'label' => T_('Tag separator'),
+					'label' => $this->T_('Tag separator'),
 					'defaultvalue' => ' ',
 					'maxlength' => 100,
 				),
 			'tag_min_size' => array(
 					'type' => 'integer',
-					'label' => T_('Min size'),
+					'label' => $this->T_('Min size'),
 					'size' => 3,
 					'defaultvalue' => 8,
 				),
 			'tag_max_size' => array(
 					'type' => 'integer',
-					'label' => T_('Max size'),
+					'label' => $this->T_('Max size'),
 					'size' => 3,
 					'defaultvalue' => 22,
 				),
@@ -202,7 +189,7 @@
 
 			echo $Blog->get_tag_link( $row->tag_name, $tag_name_disp, array(
 				'style' => 'font-size: '.$size.'pt;',
-				'title' => sprintf( T_('%d posts'), $row->tag_count ) ) );
+				'title' => sprintf( $this->T_('%d posts'), $row->tag_count ) ) );
 			$count++;
 		}
 		echo $this->disp_params['tag_cloud_end'];
 
=== added directory 'blogs/plugins/coll_tagline_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_tagline.widget.php' => 'blogs/plugins/coll_tagline_widget/_coll_tagline.widget.php'
--- blogs/inc/widgets/widgets/_coll_tagline.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_tagline_widget/_coll_tagline.widget.php	2009-12-21 15:13:16 +0000
@@ -39,17 +39,10 @@
 	 */
 	function coll_tagline_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Blog tagline');
+		$this->widget_title = '';
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_tagline' );
-	}
-
-
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Blog tagline');
+		parent::ComponentWidget( $db_row, 'widget', 'coll_tagline' );
 	}
 
 
@@ -70,7 +63,7 @@
 	function get_desc()
 	{
 		global $Blog;
-		return sprintf( T_('&laquo;%s&raquo; from the blog\'s <a %s>general settings</a>.'),
+		return sprintf( $this->T_('&laquo;%s&raquo; from the blog\'s <a %s>general settings</a>.'),
 				'<strong>'.$Blog->dget('tagline').'</strong>', 'href="?ctrl=coll_settings&tab=general&blog='.$Blog->ID.'"' );
 	}
 
@@ -88,6 +81,8 @@
 
 		// Collection tagline:
 		echo $this->disp_params['block_start'];
+		$this->disp_title();
+
 		// TODO: there appears to be no possibility to wrap the tagline in e.g. "<h2>%s</h2>"
 		//       Should there be a widget param for this?  fp> probably yes
 		$Blog->disp( 'tagline', 'htmlbody' );
@@ -96,6 +91,4 @@
 		return true;
 	}
 }
-
-
 ?>
 
=== added directory 'blogs/plugins/coll_title_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_title.widget.php' => 'blogs/plugins/coll_title_widget/_coll_title.widget.php'
--- blogs/inc/widgets/widgets/_coll_title.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_title_widget/_coll_title.widget.php	2009-12-21 15:13:16 +0000
@@ -39,17 +39,10 @@
 	 */
 	function coll_title_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Blog title');
+		$this->widget_title = '';
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_title' );
-	}
-
-
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Blog title');
+		parent::ComponentWidget( $db_row, 'widget', 'coll_title' );
 	}
 
 
@@ -70,7 +63,7 @@
 	function get_desc()
 	{
 		global $Blog;
-		return sprintf( T_('&laquo;%s&raquo; from the blog\'s <a %s>general settings</a>.'),
+		return sprintf( $this->T_('&laquo;%s&raquo; from the blog\'s <a %s>general settings</a>.'),
 				'<strong>'.$Blog->dget('name').'</strong>', 'href="?ctrl=coll_settings&tab=general&blog='.$Blog->ID.'"' );
 	}
 
 
=== added directory 'blogs/plugins/coll_xml_feeds_widget'
=== renamed file 'blogs/inc/widgets/widgets/_coll_xml_feeds.widget.php' => 'blogs/plugins/coll_xml_feeds_widget/_coll_xml_feeds.widget.php'
--- blogs/inc/widgets/widgets/_coll_xml_feeds.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/coll_xml_feeds_widget/_coll_xml_feeds.widget.php	2009-12-21 15:13:16 +0000
@@ -39,17 +39,10 @@
 	 */
 	function coll_xml_feeds_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('XML Feeds (RSS / Atom)');
+		$this->widget_title = '$icon$ '.$this->T_('XML Feeds');
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'coll_xml_feeds' );
-	}
-
-
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('XML Feeds (RSS / Atom)');
+		parent::ComponentWidget( $db_row, 'widget', 'coll_xml_feeds' );
 	}
 
 
@@ -67,7 +60,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('List of all available XML feeds.');
+		return $this->T_('List of all available XML feeds.');
 	}
 
 
@@ -81,22 +74,16 @@
 	{
 		global $use_strict;
 		$r = array_merge( array(
-				'title' => array(
-					'label' => T_( 'Title' ),
-					'size' => 40,
-					'note' => T_( 'This is the title to display, $icon$ will be replaced by the feed icon' ),
-					'defaultvalue' => '$icon$ '.T_('XML Feeds'),
-				),
 				'disp_info_link' => array(
-					'label' => T_( 'Help link' ),
+					'label' => $this->T_( 'Help link' ),
 					'type' => 'checkbox',
-					'note' => T_( 'Check this to display "What is RSS?" link' ),
+					'note' => $this->T_( 'Check this to display "What is RSS?" link' ),
 					'defaultvalue' => 1,
 				),
 				'info_link' => array(
-					'label' => T_( 'New Window' ),
+					'label' => $this->T_( 'New Window' ),
 					'type' => 'checkbox',
-					'note' => T_( 'Check this to add target="_blank" to the "What is RSS?" link' ),
+					'note' => $this->T_( 'Check this to add target="_blank" to the "What is RSS?" link' ),
 					'defaultvalue' => !$use_strict,
 				),
 			), parent::get_param_definitions( $params )	);
@@ -109,7 +96,7 @@
 	{
 		global $rsc_url;
 
-		$title = str_replace( '$icon$', '<img src="'.$rsc_url.'icons/feed-icon-16x16.gif" width="16" height="16" class="top" alt="" /> ', $this->disp_params['title']);
+		$title = str_replace( '$icon$', '<img src="'.$rsc_url.'icons/feed-icon-16x16.gif" width="16" height="16" class="top" alt="" /> ', $this->disp_params['widget_title']);
 		// fp> TODO: support for different icon sizes and backgrounds (at least black and white; mid grey would be cool also)
 
 		return $title;
@@ -147,10 +134,10 @@
 
 			echo $this->disp_params['item_start'];
 			echo $Skin->name.': ';
-			echo '<a href="'.$Blog->get_item_feed_url( $Skin->folder ).'">'.T_('Posts').'</a>';
+			echo '<a href="'.$Blog->get_item_feed_url( $Skin->folder ).'">'.$this->T_('Posts').'</a>';
 			if ( $Blog->allowcomments != 'never' )
 			{
-				echo ', <a href="'.$Blog->get_comment_feed_url( $Skin->folder ).'">'.T_('Comments').'</a>';
+				echo ', <a href="'.$Blog->get_comment_feed_url( $Skin->folder ).'">'.$this->T_('Comments').'</a>';
 			}
 
 			echo $this->disp_params['item_end'];
 
=== added directory 'blogs/plugins/colls_list_owner_widget'
=== renamed file 'blogs/inc/widgets/widgets/_colls_list_owner.widget.php' => 'blogs/plugins/colls_list_owner_widget/_colls_list_owner.widget.php'
--- blogs/inc/widgets/widgets/_colls_list_owner.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/colls_list_owner_widget/_colls_list_owner.widget.php	2009-12-21 15:13:16 +0000
@@ -25,40 +25,29 @@
 
 load_class( 'widgets/model/_widget.class.php' );
 
+$wiCache = get_Cache('WidgetCache');
+$wiCache->load_widget( 'colls_list' );
+
 /**
  * ComponentWidget Class
  *
  * A ComponentWidget is a displayable entity that can be placed into a Container on a web page.
  *
+ * @deprecated replaced with coll_list_Widget
+ *
  * @package widgets
  */
-class colls_list_owner_Widget extends ComponentWidget
+class colls_list_owner_Widget extends colls_list_Widget
 {
 	/**
 	 * Constructor
 	 */
 	function colls_list_owner_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Same owner\'s blog list');
+		$this->widget_title = '';
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'colls_list_owner' );
-	}
-
-
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Same owner\'s blog list');
-	}
-
-
-	/**
-	 * Get a very short desc. Used in the widget list.
-	 */
-	function get_short_desc()
-	{
-		return format_to_output($this->disp_params['title']);
+		parent::ComponentWidget( $db_row, 'widget', 'colls_list_owner' );
 	}
 
 
@@ -67,7 +56,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Display list of all blogs owned by the same user.');
+		return $this->T_('Display list of all blogs owned by the same user.');
 	}
 
 
@@ -79,34 +68,12 @@
 	 */
 	function get_param_definitions( $params )
 	{
-		global $use_strict;
-		$r = array_merge( array(
-				'title' => array(
-					'label' => T_( 'Title' ),
-					'size' => 40,
-					'note' => T_( 'This is the title to display, $icon$ will be replaced by the feed icon' ),
-					'defaultvalue' => T_('My blogs'),
-				),
-			), parent::get_param_definitions( $params )	);
+		$r = parent::get_param_definitions( $params );
 
+		$r['coll_list_type']['type'] = 'text';
+		$r['coll_list_type']['defaultvalue'] = 'owner';
+		$r['coll_list_type']['no_edit'] = true;
 		return $r;
 	}
-
-
-	/**
-	 * Display the widget!
-	 *
-	 * @param array MUST contain at least the basic display params
-	 */
-	function display( $params )
-	{
-		$this->init_display( $params );
-
-		$this->disp_coll_list( 'owner' );
-
-		return true;
-	}
 }
-
-
 ?>
 \ No newline at end of file
 
=== added directory 'blogs/plugins/colls_list_public_widget'
=== renamed file 'blogs/inc/widgets/widgets/_colls_list_public.widget.php' => 'blogs/plugins/colls_list_public_widget/_colls_list_public.widget.php'
--- blogs/inc/widgets/widgets/_colls_list_public.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/colls_list_public_widget/_colls_list_public.widget.php	2009-12-21 15:13:16 +0000
@@ -25,40 +25,29 @@
 
 load_class( 'widgets/model/_widget.class.php' );
 
+$wiCache = get_Cache('WidgetCache');
+$wiCache->load_widget( 'colls_list' );
+
 /**
  * ComponentWidget Class
  *
  * A ComponentWidget is a displayable entity that can be placed into a Container on a web page.
  *
+ * @deprecated replaced with coll_list_Widget
+ *
  * @package widgets
  */
-class colls_list_public_Widget extends ComponentWidget
+class colls_list_public_Widget extends colls_list_Widget
 {
 	/**
 	 * Constructor
 	 */
 	function colls_list_public_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Public blog list');
+		$this->widget_title = '';
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'colls_list_public' );
-	}
-
-
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Public blog list');
-	}
-
-
-	/**
-	 * Get a very short desc. Used in the widget list.
-	 */
-	function get_short_desc()
-	{
-		return format_to_output($this->disp_params['title']);
+		parent::ComponentWidget( $db_row, 'widget', 'colls_list_public' );
 	}
 
 
@@ -67,7 +56,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Display list of all blogs marked as public.');
+		return $this->T_('Display list of all blogs marked as public.');
 	}
 
 
@@ -79,34 +68,12 @@
 	 */
 	function get_param_definitions( $params )
 	{
-		global $use_strict;
-		$r = array_merge( array(
-				'title' => array(
-					'label' => T_( 'Title' ),
-					'size' => 40,
-					'note' => T_( 'This is the title to display, $icon$ will be replaced by the feed icon' ),
-					'defaultvalue' => T_('All blogs'),
-				),
-			), parent::get_param_definitions( $params )	);
+		$r = parent::get_param_definitions( $params );
 
+		$r['coll_list_type']['type'] = 'text';
+		$r['coll_list_type']['defaultvalue'] = 'public';
+		$r['coll_list_type']['no_edit'] = true;
 		return $r;
 	}
-
-
-	/**
-	 * Display the widget!
-	 *
-	 * @param array MUST contain at least the basic display params
-	 */
-	function display( $params )
-	{
-		$this->init_display( $params );
-
-		$this->disp_coll_list( 'public' );
-
-		return true;
-	}
 }
-
-
-?>
 \ No newline at end of file
+?>
 
=== added directory 'blogs/plugins/colls_list_widget'
=== added file 'blogs/plugins/colls_list_widget/_colls_list.widget.php'
--- blogs/plugins/colls_list_widget/_colls_list.widget.php	1970-01-01 00:00:00 +0000
+++ blogs/plugins/colls_list_widget/_colls_list.widget.php	2009-12-21 15:13:16 +0000
@@ -0,0 +1,171 @@
+<?php
+/**
+ * This file implements the Colls List Widget class.
+ *
+ * This file is part of the QuamPlures framework - {@link http://quamplures.net/}
+ *
+ * @copyright (c)2009 by QuamPlures - {@link http://quamplures.net/}
+ *
+ * {@internal License choice
+ * - If you have received this file as part of a package, please find the license.txt file in
+ *   the same folder or the closest folder above for complete license terms.
+ * - If you have received this file individually
+ *   then you must choose one of the following licenses before using the file:
+ *   - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
+ *   - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
+ * }}
+ *
+ * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
+ * @author yabs.
+ *
+ * @package widgets
+ */
+if( !defined('EVO_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
+
+// dependency
+load_class( 'widgets/model/_widget.class.php' );
+
+/**
+ * Colls List Class
+ *
+ * Displays a list of public or same owner blogs
+ *
+ * @package widgets
+ */
+class colls_list_Widget extends ComponentWidget
+{
+	/**
+	 * Constructor
+	 */
+	function colls_list_Widget( $db_row = NULL )
+	{
+		$this->widget_name = $this->T_('Blog List');
+		$this->widget_title = '';
+		// Call parent constructor:
+		parent::ComponentWidget( $db_row, 'widget', 'colls_list' );
+	}
+
+
+	/**
+	 * Get a very short desc. Used in the widget list.
+	 */
+	function get_short_desc()
+	{
+		return format_to_output($this->disp_params['widget_title']);
+	}
+
+
+  /**
+	 * Get short description
+	 */
+	function get_desc()
+	{
+		return $this->T_('Display chosen list of blogs.');
+	}
+
+
+  /**
+   * Get definitions for editable params
+   *
+	 * @see Plugin::GetDefaultSettings()
+	 * @param local params like 'for_editing' => true
+	 */
+	function get_param_definitions( $params )
+	{
+		$r = array_merge( array(
+				'coll_list_type' => array(
+					'label' => $this->T_( 'List' ),
+					'type' => 'select',
+					'options' => array(
+						'owner' => $this->T_('Same owner'),
+						'public' => $this->T_('Public' ),
+					),
+					'note' => $this->T_( 'Blogs to list' ),
+					'defaultvalue' => 'public',
+				),
+			), parent::get_param_definitions( $params )	);
+
+		return $r;
+	}
+
+
+	/**
+	 * Display the widget!
+	 *
+	 * @param array MUST contain at least the basic display params
+	 */
+	function display( $params )
+	{
+		$this->init_display( $params );
+
+		/**
+		 * @var Blog
+		 */
+		global $Blog, $baseurl;
+
+		echo $this->disp_params['block_start'];
+
+		$this->disp_title();
+
+		/**
+		 * @var BlogCache
+		 */
+		$BlogCache = & get_Cache( 'BlogCache' );
+
+		if( $this->disp_params['coll_list_type'] == 'owner' )
+		{	// Load blogs of same owner
+			$blog_array = $BlogCache->load_owner_blogs( $Blog->owner_user_ID, 'ID' );
+		}
+		else
+		{	// Load all public blogs
+			$blog_array = $BlogCache->load_public( 'ID' );
+		}
+
+		if( !empty( $blog_array ) )
+		{
+			echo $this->disp_params['list_start'];
+
+			foreach( $blog_array as $l_blog_ID )
+			{	// Loop through all blogs:
+
+				$l_Blog = & $BlogCache->get_by_ID( $l_blog_ID );
+
+				if( $Blog && $l_blog_ID == $Blog->ID )
+				{ // This is the blog being displayed on this page:
+				echo $this->disp_params['item_selected_start'];
+					$link_class = $this->disp_params['link_selected_class'];
+				}
+				else
+				{
+					echo $this->disp_params['item_start'];
+					$link_class = $this->disp_params['link_default_class'];;
+				}
+
+				echo '<a href="'.$l_Blog->gen_blogurl().'" class="'.$link_class.'" title="'
+											.$l_Blog->dget( 'name', 'htmlattr' ).'">';
+
+				if( $Blog && $l_blog_ID == $Blog->ID )
+				{ // This is the blog being displayed on this page:
+					echo $this->disp_params['item_selected_text_start'];
+					printf( $this->disp_params['item_selected_text'], $l_Blog->dget( 'shortname', 'htmlbody' ) );
+					echo $this->disp_params['item_selected_text_end'];
+					echo '</a>';
+					echo $this->disp_params['item_selected_end'];
+				}
+				else
+				{
+					echo $this->disp_params['item_text_start'];
+					printf( $this->disp_params['item_text'], $l_Blog->dget( 'shortname', 'htmlbody' ) );
+					echo $this->disp_params['item_text_end'];
+					echo '</a>';
+					echo $this->disp_params['item_end'];
+				}
+			}
+
+			echo $this->disp_params['list_end'];
+		}
+
+		echo $this->disp_params['block_end'];
+	}
+}
+?>
 \ No newline at end of file
 
=== added directory 'blogs/plugins/free_html_widget'
=== renamed file 'blogs/inc/widgets/widgets/_free_html.widget.php' => 'blogs/plugins/free_html_widget/_free_html.widget.php'
--- blogs/inc/widgets/widgets/_free_html.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/free_html_widget/_free_html.widget.php	2009-12-21 15:13:16 +0000
@@ -39,18 +39,10 @@
 	 */
 	function free_html_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_( 'Free HTML' );
+		$this->widget_title = '';
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'free_html' );
-	}
-
-
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		$title = T_( 'Free HTML' );
-		return $title;
+		parent::ComponentWidget( $db_row, 'widget', 'free_html' );
 	}
 
 
@@ -62,12 +54,12 @@
 	 */
 	function get_short_desc()
 	{
-		if( empty( $this->disp_params['title'] ) )
+		if( empty( $this->disp_params['widget_title'] ) )
 		{
 			return strmaxlen( htmlspecialchars( $this->disp_params['content'] ), 60 );
 		}
 
-		return format_to_output( $this->disp_params['title'] );
+		return format_to_output( $this->disp_params['widget_title'] );
 	}
 
 
@@ -76,7 +68,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Custom text/HTML of your choice.');
+		return $this->T_('Custom text/HTML of your choice.');
 	}
 
 
@@ -90,13 +82,9 @@
 	{
 		// Demo data:
 		$r = array_merge( array(
-				'title' => array(
-					'label' => T_('Block title'),
-					'size' => 60,
-				),
 				'content' => array(
 					'type' => 'html_textarea',
-					'label' => T_('Block content'),
+					'label' => $this->T_('Block content'),
 					'rows' => 10,
 				),
 			), parent::get_param_definitions( $params )	);
@@ -120,7 +108,7 @@
 		// Collection common links:
 		echo $this->disp_params['block_start'];
 
-		$this->disp_title( $this->disp_params['title'] );
+		$this->disp_title();
 
 		echo format_to_output( $this->disp_params['content'] );
 
 
=== added directory 'blogs/plugins/linkblog_widget'
=== renamed file 'blogs/inc/widgets/widgets/_linkblog.widget.php' => 'blogs/plugins/linkblog_widget/_linkblog.widget.php'
--- blogs/inc/widgets/widgets/_linkblog.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/linkblog_widget/_linkblog.widget.php	2009-12-21 15:13:16 +0000
@@ -23,7 +23,8 @@
  */
 if( !defined('EVO_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
 
-load_class( 'widgets/widgets/_coll_item_list.widget.php' );
+$wiCache = get_Cache('WidgetCache');
+$wiCache->load_widget( 'coll_item_list' );
 
 /**
  * linkblog_widget class
@@ -39,8 +40,10 @@
 	 */
 	function linkblog_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Simple Linkblog Links list');
+		$this->widget_title = $this->T_('Linkblog');
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'linkblog' );
+		parent::ComponentWidget( $db_row, 'widget', 'linkblog' );
 	}
 
 
@@ -55,7 +58,6 @@
 		// This is derived from coll_post_list_Widget, so we DO NOT ADD ANY param here!
 		$r = parent::get_param_definitions( $params );
 		// We only change the defaults and hide some params.
-		$r['title']['defaultvalue'] = T_('Linkblog');
 		$r['title_link']['no_edit'] = true;
 		$r['follow_mainlist']['no_edit'] = true;
 		$r['blog_ID']['defaultvalue'] = 0;		// zero is a magic number that we'll use to try and use defaults used in previous versions of B2evo
@@ -72,20 +74,11 @@
 
 
 	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Simple Linkblog Links list');
-	}
-
-
-	/**
 	 * Get a very short desc. Used in the widget list.
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -94,7 +87,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Simplified Item list for listing links from another blog.');
+		return $this->T_('Simplified Item list for listing links from another blog.');
 	}
 
 
 
=== added directory 'blogs/plugins/menu_link_widget'
=== renamed file 'blogs/inc/widgets/widgets/_menu_link.widget.php' => 'blogs/plugins/menu_link_widget/_menu_link.widget.php'
--- blogs/inc/widgets/widgets/_menu_link.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/menu_link_widget/_menu_link.widget.php	2009-12-21 15:13:16 +0000
@@ -25,15 +25,6 @@
 
 load_class( 'widgets/model/_widget.class.php' );
 
-global $menu_link_widget_link_types;
-$menu_link_widget_link_types = array(
-		'home' => T_('Blog home'),
-		'arcdir' => T_('Archive directory'),
-		'catdir' => T_('Category directory'),
-		'latestcomments' => T_('Latest comments'),
-		'ownercontact' => T_('Blog owner contact form'),
-		'login' => T_('Log in form')
-	);
 
 /**
  * ComponentWidget Class
@@ -44,22 +35,26 @@
  */
 class menu_link_Widget extends ComponentWidget
 {
+
+	var $menu_link_widget_link_types = array();
+
 	/**
 	 * Constructor
 	 */
 	function menu_link_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('Menu link');
+		$this->widget_title = '';
+		$this->menu_link_widget_link_types = array(
+				'home' => $this->T_('Blog home'),
+				'arcdir' => $this->T_('Archive directory'),
+				'catdir' => $this->T_('Category directory'),
+				'latestcomments' => $this->T_('Latest comments'),
+				'ownercontact' => $this->T_('Blog owner contact form'),
+				'login' => $this->T_('Log in form')
+			);
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'menu_link' );
-	}
-
-
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('Menu link');
+		parent::ComponentWidget( $db_row, 'widget', 'menu_link' );
 	}
 
 
@@ -68,14 +63,12 @@
 	 */
 	function get_short_desc()
 	{
-		global $menu_link_widget_link_types;
-
 		$this->load_param_array();
 
 		if( !empty($this->param_array['link_type']) )
 		{
 			// TRANS: %s is the link type, e. g. "Blog home" or "Log in form"
-			return sprintf( T_( '%s link' ), $menu_link_widget_link_types[$this->param_array['link_type']] );
+			return sprintf( $this->T_( '%s link' ), $this->menu_link_widget_link_types[$this->param_array['link_type']] );
 		}
 		else
 		{
@@ -90,7 +83,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Display a configurable menu entry/link');
+		return $this->T_('Display a configurable menu entry/link');
 	}
 
 
@@ -102,14 +95,13 @@
 	 */
 	function get_param_definitions( $params )
 	{
-		global $menu_link_widget_link_types;
 
 		$r = array_merge( array(
 				'link_type' => array(
-					'label' => T_( 'Link Type' ),
-					'note' => T_('What do you want to link to?'),
+					'label' => $this->T_( 'Link Type' ),
+					'note' => $this->T_('What do you want to link to?'),
 					'type' => 'select',
-					'options' => $menu_link_widget_link_types,
+					'options' => $this->menu_link_widget_link_types,
 					'defaultvalue' => 'home',
 				),
 			), parent::get_param_definitions( $params )	);
@@ -133,43 +125,44 @@
 		{
 			case 'arcdir':
 				$url = $Blog->get('arcdirurl');
-				$text = T_('Archives');
+				$text = $this->T_('Archives');
 				break;
 
 			case 'catdir':
 				$url = $Blog->get('catdirurl');
-				$text = T_('Categories');
+				$text = $this->T_('Categories');
 				break;
 
 			case 'latestcomments':
 				$url = $Blog->get('lastcommentsurl');
-				$text = T_('Latest comments');
+				$text = $this->T_('Latest comments');
 				break;
 
 			case 'ownercontact':
 				$Blog->get_owner_User();
-				// fp> TODO: move this test into $Blog->get_contact_url( true ); 
+				// fp> TODO: move this test into $Blog->get_contact_url( true );
 				if( ! $Blog->owner_User->allow_msgform )
 				{ // user does not allow contact form
 					return;
 				}
 				$url = $Blog->get_contact_url( true );
-				$text = T_('Contact');
+				$text = $this->T_('Contact');
 				break;
 
 			case 'login':
 				if( is_logged_in() ) return false;
 				$url = get_login_url();
-				$text = T_('Log in');
+				$text = $this->T_('Log in');
 				break;
 
 			case 'home':
 			default:
 				$url = $Blog->get('url');
-				$text = T_('Home');
+				$text = $this->T_('Home');
 		}
 
 		echo $this->disp_params['block_start'];
+		$this->disp_title();
 		echo $this->disp_params['list_start'];
 
 		echo $this->disp_params['item_start'];
@@ -182,6 +175,4 @@
 		return true;
 	}
 }
-
-
 ?>
 
=== added directory 'blogs/plugins/user_tools_widget'
=== renamed file 'blogs/inc/widgets/widgets/_user_tools.widget.php' => 'blogs/plugins/user_tools_widget/_user_tools.widget.php'
--- blogs/inc/widgets/widgets/_user_tools.widget.php	2009-12-06 09:37:19 +0000
+++ blogs/plugins/user_tools_widget/_user_tools.widget.php	2009-12-21 15:13:16 +0000
@@ -39,8 +39,10 @@
 	 */
 	function user_tools_Widget( $db_row = NULL )
 	{
+		$this->widget_name = $this->T_('User Tools');
+		$this->widget_title = $this->T_('User tools');
 		// Call parent constructor:
-		parent::ComponentWidget( $db_row, 'core', 'user_tools' );
+		parent::ComponentWidget( $db_row, 'widget', 'user_tools' );
 	}
 
 
@@ -53,74 +55,60 @@
 	function get_param_definitions( $params )
 	{
 		$r = array_merge( array(
-			'title' => array(
-				'label' => T_('Block title'),
-				'note' => T_( 'Title to display in your skin.' ),
-				'size' => 40,
-				'defaultvalue' => T_('User tools'),
-			),
 			'user_login_link' => array(
-				'label' => T_( 'Login link'),
+				'label' => $this->T_( 'Login link'),
 				'size' => 40,
-				'note' => T_( 'Link text to display' ),
+				'note' => $this->T_( 'Link text to display' ),
 				'type' => 'text',
-				'defaultvalue' => T_( 'Login' ),
+				'defaultvalue' => $this->T_( 'Login' ),
 			),
 			'user_logout_link' => array(
-				'label' => T_( 'Logout link'),
+				'label' => $this->T_( 'Logout link'),
 				'size' => 40,
-				'note' => T_( 'Link text to display' ),
+				'note' => $this->T_( 'Link text to display' ),
 				'type' => 'text',
-				'defaultvalue' => T_( 'Logout' ),
+				'defaultvalue' => $this->T_( 'Logout' ),
 			),
 			'user_profile_link' => array(
-				'label' => T_( 'Profile link'),
+				'label' => $this->T_( 'Profile link'),
 				'size' => 40,
-				'note' => T_( 'Link text to display' ),
+				'note' => $this->T_( 'Link text to display' ),
 				'type' => 'text',
-				'defaultvalue' => T_( 'Profile' ),
+				'defaultvalue' => $this->T_( 'Profile' ),
 			),
 			'user_subs_link' => array(
-				'label' => T_( 'Subscriptions link'),
+				'label' => $this->T_( 'Subscriptions link'),
 				'size' => 40,
-				'note' => T_( 'Link text to display' ),
+				'note' => $this->T_( 'Link text to display' ),
 				'type' => 'text',
-				'defaultvalue' => T_( 'Subscriptions' ),
+				'defaultvalue' => $this->T_( 'Subscriptions' ),
 			),
 			'user_admin_link' => array(
-				'label' => T_( 'Admin link'),
+				'label' => $this->T_( 'Admin link'),
 				'size' => 40,
-				'note' => T_( 'Link text to display' ),
+				'note' => $this->T_( 'Link text to display' ),
 				'type' => 'text',
-				'defaultvalue' => T_( 'Admin' ),
+				'defaultvalue' => $this->T_( 'Admin' ),
 			),
 			'user_register_link' => array(
-				'label' => T_( 'Register link'),
+				'label' => $this->T_( 'Register link'),
 				'size' => 40,
-				'note' => T_( 'Link text to display' ),
+				'note' => $this->T_( 'Link text to display' ),
 				'type' => 'text',
-				'defaultvalue' => T_( 'Register' ),
+				'defaultvalue' => $this->T_( 'Register' ),
 			),
 		), parent::get_param_definitions( $params )	);
 
 		return $r;
 	}
 
-	/**
-	 * Get name of widget
-	 */
-	function get_name()
-	{
-		return T_('User Tools');
-	}
-
 
 	/**
 	 * Get a very short desc. Used in the widget list.
 	 */
 	function get_short_desc()
 	{
-		return format_to_output($this->disp_params['title']);
+		return format_to_output($this->disp_params['widget_title']);
 	}
 
 
@@ -129,7 +117,7 @@
 	 */
 	function get_desc()
 	{
-		return T_('Display user tools: Log in, Admin, Profile, Subscriptions, Log out');
+		return $this->T_('Display user tools: Log in, Admin, Profile, Subscriptions, Log out');
 	}
 
 
@@ -145,9 +133,7 @@
 		// User tools:
 		echo $this->disp_params['block_start'];
 
-		echo $this->disp_params['block_title_start'];
-		echo $this->disp_params['title'];
-		echo $this->disp_params['block_title_end'];
+		$this->disp_title();
 
 		echo $this->disp_params['list_start'];
 		user_login_link( $this->disp_params['item_start'], $this->disp_params['item_end'], $this->disp_params[ 'user_login_link' ] );
 
=== modified file 'blogs/skins/asevo/style.css'
--- blogs/skins/asevo/style.css	2009-07-21 22:11:10 +0000
+++ blogs/skins/asevo/style.css	2009-12-21 15:13:19 +0000
@@ -151,7 +151,7 @@
 	margin: 2em 0 0 0;
 	padding: 0;
 }
-div.evo_title_area div.widget_core_coll_tagline {
+div.evo_title_area div.widget_widget_coll_tagline {
 	letter-spacing: 4px;
 	margin: 1ex 0;
 }
@@ -284,12 +284,12 @@
  * Special SideItems:
  */
 .widget_plugin_evo_Calr,
-.widget_core_coll_title,
-.widget_core_coll_longdesc {
+.widget_widget_coll_title,
+.widget_widget_coll_longdesc {
 	padding: 0;
 }
-.widget_core_coll_title,
-.widget_core_coll_longdesc {
+.widget_widget_coll_title,
+.widget_widget_coll_longdesc {
 	border-bottom: none;
 }
 
 
=== modified file 'blogs/skins/custom/style.css'
--- blogs/skins/custom/style.css	2009-07-21 22:11:10 +0000
+++ blogs/skins/custom/style.css	2009-12-21 15:13:19 +0000
@@ -164,7 +164,7 @@
 	color: #9ae;
 }
 
-.widget_core_coll_tagline {
+.widget_widget_coll_tagline {
 	color: #fff;
 	letter-spacing: 4px;
 	text-align: center;
@@ -303,13 +303,13 @@
 
 /* Special SideItems: */
 .widget_plugin_evo_Calr,
-.widget_core_coll_title,
-.widget_core_coll_longdesc {
+.widget_widget_coll_title,
+.widget_widget_coll_longdesc {
 	/* background-color: #fee; */
 	padding: 0;
 	border-bottom: 0;
 }
-.widget_core_coll_title a {
+.widget_widget_coll_title a {
 	text-decoration: none;
 	color: #78a;
 }
 
=== modified file 'blogs/skins/evocamp/style.css'
--- blogs/skins/evocamp/style.css	2009-07-21 22:11:10 +0000
+++ blogs/skins/evocamp/style.css	2009-12-21 15:13:19 +0000
@@ -355,7 +355,7 @@
 
 /* -------------------[ Misc Tags and Classes ]------------------- */
 
-#header .widget_core_coll_tagline {
+#header .widget_widget_coll_tagline {
 color:#FAF7E8;
 font-size: 12pt;
 padding: 0 100px;
@@ -599,6 +599,6 @@
 text-decoration: underline;
 }
 
-div.widget_core_coll_title {
+div.widget_widget_coll_title {
 	padding-top: 45px;
 }
 
=== modified file 'blogs/skins/evopress/style.css'
--- blogs/skins/evopress/style.css	2009-07-21 22:11:10 +0000
+++ blogs/skins/evopress/style.css	2009-12-21 15:13:19 +0000
@@ -483,7 +483,7 @@
 }
 
 
-div.widget_core_coll_title {
+div.widget_widget_coll_title {
 	padding-top: 70px;
 }
 
 
=== modified file 'blogs/skins/glossyblue/style.css'
--- blogs/skins/glossyblue/style.css	2009-07-21 22:11:10 +0000
+++ blogs/skins/glossyblue/style.css	2009-12-21 15:13:19 +0000
@@ -112,7 +112,7 @@
 	height: 60px;
 }
 
-#header .widget_core_coll_tagline{
+#header .widget_widget_coll_tagline{
 	position: absolute;
 	left: 110px;
 	bottom: 3px;
@@ -420,13 +420,13 @@
 }
 /*blogroll */
 ul.list-blogroll li,
-li.widget_core_linkblog ul li ul li{
+li.widget_widget_linkblog ul li ul li{
 	background: url(img/mini-blogroll.gif) no-repeat  !important;
 	padding-left: 16px !important;
 }
 /*category widget */
 ul.list-cat li, li.widget_categories li,
-li.widget_core_coll_category_list ul li{
+li.widget_widget_coll_category_list ul li{
 	background: url(img/mini-category.gif) no-repeat  !important;
 	padding-left: 20px !important;
 }
@@ -439,7 +439,7 @@
 /*pages widget */
 ul.list-page li, li.widget_pages li,
 li.widget_recent_entries li,
-li.widget_core_coll_page_list ul li{
+li.widget_widget_coll_page_list ul li{
 	background: url(img/mini-page.gif) no-repeat  !important;
 	padding-left: 20px !important;
 }
@@ -528,25 +528,25 @@
 }
 
 
-#footer div.widget_core_coll_comment_list ul {
+#footer div.widget_widget_coll_comment_list ul {
 	list-style: none;
 	padding: 0px;
 }
 
-#footer div.widget_core_coll_comment_list ul li {
+#footer div.widget_widget_coll_comment_list ul li {
 	background: url(img/mini-footer-comments.gif) no-repeat;
 	padding: 0px 0px 10px 20px;
 }
 
-#footer div.widget_core_coll_page_list ul,
-#footer div.widget_core_coll_post_list ul {
+#footer div.widget_widget_coll_page_list ul,
+#footer div.widget_widget_coll_post_list ul {
 	list-style: none;
 	padding: 0px;
 	font-size: 92%;
 	line-height: 110%;
 }
-#footer div.widget_core_coll_page_list ul li,
-#footer div.widget_core_coll_post_list ul li {
+#footer div.widget_widget_coll_page_list ul li,
+#footer div.widget_widget_coll_post_list ul li {
 	background: url(img/mini-footer-post.gif) no-repeat;
 	padding: 0px 0px 10px 20px;
 	font-size: 107%;
 
=== modified file 'blogs/skins/miami_blue/style.css'
--- blogs/skins/miami_blue/style.css	2009-07-21 22:11:10 +0000
+++ blogs/skins/miami_blue/style.css	2009-12-21 15:13:19 +0000
@@ -117,7 +117,7 @@
 	color: #fff;
 	text-decoration: none;
 }
-div.pageHeader div.widget_core_coll_tagline {
+div.pageHeader div.widget_widget_coll_tagline {
 	color: #fff;
 	letter-spacing: 2px;
 	margin: 3px 0 0 13px;
 
=== modified file 'blogs/skins/natural_pink/style.css'
--- blogs/skins/natural_pink/style.css	2009-07-21 22:11:10 +0000
+++ blogs/skins/natural_pink/style.css	2009-12-21 15:13:19 +0000
@@ -155,7 +155,7 @@
 div.pageHeader h1 a:hover {
 	color: #c0c;
 }
-div.pageHeader div.widget_core_coll_tagline {
+div.pageHeader div.widget_widget_coll_tagline {
 	letter-spacing: 4px;
 	margin: 1ex 0;
 	font-size: 109%;
@@ -254,11 +254,11 @@
 
 /* Special SideItems: */
 .widget_plugin_evo_Calr,
-.widget_core_coll_title,
-.widget_core_coll_longdesc {
+.widget_widget_coll_title,
+.widget_widget_coll_longdesc {
 	padding: 0;
 }
-.widget_core_coll_title a {
+.widget_widget_coll_title a {
 	color: #f09;
 }
 
 
=== modified file 'blogs/skins/nifty_corners/style.css'
--- blogs/skins/nifty_corners/style.css	2009-07-21 22:11:10 +0000
+++ blogs/skins/nifty_corners/style.css	2009-12-21 15:13:19 +0000
@@ -165,7 +165,7 @@
 div.pageHeader h1 a:hover {
 	color: #c0c;
 }
-div.pageHeader div.widget_core_coll_tagline {
+div.pageHeader div.widget_widget_coll_tagline {
 	letter-spacing: 4px;
 	padding: 0 0 3px 0;
 	font-size: 109%;
@@ -268,11 +268,11 @@
 
 /* Special SideItems: */
 .widget_plugin_evo_Calr,
-.widget_core_coll_title,
-.widget_core_coll_longdesc {
+.widget_widget_coll_title,
+.widget_widget_coll_longdesc {
 	padding: 0;
 }
-.widget_core_coll_title a {
+.widget_widget_coll_title a {
 	color: #06a3c4;
 }
 
 
=== modified file 'blogs/skins/pixelgreen/style.css'
--- blogs/skins/pixelgreen/style.css	2009-07-21 22:11:10 +0000
+++ blogs/skins/pixelgreen/style.css	2009-12-21 15:13:19 +0000
@@ -153,7 +153,7 @@
 	margin: 0 auto; padding: 0;
 	position: relative;
 }
-#header-content .widget_core_coll_title h1 a {
+#header-content .widget_widget_coll_title h1 a {
 	font: bold 40px 'Trebuchet MS', Sans-serif;
 	letter-spacing: -2px;
 	color: #FFF;
@@ -162,7 +162,7 @@
 
 }
 
-#header-content .widget_core_coll_tagline {
+#header-content .widget_widget_coll_tagline {
 	font: bold 12px 'Trebuchet Ms', Sans-serif;
 	text-transform: none;
 	color: #FFF;
@@ -382,7 +382,7 @@
 .clear { clear: both; }
 .gray  { color: #BFBFBF; }
 
-#sidebar .widget_core_coll_xml_feeds ul.sidemenu li a {
+#sidebar .widget_widget_coll_xml_feeds ul.sidemenu li a {
   display: inline;
 }
 
 
=== modified file 'blogs/skins/terrafirma/style.css'
--- blogs/skins/terrafirma/style.css	2009-12-05 14:46:02 +0000
+++ blogs/skins/terrafirma/style.css	2009-12-21 15:13:19 +0000
@@ -152,7 +152,7 @@
 	text-decoration:none;
 	border:none;
 }
-.widget_core_coll_tagline
+.widget_widget_coll_tagline
 {
 	font-size: 100%;
 	font-weight: normal;
 
=== modified file 'blogs/skins/vastitude/style.css'
--- blogs/skins/vastitude/style.css	2009-12-05 14:46:02 +0000
+++ blogs/skins/vastitude/style.css	2009-12-21 15:13:19 +0000
@@ -9,17 +9,17 @@
 	font:86% Tahoma, "Lucida Sans", Arial, Verdana, Sans-Serif;
 	background:#4c4c4e;}
 
-li.widget_core_coll_title, li.widget_core_coll_longdesc, li.widget_plugin_evo_Calr, li.widget_core_coll_search_form, li.widget_core_linkblog, li.widget_core_coll_category_list, li.widget_core_coll_common_links, li.widget_core_coll_xml_feeds, li.widget_core_user_tools, li.widget_core_coll_xml_feeds ul li, li.prevnext {list-style:none;}
+li.widget_widget_coll_title, li.widget_widget_coll_longdesc, li.widget_plugin_evo_Calr, li.widget_widget_coll_search_form, li.widget_widget_linkblog, li.widget_widget_coll_category_list, li.widget_widget_coll_common_links, li.widget_widget_coll_xml_feeds, li.widget_widget_user_tools, li.widget_widget_coll_xml_feeds ul li, li.prevnext {list-style:none;}
 table.prevnext_post {margin: 20px 0;}
 div#sidebar {margin-left:-10px;}
 div#sidebar h2 {font: 1.4em Tahoma, "Lucida Sans", Arial, Verdana, Sans-Serif;color:#4b3528;}
-li.widget_core_coll_title h2 a {font-size: 1.1em; text-decoration:none;}
-li.widget_core_coll_search_form h2 {}
-
-li.widget_core_coll_xml_feeds h2 img {display:none;}
-li.widget_core_coll_xml_feeds {background:url(img/vast_rss.gif) top left no-repeat; margin-top:28px;padding-top:50px;}
-
-li.widget_core_coll_longdesc, li.widget_core_coll_search_form, li.widget_core_coll_category_list, li.widget_core_coll_common_links, li.widget_core_coll_xml_feeds {margin-bottom:20px;}
+li.widget_widget_coll_title h2 a {font-size: 1.1em; text-decoration:none;}
+li.widget_widget_coll_search_form h2 {}
+
+li.widget_widget_coll_xml_feeds h2 img {display:none;}
+li.widget_widget_coll_xml_feeds {background:url(img/vast_rss.gif) top left no-repeat; margin-top:28px;padding-top:50px;}
+
+li.widget_widget_coll_longdesc, li.widget_widget_coll_search_form, li.widget_widget_coll_category_list, li.widget_widget_coll_common_links, li.widget_widget_coll_xml_feeds {margin-bottom:20px;}
 
 /* COLOR MANAGEMENT */