Merge lp:~edb/quam-plures/yet_another_image_branch into lp:quam-plures

[EdB]

http://forums.quamplures.net/viewtopic.php?p=4970#p4970 sums up a very long forum thread about this branch.

[Kimberly (kimberly-netweb360)]

I set the review as Needs Fixing because I could not get it to work. Not sure if it is the code, or something about my site. I have a QP Test Blog where I test out branches. I uploaded the entire branch, uninstalled TinyMCE, reinstalled TinyMCE. I can not get the file manager in a pop-up to insert the image code either in TinyMCE or the HTML editor. I will play with it more tomorrow, but wanted to put out there may be a bug and to see if others would test it as well before merging it.

-Kimberly.

review: Needs Fixing

[EdB (edb)]

Will grab a fresh copy and see if I can duplicate (then correct) the problem or not.

I'll guess when it doesn't insert anything it keeps the FM in popup open but re-orders the images in reverse alphabetical order? I saw that a couple of times, usually after trying too many changes at the same time. So I tinker away until the problem is resolved. Very possible I missed between my D drive where work happens and my C drive that talks to LP from time to time...

[Kimberly (kimberly-netweb360)]

> Will grab a fresh copy and see if I can duplicate (then correct) the problem
> or not.
>
> I'll guess when it doesn't insert anything it keeps the FM in popup open but
> re-orders the images in reverse alphabetical order? I saw that a couple of
> times, usually after trying too many changes at the same time. So I tinker
> away until the problem is resolved. Very possible I missed between my D drive
> where work happens and my C drive that talks to LP from time to time...

Yes, that is exactly correct; I noticed that it seems to reload the FM in popup and reorders the images.

[EdB (edb)]

Grabbed core and merged in this branch, and grabbed a fresh copy of this branch. Ran both without issue on localhost and my server. Thus, could not duplicate problem.

[lp:~edb/quam-plures/yet_another_image_branch]

7595. By EdB on 2011-02-24

updated messages.pot file due to tons of new strings in the plugin

[Kimberly (kimberly-netweb360)]

> Grabbed core and merged in this branch, and grabbed a fresh copy of this
> branch. Ran both without issue on localhost and my server. Thus, could not
> duplicate problem.

I will grab a fresh copy of the branch and make sure it is properly loaded to server and then try again. Will report my findings.

[Kimberly (kimberly-netweb360)]

OK, I used bazaar explorer and downloaded the branch using lp:~edb/quam-plures/yet_another_image_branch. Once the branched was saved to my local hard drive, I use FileZilla to upload all files to my qp test blog overwriting all files. Then I logged into the test blog and started a new post. It would not work for me. Am I doing this wrong? If so, then tell me how to do this so I can test this. I tried it both on FireFox and IE. Below are some test results I got.

In the TinyMCE configuration need to remove align="center"
In the file manager in pop-up, need to change title: no caption to no title

Float left, title default, caption default, does not work.

Float left, title default, caption placeholder, works.

Float left, title default, caption no caption, does not work.

Float left, title placeholder, caption default, does not work.

Float left, title no caption, caption default, does not work.

Float right, title default, caption default, does not work.

Float right, title default, caption placeholder, works.

Float right, title default, caption no caption, does not work.

Float right, title default, caption default, does not work.

Float right, title placeholder, caption default, does not work.

Float right, title no caption, caption default, does not work.

Float center, title default, caption default, does not work.

Float center, title default, caption default, does not work.

Float center, title default, caption placeholder, works.

inline, works.

The above was done in TinyMCE.

When I turned off TinyMCE I got the same results.

I was only able to insert an image for when caption was set to placeholder.

[EdB (edb)]

One bug fixed - the "no caption" as an option in the title selector.

One other verified - selecting "no caption" from the caption selector causes it to insert nothing. Fix on the way...

review: Needs Fixing

[EdB (edb)]

Changes to TinyMCE settings: align="center" removed from table due to it did nothing, class="center" removed from IMG tag for the same reason, class="center" added to TD for image in order to center the image in the available space.

review: Needs Resubmitting

[Kimberly (kimberly-netweb360)]

Tested and all seem to be working as should be. I tried many different combinations. Unless someone else wants to test this, it may be ready for prime time.

[Yabs (yabs)]

I assume Kimberlys comment means "approved" so I'll flag it as such as I don't use tiny and have no idea what I should be looking for ;)

¥

review: Approve

[EdB (edb)]

On 3/7/2011 2:42 AM, Yabs wrote:
> Review: Approve
> I assume Kimberlys comment means "approved" so I'll flag it as such as I don't use tiny and have no idea what I should be looking for ;)
>
> ¥
I hope replying by email from a computer that doesn't know my LP info
recognizes this is me...

The thing to look for even ignoring TinyMCE is problems when inserting
an image via file manager. Core is completely different in this
branch. I tried to ensure good testing of all sorts of combinations but
I wouldn't be surprised if I missed something. 3 options (position,
caption, title) with 3 choices each means ... 3 * 3 * 3 total
possibilities? Plus if the image has or doesn't have a caption or title
stored means even more.

Big-ass branch. I really didn't want to be doing those after we went
live, but I can't see any way to break this smaller. (EdB just in case)

[lp:~edb/quam-plures/yet_another_image_branch]

7596. By EdB on 2011-03-08

new stuff in core now here - woohoo!

[Kimberly (kimberly-netweb360)]

EdB, is it possible that the wrong revision got merged? I just download the quam_plures branch and uploaded it to the server. The first thing I noticed was that in TinyMCE the align="center" was in the configuration for TinyMCE. If you recall, I mentioned that this produced the following code: <table class="floatleft" width="412" align="center"> which always align the table centre. I thought that it might just be the TinyMCE plugin which would not be a big problem. However, when I tried to insert images using variations of the align/title/caption, I am seeing the same thing I saw when I marked the revision as needing fixing.

So, is it possible that the wrong revision got merged?

-Kimberly.

[EdB (edb)]

It should have been the currentest version but I dunno. Haven't actually looked at it yet. Busy at work at the moment, and will be for a couple of days, but I will compare what I have on the hard drive at home to what we have in core now.

Also possible is that I failed to upload a change. THAT is more likely than an older step along this branch got merged. Anyway I'll check and see what I can see.

[Kimberly (kimberly-netweb360)]

Just wanted to comment on this again to keep it current. I just downloaded the March 15 trunk.zip instead of going through bazaar and it is broken. The drop-down list for title has the "no caption" and that was one of the things you corrected as well as the TinyMCE plugin having the align="center" causing all images to be centred regardless of choosing a float. With particular combinations of title and caption the file manager in a pop-up just reloads with the file list reordered as was mentioned.

I don't think we should do another release as was mentioned in the forums until this resolved.

-Kimberly.

=== modified file 'qp_inc/files/files.ctrl.php'
--- qp_inc/files/files.ctrl.php	2010-12-31 12:12:03 +0000
+++ qp_inc/files/files.ctrl.php	2011-03-08 04:29:14 +0000
@@ -1475,7 +1475,7 @@
 }
 
 // Update sub-menu:
-$popfor = param( 'popfor', 'string', '' );
+$popfor = param( 'popfor', 'string', '', true );
 if( $current_User->check_perm( 'files', 'add' ) && $popfor == '' )
 { // Permission to upload and we are not in a popup window (no subtabs needed otherwise)
 	$AdminUI->add_menu_entries(

=== modified file 'qp_inc/files/upload.ctrl.php'
--- qp_inc/files/upload.ctrl.php	2010-12-31 12:12:03 +0000
+++ qp_inc/files/upload.ctrl.php	2011-03-08 04:29:14 +0000
@@ -433,14 +433,14 @@
 				$success_msg .= '<br />';
 				$success_msg .= '<fieldset class="uploaded_image"><legend>'.T_('Add this Image to your Post').'</legend><ul><li>';
 				// image tag floated left
-				$img_tag = format_to_output( $newFile->get_tag( '<span class="imgwrap floatleft center">', '<br /><span class="image_legend">', '</span>', '</span>', 'original', '', 'spanimage' ), 'formvalue' );
+				$img_tag = format_to_output( $newFile->get_tag( '<span class="floatleft center">', '<br /><span class="image_legend">', '</span>', '</span>', 'original', '', 'spanimage' ), 'formvalue' );
 				$success_msg .= '<a href="#" onclick="if( window.focus && window.opener ){ window.opener.focus(); textarea_wrap_selection( window.opener.document.getElementById(\'itemform_post_content\'), \''.$img_tag.'\', \'\', 1, window.opener.document ); } return false;">['.T_('float:left').']</a> or ';
 				// image tag centered
 				$img_tag = format_to_output( $newFile->get_tag( '<div class="image_block">', '<div class="image_legend">', '</div>', '</div>', 'original', '', 'center'), 'formvalue' );
 				$success_msg .= '<a href="#" onclick="if( window.focus && window.opener ){ window.opener.focus(); textarea_wrap_selection( window.opener.document.getElementById(\'itemform_post_content\'), \''.$img_tag.'\', \'\', 1, window.opener.document ); } return false;">['.T_('centered').']</a> or ';
 				// image tag floated right
-				$img_tag = format_to_output( $newFile->get_tag( '<span class="imgwrap floatright center">', '<br /><span class="image_legend">', '</span>', '</span>', 'original', '', 'spanimage' ), 'formvalue' );
-				$success_msg .= '<a href="#" onclick="if( window.focus && window.opener ){ window.opener.focus(); textarea_wrap_selection( window.opener.document.getElementById(\'itemform_post_content\'), \''.$img_tag.'\', \'\', 1, window.opener.document ); } return false;">['.T_('float:right)').']</a>';
+				$img_tag = format_to_output( $newFile->get_tag( '<span class="floatright center">', '<br /><span class="image_legend">', '</span>', '</span>', 'original', '', 'spanimage' ), 'formvalue' );
+				$success_msg .= '<a href="#" onclick="if( window.focus && window.opener ){ window.opener.focus(); textarea_wrap_selection( window.opener.document.getElementById(\'itemform_post_content\'), \''.$img_tag.'\', \'\', 1, window.opener.document ); } return false;">['.T_('float:right').']</a>';
 				$success_msg .= '</li></ul></fieldset>';
 				$success_msg .= '<hr class="hidden" />';
 			}

=== modified file 'qp_inc/files/views/_file_browse.view.php'
--- qp_inc/files/views/_file_browse.view.php	2010-12-31 12:12:03 +0000
+++ qp_inc/files/views/_file_browse.view.php	2011-03-08 04:29:14 +0000
@@ -64,7 +64,7 @@
  */
 global $edited_Item;
 
-$popfor = param( 'popfor', 'string', '' );
+$popfor = param( 'popfor', 'string', '', true );
 
 ?>
 

=== modified file 'qp_inc/files/views/_file_list.inc.php'
--- qp_inc/files/views/_file_list.inc.php	2010-12-31 12:12:03 +0000
+++ qp_inc/files/views/_file_list.inc.php	2011-03-08 04:29:14 +0000
@@ -81,582 +81,730 @@
 <?php
 $Form = new Form( NULL, 'FilesForm', 'post', 'none' );
 $Form->begin_form();
-	$Form->hidden_ctrl();
-
-	$Form->hidden( 'confirmed', '0' );
-	$Form->hidden( 'md5_filelist', $fm_Filelist->md5_checksum() );
-	$Form->hidden( 'md5_cwd', md5($fm_Filelist->get_ads_list_path()) );
-	$Form->hiddens_by_key( get_memorized('fm_selected') ); // 'fm_selected' gets provided by the form itself
+$Form->hidden_ctrl();
+$Form->hidden( 'confirmed', '0' );
+$Form->hidden( 'md5_filelist', $fm_Filelist->md5_checksum() );
+$Form->hidden( 'md5_cwd', md5($fm_Filelist->get_ads_list_path()) );
+$Form->hiddens_by_key( get_memorized('fm_selected') ); // 'fm_selected' gets provided by the form itself
 ?>
 <table class="filelist">
-	<thead>
-	<?php
-		/*****************  Col headers  ****************/
-
-		echo '<tr>';
-
-		// "Go to parent" icon
-		echo '<th class="firstcol">';
-		if( empty($fm_Filelist->_rds_list_path) )
-		{ // cannot go higher
-			echo '&nbsp;';	// for IE
-		}
-		else
-		{
-			echo action_icon( T_('Go to parent folder'), 'folder_parent', regenerate_url( 'path', 'path='.$fm_Filelist->_rds_list_path.'..' ) );
-		}
-		echo '</th>';
-
-		echo '<th class="nowrap">';
-		if( $UserSettings->get( 'fm_imglistpreview' ) )
-		{ // Image file preview:
-			$col_title = T_('Icon/Type');
-		}
-		else
-		{
-			$col_title = /* TRANS: short for (file)Type */ T_(' T ');
-		}
-		echo $fm_Filelist->get_sort_link( 'type', $col_title );
-		echo '</th>';
-
-		if( $fm_flatmode )
-		{
-			echo '<th>'.$fm_Filelist->get_sort_link( 'path', /* TRANS: file/directory path */ T_('Path') ).'</th>';
-		}
-
-		echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'name', /* TRANS: file name */ T_('Name') ).'</th>';
-
-		if( $UserSettings->get('fm_showtypes') )
-		{ // Show file types column
-			echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'type', /* TRANS: file type */ T_('Type') ).'</th>';
-		}
-
-		echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'size', /* TRANS: file size */ T_('Size') ).'</th>';
-
-		if( $UserSettings->get('fm_showdate') != 'no' )
-		{ // Show last mod column
-			echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'lastmod', /* TRANS: file's last change / timestamp */ T_('Last change') ).'</th>';
-		}
-
-		$popfor = param( 'popfor', 'string', '' );
-
-		if( $popfor == '' )
-		{
-			if( $UserSettings->get('fm_showfsperms') )
-			{ // Show file perms column
-				echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'perms', /* TRANS: file's permissions (short) */ T_('Perms') ).'</th>';
-			}
-
-			if( $UserSettings->get('fm_showfsowner') )
-			{ // Show file owner column
-				echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'fsowner', /* TRANS: file owner */ T_('Owner') ).'</th>';
-			}
-
-			if( $UserSettings->get('fm_showfsgroup') )
-			{ // Show file group column
-				echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'fsgroup', /* TRANS: file group */ T_('Group') ).'</th>';
-			}
-
-			echo '<th class="lastcol nowrap">'. /* TRANS: file actions; edit, rename, copy, .. */ T_('Actions').'</th>';
-		}
-		echo '</tr>';
-	?>
-	</thead>
-
-	<tbody>
-	<?php
-	param( 'checkall', 'integer', 0 );  // Non-Javascript-CheckAll
-
-	/***********************************************************/
-	/*                    MAIN FILE LIST:                      */
-	/***********************************************************/
-	$countFiles = 0;
-	while( $lFile = & $fm_Filelist->get_next() )
-	{ // Loop through all Files:
-		echo '<tr class="'.( $countFiles%2 ? 'odd' : 'even' ).'">';
-
-
-		/********************    Checkbox:    *******************/
-
-		echo '<td class="checkbox firstcol">';
-		echo '<span name="surround_check" class="checkbox_surround_init">';
-		echo '<input title="'.T_('Select this file').'" type="checkbox" class="checkbox"
-					name="fm_selected[]" value="'.rawurlencode($lFile->get_rdfp_rel_path()).'" id="cb_filename_'.$countFiles.'"';
-		global $checkall;
-		if( $checkall || $selected_Filelist->contains( $lFile ) )
-		{
-			echo ' checked="checked"';
-		}
-		echo ' />';
-		echo '</span>';
-
-		/***********  Hidden info used by Javascript:  ***********/
-
-		global $mode;
-		if( $mode == 'upload' )
-		{	// This mode allows to insert img tags into the post...
-			// Hidden info used by Javascript:
-			echo '<input type="hidden" name="img_tag_'.$countFiles.'" id="img_tag_'.$countFiles
-			    .'" value="'.format_to_output( $lFile->get_tag(), 'formvalue' ).'" />';
-		}
-
-		echo '</td>';
-
-
-		/********************  Icon / File type:  *******************/
-
-		echo '<td class="icon_type">';
-		if( $UserSettings->get( 'fm_imglistpreview' ) )
-		{	// Image preview OR full type:
-			if( $lFile->is_dir() )
-			{ // Navigate into Directory
-				echo '<a href="'.$lFile->get_view_url().'" title="'.T_('Change into this directory').'">'.$lFile->get_icon().' '.T_('Directory').'</a>';
-			}
-			else
-			{
-				echo $lFile->get_preview_thumb( 'fulltype' );
-			}
-		}
-		else
-		{	// No image preview, small type:
- 			if( $lFile->is_dir() )
-			{ // Navigate into Directory
-				echo '<a href="'.$lFile->get_view_url().'" title="'.T_('Change into this directory').'">'.$lFile->get_icon().'</a>';
-			}
-			else
-			{ // File
-				echo $lFile->get_view_link( $lFile->get_icon(), NULL, $lFile->get_icon() );
-			}
-		}
-		echo '</td>';
-
-		/*******************  Path (flatmode): ******************/
-
-		if( $fm_flatmode )
-		{
-			echo '<td class="filepath">';
-			echo dirname($lFile->get_rdfs_rel_path()).'/';
-			echo '</td>';
-		}
-
-
-		echo '<td class="fm_filename">';
-
-			/*************  Invalid filename warning:  *************/
-
-			if( !$lFile->is_dir() )
-			{
-				if( $error_filename = validate_filename( $lFile->get_name() ) )
-				{ // TODO: Warning icon with hint
-					echo get_icon( 'warning', 'imgtag', array( 'class' => 'filenameIcon', 'title' => $error_filename ) );
-				}
-			}
-			elseif( $error_dirname = validate_dirname( $lFile->get_name() ) )
-			{ // TODO: Warning icon with hint
-				echo get_icon( 'warning', 'imgtag', array( 'class' => 'filenameIcon', 'title' => $error_dirname ) );
-			}
-
-			/****  Open in a new window  (only directories)  ****/
-
-			if( $lFile->is_dir() )
-			{ // Directory
-				$browse_dir_url = $lFile->get_view_url();
-				$popup_url = url_add_param( $browse_dir_url, 'mode=popup' );
-				$target = 'evo_fm_'.$lFile->get_md5_ID();
-
-				echo '<a href="'.$browse_dir_url.'" target="'.$target.' " class="filenameIcon"
-							title="'.T_('Open in a new window').'" onclick="'
-							."return pop_up_window( '$popup_url', '$target' )"
-							.'">'.get_icon( 'window_new' ).'</a>';
-			}
-
-			/***************  Link ("chain") icon:  **************/
-
-			// if( ! $lFile->is_dir() )	// fp> OK but you need to include an else:placeholder, otherwise the display is ugly
-			{	// Only provide link/"chain" icons for files.
-				// TODO: dh> provide support for direcories (display included files).
-
-				// fp> here might not be the best place to put the perm check
-				if( isset($edited_Item) && $current_User->check_perm( 'item_post!CURSTATUS', 'edit', false, $edited_Item ) )
-				{	// Offer option to link the file to an Item (or anything else):
-					$link_attribs = array();
-					$link_action = 'link';
-					if( $mode == 'upload' )
-					{	// We want the action to happen in the post attachments iframe:
-						$link_attribs['target'] = $iframe_name;
-						$link_action = 'link_inpost';
-					}
-					echo action_icon( T_('Link this file!'), 'link',
-								regenerate_url( 'fm_selected', 'action='.$link_action.'&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()) ),
-								NULL, NULL, NULL, $link_attribs );
-					echo ' ';
-				}
-
-				if( isset($edited_User) ) // fp> Perm already checked in controller
-				{	// Offer option to link the file to an Item (or anything else):
-					echo action_icon( T_('Link this file!'), 'link',
-								regenerate_url( 'fm_selected', 'action=link_user&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()) ),
-								NULL, NULL, NULL, array() );
-					echo ' ';
-				}
-			}
-
-			/********************  Filename  ********************/
-
-			if( $lFile->is_dir() )
-			{ // Directory
-				// Link to open the directory in the curent window
-				echo '<a href="'.$browse_dir_url.'">'.$lFile->dget('name').'</a>';
-			}
-			else
-			{ // File
-				if( $view_link = $lFile->get_view_link( $lFile->get_name(), NULL, NULL ) )
-				{
-					echo $view_link;
-				}
-				else
-				{ // File extension unrecognized
-					echo $lFile->dget('name');
-				}
-			}
-
-			/***************  File meta data:  **************/
-
-			echo '<span class="filemeta">';
-			// Optionally display IMAGE pixel size:
-			if( $UserSettings->get( 'fm_getimagesizes' ) )
-			{
-				echo ' ('.$lFile->get_image_size( 'widthxheight' ).')';
-			}
-			// Optionally display meta data title:
-			if( $lFile->meta == 'loaded' )
-			{	// We have loaded meta data for this file:
-				echo ' - '.$lFile->title;
-			}
-			echo '</span>';
-
-		echo '</td>';
-
-		/*******************  File type  ******************/
-
-		if( $UserSettings->get('fm_showtypes') )
-		{ // Show file types
-			echo '<td class="type">'.$lFile->get_type().'</td>';
-		}
-
-		/*******************  File size  ******************/
-
-		echo '<td class="size">'.$fm_Filelist->get_File_size_formatted($lFile).'</td>';
-
-		/****************  File time stamp  ***************/
-
-		if( $UserSettings->get('fm_showdate') != 'no' )
-		{ // Show last modified datetime (always full in title attribute)
-			$lastmod_date = $lFile->get_lastmod_formatted( 'date' );
-			$lastmod_time = $lFile->get_lastmod_formatted( 'time' );
-			echo '<td class="timestamp" title="'.$lastmod_date.' '.$lastmod_time.'">';
-			if( $UserSettings->get('fm_showdate') == 'long' )
-			{
-				echo '<span class="date">'.$lastmod_date.'</span> ';
-				echo '<span class="time">'.$lastmod_time.'</span>';
-			}
-			else
-			{	// Compact format
-				echo $lFile->get_lastmod_formatted( 'compact' );
-			}
-			echo '</td>';
-		}
-
-		/****************  File pemissions  ***************/
-		if( $popfor == '' )
-		{
-			if( $UserSettings->get('fm_showfsperms') )
-			{ // Show file perms
-				echo '<td class="perms">';
-				$fm_permlikelsl = $UserSettings->param_Request( 'fm_permlikelsl', 'fm_permlikelsl', 'integer', 0 );
-				if( $current_User->check_perm( 'files', 'edit' ) )
-				{ // User can edit:
-					echo '<a title="'.T_('Edit permissions').'" href="'.regenerate_url( 'fm_selected,action', 'action=edit_perms&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()) ).'">'
-						.$lFile->get_perms( $fm_permlikelsl ? 'lsl' : '' ).'</a>';
-				}
-				else
-				{
-					echo $lFile->get_perms( $fm_permlikelsl ? 'lsl' : '' );
-				}
-				echo '</td>';
-			}
-
-			/****************  File owner  ********************/
-			if( $UserSettings->get('fm_showfsowner') )
-			{ // Show file owner
-				echo '<td class="fsowner">';
-				echo $lFile->get_fsowner_name();
-				echo '</td>';
-			}
-
-			/****************  File group *********************/
-			if( $UserSettings->get('fm_showfsgroup') )
-			{ // Show file owner
-				echo '<td class="fsgroup">';
-				echo $lFile->get_fsgroup_name();
-				echo '</td>';
-			}
-
-			/*****************  Action icons  ****************/
-			echo '<td class="actions lastcol">';
-			if( $current_User->check_perm( 'files', 'edit' ) )
-			{ // User can edit:
-				if( $lFile->is_editable( $current_User->check_perm( 'files', 'all' ) ) )
-				{
-					echo action_icon( T_('Edit file...'), 'edit', regenerate_url( 'fm_selected', 'action=edit_file&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()) ) );
-				}
-				else
-				{
-					echo get_icon( 'edit', 'noimg' );
-				}
-			}
-			echo action_icon( T_('Edit properties...'), 'properties', regenerate_url( 'fm_selected', 'action=edit_properties&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()) ) );
-
-			if( $current_User->check_perm( 'files', 'edit' ) )
-			{ // User can edit:
-				echo action_icon( T_('Rename'), 'rename', regenerate_url( 'fm_selected', 'action=rename&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()) ) );
-				echo action_icon( T_('Move'), 'move', regenerate_url( 'fm_mode,fm_sources,fm_sources_root', 'fm_mode=file_move&amp;fm_sources[]='.rawurlencode( $lFile->get_rdfp_rel_path() ).'&amp;fm_sources_root='.$fm_Filelist->_FileRoot->ID ) );
-				echo action_icon( T_('Copy'), 'copy', regenerate_url( 'fm_mode,fm_sources,fm_sources_root', 'fm_mode=file_copy&amp;fm_sources[]='.rawurlencode( $lFile->get_rdfp_rel_path() ).'&amp;fm_sources_root='.$fm_Filelist->_FileRoot->ID ) );
-				echo action_icon( T_('Delete'), 'delete', regenerate_url( 'fm_selected', 'action=delete&amp;fm_selected[]='.rawurlencode( $lFile->get_rdfp_rel_path() ) ) );
-			}
-			echo '</td>';
-		}
-
-		echo '</tr>';
-
-		$countFiles++;
-	}
-	// / End of file list..
-
-
-	/**
-	 * @global integer Number of cols for the files table, 6 is minimum.
-	 */
-	$filetable_cols = 5
-		+ (int)$fm_flatmode
-		+ (int)$UserSettings->get('fm_showtypes')
-		+ (int)($UserSettings->get('fm_showdate') != 'no')
-		+ (int)$UserSettings->get('fm_showfsperms')
-		+ (int)$UserSettings->get('fm_showfsowner')
-		+ (int)$UserSettings->get('fm_showfsgroup')
-		+ (int)$UserSettings->get('fm_imglistpreview');
-
-
-	if( $countFiles == 0 )
-	{ // Filelist errors or "directory is empty"
+<thead>
+<?php
+/*****************  Col headers  ****************/
+echo '<tr>';
+
+// "Go to parent" icon
+echo '<th class="firstcol">';
+if( empty($fm_Filelist->_rds_list_path) )
+{ // cannot go higher
+		echo '&nbsp;';	// for IE
+}
+else
+{
+	echo action_icon( T_('Go to parent folder'), 'folder_parent', regenerate_url( 'path', 'path='.$fm_Filelist->_rds_list_path.'..' ) );
+}
+echo '</th>';
+
+echo '<th class="nowrap">';
+if( $UserSettings->get( 'fm_imglistpreview' ) )
+{ // Image file preview:
+	$col_title = T_('Icon/Type');
+}
+else
+{
+	$col_title = /* TRANS: short for (file)Type */ T_(' T ');
+}
+echo $fm_Filelist->get_sort_link( 'type', $col_title );
+echo '</th>';
+
+if( $fm_flatmode )
+{
+	echo '<th>'.$fm_Filelist->get_sort_link( 'path', /* TRANS: file/directory path */ T_('Path') ).'</th>';
+}
+
+echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'name', /* TRANS: file name */ T_('Name') ).'</th>';
+
+if( $UserSettings->get('fm_showtypes') )
+{ // Show file types column
+	echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'type', /* TRANS: file type */ T_('Type') ).'</th>';
+}
+
+echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'size', /* TRANS: file size */ T_('Size') ).'</th>';
+
+if( $UserSettings->get('fm_showdate') != 'no' )
+{ // Show last mod column
+	echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'lastmod', /* TRANS: file's last change / timestamp */ T_('Last change') ).'</th>';
+}
+
+$popfor = param( 'popfor', 'string', '', true );
+
+if( $popfor == '' )
+{
+	if( $UserSettings->get('fm_showfsperms') )
+	{ // Show file perms column
+		echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'perms', /* TRANS: file's permissions (short) */ T_('Perms') ).'</th>';
+	}
+
+	if( $UserSettings->get('fm_showfsowner') )
+	{ // Show file owner column
+		echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'fsowner', /* TRANS: file owner */ T_('Owner') ).'</th>';
+	}
+
+	if( $UserSettings->get('fm_showfsgroup') )
+	{ // Show file group column
+		echo '<th class="nowrap">'.$fm_Filelist->get_sort_link( 'fsgroup', /* TRANS: file group */ T_('Group') ).'</th>';
+	}
+
+	echo '<th class="lastcol nowrap">'. /* TRANS: file actions; edit, rename, copy, .. */ T_('Actions').'</th>';
+}
+echo '</tr>';
+?>
+</thead>
+<tbody>
+
+<?php
+param( 'checkall', 'integer', 0 );  // Non-Javascript-CheckAll
+
+/***********************************************************/
+/*                    MAIN FILE LIST:                      */
+/***********************************************************/
+$countFiles = 0;
+while( $lFile = & $fm_Filelist->get_next() )
+{ // Loop through all Files:
+	echo '<tr class="'.( $countFiles%2 ? 'odd' : 'even' ).'">';
+
+	/********************    Checkbox:    *******************/
+	echo '<td class="checkbox firstcol">';
+	echo '<span name="surround_check" class="checkbox_surround_init">';
+	echo '<input title="'.T_('Select this file').'" type="checkbox" class="checkbox"
+		name="fm_selected[]" value="'.rawurlencode($lFile->get_rdfp_rel_path()).'" id="cb_filename_'.$countFiles.'"';
+	global $checkall;
+	if( $checkall || $selected_Filelist->contains( $lFile ) )
+	{
+		echo ' checked="checked"';
+	}
+	echo ' />';
+	echo '</span>';
+
+	/***********  Hidden info used by Javascript:  ***********/
+
+	global $mode;
+	if( $mode == 'upload' )
+	{	// This mode allows inserting images or links to files in items...
+		$lFile->load_meta( true );
+		echo '<input type="hidden" name="link_'.$countFiles.'" id="link_'.$countFiles.'" value="'
+			.$lFile->get_url().'" />'."\n";
+		// this is the title
+		echo '<input type="hidden" name="title_'.$countFiles.'" id="title_'.$countFiles.'" value="'
+			.$lFile->dget('title', 'htmlattr').'" />'."\n";
+		// this is the alttxt
+		echo '<input type="hidden" name="alttxt_'.$countFiles.'" id="alttxt_'.$countFiles.'" value="'
+			.$lFile->dget('alt', 'htmlattr').'" />'."\n";
+		// this is the caption
+		echo '<input type="hidden" name="caption_'.$countFiles.'" id="caption_'.$countFiles.'" value="'
+			.$lFile->dget('desc', 'htmlattr').'" />'."\n";
+		// this is width and height OR false for non-image files
+		echo '<input type="hidden" name="dimens_'.$countFiles.'" id="dimens_'.$countFiles.'" value="'
+			.$lFile->get_image_size().'" />'."\n";
+	}
+
+	echo '</td>';
+
+	/********************  Icon / File type:  *******************/
+	echo '<td class="icon_type">';
+	if( $UserSettings->get( 'fm_imglistpreview' ) )
+	{	// Image preview OR full type:
+		if( $lFile->is_dir() )
+		{ // Navigate into Directory
+			echo '<a href="'.$lFile->get_view_url().'" title="'.T_('Change into this directory').'">'.$lFile->get_icon().' '.T_('Directory').'</a>';
+		}
+		else
+		{
+			echo $lFile->get_preview_thumb( 'fulltype' );
+		}
+	}
+	else
+	{	// No image preview, small type:
+ 		if( $lFile->is_dir() )
+		{ // Navigate into Directory
+			echo '<a href="'.$lFile->get_view_url().'" title="'.T_('Change into this directory').'">'.$lFile->get_icon().'</a>';
+		}
+		else
+		{ // File
+			echo $lFile->get_view_link( $lFile->get_icon(), NULL, $lFile->get_icon() );
+		}
+	}
+	echo '</td>';
+
+	/*******************  Path (flatmode): ******************/
+	if( $fm_flatmode )
+	{
+		echo '<td class="filepath">';
+		echo dirname($lFile->get_rdfs_rel_path()).'/';
+		echo '</td>';
+	}
+
+	echo '<td class="fm_filename">';
+
+	/*************  Invalid filename warning:  *************/
+	if( !$lFile->is_dir() )
+	{
+		if( $error_filename = validate_filename( $lFile->get_name() ) )
+		{ // TODO: Warning icon with hint
+			echo get_icon( 'warning', 'imgtag', array( 'class' => 'filenameIcon', 'title' => $error_filename ) );
+		}
+	}
+	elseif( $error_dirname = validate_dirname( $lFile->get_name() ) )
+	{ // TODO: Warning icon with hint
+		echo get_icon( 'warning', 'imgtag', array( 'class' => 'filenameIcon', 'title' => $error_dirname ) );
+	}
+
+	/****  Open in a new window  (only directories)  ****/
+	if( $lFile->is_dir() )
+	{ // Directory
+		$browse_dir_url = $lFile->get_view_url();
+		$popup_url = url_add_param( $browse_dir_url, 'mode=popup' );
+		$target = 'evo_fm_'.$lFile->get_md5_ID();
+
+		echo '<a href="'.$browse_dir_url.'" target="'.$target.' " class="filenameIcon"
+			title="'.T_('Open in a new window').'" onclick="'
+			."return pop_up_window( '$popup_url', '$target' )"
+			.'">'.get_icon( 'window_new' ).'</a>';
+	}
+
+	/***************  Link ("chain") icon:  **************/
+	// if( ! $lFile->is_dir() )	// fp> OK but you need to include an else:placeholder, otherwise the display is ugly
+	{	// Only provide link/"chain" icons for files.
+		// TODO: dh> provide support for direcories (display included files).
+
+		// fp> here might not be the best place to put the perm check
+		if( isset($edited_Item) && $current_User->check_perm( 'item_post!CURSTATUS', 'edit', false, $edited_Item ) )
+		{	// Offer option to link the file to an Item (or anything else):
+			$link_attribs = array();
+			$link_action = 'link';
+			if( $mode == 'upload' )
+			{	// We want the action to happen in the post attachments iframe:
+				$link_attribs['target'] = $iframe_name;
+				$link_action = 'link_inpost';
+			}
+			echo action_icon( T_('Link this file!'), 'link',
+				regenerate_url( 'fm_selected', 'action='.$link_action.'&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()) ),
+				NULL, NULL, NULL, $link_attribs );
+				echo ' ';
+		}
+
+		if( isset($edited_User) ) // fp> Perm already checked in controller
+		{	// Offer option to link the file to an Item (or anything else):
+			echo action_icon( T_('Link this file!'), 'link',
+				regenerate_url( 'fm_selected', 'action=link_user&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()) ),
+				NULL, NULL, NULL, array() );
+				echo ' ';
+		}
+
+	}
+
+	/********************  Filename  ********************/
+	if( $lFile->is_dir() )
+	{ // Directory
+		// Link to open the directory in the curent window
+		echo '<a href="'.$browse_dir_url.'">'.$lFile->dget('name').'</a>';
+	}
+	else
+	{ // File
+		if( $view_link = $lFile->get_view_link( $lFile->get_name(), NULL, NULL ) )
+		{
+			echo $view_link;
+		}
+		else
+		{ // File extension unrecognized
+			echo $lFile->dget('name');
+		}
+	}
+
+	/***************  File meta data:  **************/
+	echo '<span class="filemeta">';
+	// Optionally display IMAGE pixel size:
+	if( $UserSettings->get( 'fm_getimagesizes' ) )
+	{
+		echo ' ('.$lFile->get_image_size( 'widthxheight' ).')';
+	}
+	// Optionally display meta data title:
+	if( $lFile->meta == 'loaded' )
+	{	// We have loaded meta data for this file:
+		echo ' - '.$lFile->title;
+	}
+	echo '</span>';
+	echo '</td>';
+
+	/*******************  File type  ******************/
+	if( $UserSettings->get('fm_showtypes') )
+	{ // Show file types
+		echo '<td class="type">'.$lFile->get_type().'</td>';
+	}
+
+	/*******************  File size  ******************/
+	echo '<td class="size">'.$fm_Filelist->get_File_size_formatted($lFile).'</td>';
+
+	/****************  File time stamp  ***************/
+	if( $UserSettings->get('fm_showdate') != 'no' )
+	{ // Show last modified datetime (always full in title attribute)
+		$lastmod_date = $lFile->get_lastmod_formatted( 'date' );
+		$lastmod_time = $lFile->get_lastmod_formatted( 'time' );
+		echo '<td class="timestamp" title="'.$lastmod_date.' '.$lastmod_time.'">';
+		if( $UserSettings->get('fm_showdate') == 'long' )
+		{
+			echo '<span class="date">'.$lastmod_date.'</span> ';
+			echo '<span class="time">'.$lastmod_time.'</span>';
+		}
+		else
+		{	// Compact format
+			echo $lFile->get_lastmod_formatted( 'compact' );
+		}
+		echo '</td>';
+	}
+
+	/****************  File pemissions  ***************/
+	if( $popfor == '' )
+	{
+		if( $UserSettings->get('fm_showfsperms') )
+		{ // Show file perms
+			echo '<td class="perms">';
+			$fm_permlikelsl = $UserSettings->param_Request( 'fm_permlikelsl', 'fm_permlikelsl', 'integer', 0 );
+			if( $current_User->check_perm( 'files', 'edit' ) )
+			{ // User can edit:
+				echo '<a title="'.T_('Edit permissions').'" href="'.regenerate_url( 'fm_selected,action', 'action=edit_perms&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()) ).'">'
+					.$lFile->get_perms( $fm_permlikelsl ? 'lsl' : '' ).'</a>';
+			}
+			else
+			{
+				echo $lFile->get_perms( $fm_permlikelsl ? 'lsl' : '' );
+			}
+			echo '</td>';
+		}
+
+		/****************  File owner  ********************/
+		if( $UserSettings->get('fm_showfsowner') )
+		{ // Show file owner
+			echo '<td class="fsowner">';
+			echo $lFile->get_fsowner_name();
+			echo '</td>';
+		}
+
+		/****************  File group *********************/
+		if( $UserSettings->get('fm_showfsgroup') )
+		{ // Show file owner
+			echo '<td class="fsgroup">';
+			echo $lFile->get_fsgroup_name();
+			echo '</td>';
+		}
+
+		/*****************  Action icons  ****************/
+		echo '<td class="actions lastcol">';
+		if( $current_User->check_perm( 'files', 'edit' ) )
+		{ // User can edit:
+			if( $lFile->is_editable( $current_User->check_perm( 'files', 'all' ) ) )
+			{
+				echo action_icon( T_('Edit file...'), 'edit', regenerate_url( 'fm_selected', 'action=edit_file&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()) ) );
+			}
+			else
+			{
+				echo get_icon( 'edit', 'noimg' );
+			}
+		}
+		echo action_icon( T_('Edit properties...'), 'properties', regenerate_url( 'fm_selected', 'action=edit_properties&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()) ) );
+
+		if( $current_User->check_perm( 'files', 'edit' ) )
+		{ // User can edit:
+			echo action_icon( T_('Rename'), 'rename', regenerate_url( 'fm_selected', 'action=rename&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()) ) );
+			echo action_icon( T_('Move'), 'move', regenerate_url( 'fm_mode,fm_sources,fm_sources_root', 'fm_mode=file_move&amp;fm_sources[]='.rawurlencode( $lFile->get_rdfp_rel_path() ).'&amp;fm_sources_root='.$fm_Filelist->_FileRoot->ID ) );
+			echo action_icon( T_('Copy'), 'copy', regenerate_url( 'fm_mode,fm_sources,fm_sources_root', 'fm_mode=file_copy&amp;fm_sources[]='.rawurlencode( $lFile->get_rdfp_rel_path() ).'&amp;fm_sources_root='.$fm_Filelist->_FileRoot->ID ) );
+			echo action_icon( T_('Delete'), 'delete', regenerate_url( 'fm_selected', 'action=delete&amp;fm_selected[]='.rawurlencode( $lFile->get_rdfp_rel_path() ) ) );
+		}
+		echo '</td>';
+	}
+
+	echo '</tr>';
+
+	$countFiles++;
+}
+// End of file list..
+
+/**
+ * @global integer Number of cols for the files table, 6 is minimum.
+ */
+$filetable_cols = 5
+	+ (int)$fm_flatmode
+	+ (int)$UserSettings->get('fm_showtypes')
+	+ (int)($UserSettings->get('fm_showdate') != 'no')
+	+ (int)$UserSettings->get('fm_showfsperms')
+	+ (int)$UserSettings->get('fm_showfsowner')
+	+ (int)$UserSettings->get('fm_showfsgroup')
+	+ (int)$UserSettings->get('fm_imglistpreview');
+
+if( $countFiles == 0 )
+{ // Filelist errors or "directory is empty"
+	?>
+	<tr>
+	<td class="firstcol">&nbsp;</td> <?php /* blueyed> This empty column is needed so that the defaut width:100% style of the main column below makes the column go over the whole screen */ ?>
+	<td class="lastcol" colspan="<?php echo $filetable_cols - 1 ?>" id="fileman_error">
+	<?php
+	if( ! $Messages->count('fl_error') )
+	{ // no Filelist errors, the directory must be empty
+		$Messages->add( T_('No files found.')
+			.( $fm_Filelist->is_filtering() ? '<br />'.T_('Filter').': &laquo;'.$fm_Filelist->get_filter().'&raquo;' : '' ), 'fl_error' );
+	}
+	$Messages->display( '', '', true, 'fl_error', 'log_error' );
+	?>
+	</td>
+	</tr>
+
+	<?php
+}
+else
+{
+	// -------------
+	// Footer with "check all", "with selected: ..":
+	// --------------
+	if( $popfor != 'attach' )
+	{
 		?>
-		<tr>
-		<td class="firstcol">&nbsp;</td> <?php /* blueyed> This empty column is needed so that the defaut width:100% style of the main column below makes the column go over the whole screen */ ?>
-		<td class="lastcol" colspan="<?php echo $filetable_cols - 1 ?>" id="fileman_error">
+		<tr class="listfooter firstcol lastcol">
+		<td colspan="<?php echo $filetable_cols ?>">
 		<?php
-		if( ! $Messages->count('fl_error') )
-		{ // no Filelist errors, the directory must be empty
-			$Messages->add( T_('No files found.')
-				.( $fm_Filelist->is_filtering() ? '<br />'.T_('Filter').': &laquo;'.$fm_Filelist->get_filter().'&raquo;' : '' ), 'fl_error' );
-		}
-		$Messages->display( '', '', true, 'fl_error', 'log_error' );
+		echo $Form->check_all();
+
+		$field_options = array();
+		$title_options = array();
+		$caption_options = array();
+
+		if( $mode != 'upload' && ($fm_Filelist->get_root_type() == 'collection' || !empty($Blog)) )
+		{	// We are browsing files for a collection:
+			// fp> TODO: use current as default but let user choose into which blog he wants to post
+			$field_options['make_post'] = T_('Make one post (including all images)');
+			$field_options['make_posts'] = T_('Make multiple posts (1 per image)');
+			$title_options['default'] = T_('include if provided');
+			$caption_options['default'] = T_('include if provided');
+		}
+
+		if( $mode == 'upload' )
+		{ // we are in a popup opened by the "Files" button
+			$field_options['float_left'] = T_('Float left');
+			$field_options['float_right'] = T_('Float right');
+			$field_options['centered'] = T_('Centered');
+			$field_options['inline'] = T_('In-line');
+			$title_options['default'] = T_('default');
+			$title_options['placeholder'] = T_('placeholder');
+			$title_options['none'] = T_('no title');
+			$caption_options['default'] = T_('default');
+			$caption_options['placeholder'] = T_('placeholder');
+			$caption_options['none'] = T_('no caption');
+		}
+
+		if( $popfor == '' )
+		{
+			if( $current_User->check_perm( 'files', 'edit' ) )
+			{ // current user can edit files
+				$field_options['rename'] = T_('Rename files...');
+				$field_options['delete'] = T_('Delete files...');
+				// NOTE: No delete confirmation by javascript, we need to check DB integrity!
+			}
+			// BROKEN ?
+			$field_options['download'] = T_('Download files as ZIP archive...');
+
+			/* Not fully functional:
+			$field_options['copy'] = T_('Copy the selected files...');
+			$field_options['move'] = T_('Move the selected files...');
+			*/
+		}
+
+		$Form->switch_layout( 'none' );
+		$Form->select_input_array( 'group_action', $action, $field_options, ' || <strong>'.T_('With selected files').'</strong>' );
+
+		if( $mode == 'upload' )
+		{ // we are in a popup opened by the "Files" button
+			$Form->select_input_array( 'title_action', 'default', $caption_options, ' <strong>'.T_('title').'</strong>' );
+			$Form->select_input_array( 'caption_action', 'default', $caption_options, ' <strong>'.T_('caption').'</strong>' );
+		}
+		// The "go" button gives us what to do with the file, title, and caption for all files
+		$Form->submit_input( array( 'name'=>'actionArray[group_action][title_action][caption_action]', 'value'=>T_('Go!'), 'onclick'=>'return js_act_on_selected();' ) );
+		$Form->switch_layout( NULL );
 		?>
 		</td>
 		</tr>
-
 		<?php
 	}
-	else
-	{
-		// -------------
-		// Footer with "check all", "with selected: ..":
-		// --------------
-		if( $popfor != 'attach' )
-		{
-			?>
-			<tr class="listfooter firstcol lastcol">
-			<td colspan="<?php echo $filetable_cols ?>">
-			<?php
-			echo $Form->check_all();
-
-			$field_options = array();
-
-			if( $mode != 'upload' && ($fm_Filelist->get_root_type() == 'collection' || !empty($Blog)) )
-			{	// We are browsing files for a collection:
-				// fp> TODO: use current as default but let user choose into which blog he wants to post
-				$field_options['make_post'] = T_('Make one post (including all images)');
-				$field_options['make_posts'] = T_('Make multiple posts (1 per image)');
-			}
-
-			if( $mode == 'upload' )
-			{ // we are in a popup opened by the "Files" button
-				$field_options['img_tag_left'] = T_('Insert IMG/link into post float:left');
-				$field_options['img_tag'] = T_('Insert IMG/link into post in a div');
-				$field_options['img_tag_right'] = T_('Insert IMG/link into post float:right');
-			}
-
-			if( $popfor == '' )
-			{
-				if( $current_User->check_perm( 'files', 'edit' ) )
-				{ // current user can edit files
-					$field_options['rename'] = T_('Rename files...');
-					$field_options['delete'] = T_('Delete files...');
-					// NOTE: No delete confirmation by javascript, we need to check DB integrity!
-				}
-				// BROKEN ?
-				$field_options['download'] = T_('Download files as ZIP archive...');
-
-				/* Not fully functional:
-				$field_options['copy'] = T_('Copy the selected files...');
-				$field_options['move'] = T_('Move the selected files...');
-				*/
-			}
-
-			$Form->switch_layout( 'none' );
-			$Form->select_input_array( 'group_action', $action, $field_options, ' &mdash; <strong>'.T_('With selected files').'</strong>' );
-			$Form->submit_input( array( 'name'=>'actionArray[group_action]', 'value'=>T_('Go!'), 'onclick'=>'return js_act_on_selected();' ) );
-			$Form->switch_layout( NULL );
-
-			/*
-			fp> the following has been integrated into the select.
-			if( $mode == 'upload' )
-			{	// We are uploading in a popup opened by an edit screen
-				?>
-				&mdash;
-				<input class="ActionButton"
-					title="<?php echo T_('Insert IMG or link tags for the selected files, directly into the post text'); ?>"
-					name="actionArray[img_tag]"
-					value="<?php echo T_('Insert IMG/link into post') ?>"
-					type="submit"
-					onclick="insert_tag_for_selected_files(); return false;" />
-				<?php
-				}
-			*/
-			?>
-			</td>
-			</tr>
-			<?php
-		}
-	}
-	?>
-	</tbody>
+}
+?>
+</tbody>
 </table>
 <?php
-	$Form->end_form();
-
-	if( $countFiles )
-	{{{ // include JS
-		// TODO: remove these javascript functions to an external .js file and include them through add_headline()
-		?>
-		<script type="text/javascript">
-			<!--
-			function js_act_on_selected()
-			{
-				// There may be an easier selector than below but couldn't make sense of it :(
-				selected_value = jQuery('#group_action option:selected').attr('value');
-				if( selected_value == 'img_tag_left' )
-				{
-					insert_tag_for_selected_files( 'left' );
-					return false;
-				}
-				if( selected_value == 'img_tag' )
-				{
-					insert_tag_for_selected_files( false );
-					return false;
-				}
-				if( selected_value == 'img_tag_right' )
-				{
-					insert_tag_for_selected_files( 'right' );
-					return false;
-				}
-				// other actions:
+$Form->end_form();
+
+// allow a plugin to provide it's own $file_tags array
+global $Plugins;
+if( $plugin_return = $Plugins->trigger_event_first_return( 'ItemInsertFileJavascript' ) )
+{
+	$editor_Plugin = & $Plugins->get_by_ID( $plugin_return['plugin_ID'] );
+	$file_tags = $plugin_return['plugin_return'];
+}
+// if we don't have one, we need one
+if( ! isset( $file_tags ) )
+{
+	$file_tags = array(
+		'insert_tag' => 'span',
+		'insert_class_floats' => 'FLOATDIRECTION center',
+		'insert_class_centered' => 'image_block',
+		'insert_style_floats' => 'STYLEWIDTH',
+		'insert_style_centered' => '',
+		'title_tag' => 'span',
+		'title_class' => 'image_title',
+		'title_style' => '',
+		'title_post' => '<br />',
+		'image_pre' => '',
+		'image_class' => 'center',
+		'image_style' => '',
+		'image_post' => '',
+		'caption_pre' => '<br />',
+		'caption_tag' => 'span',
+		'caption_class' => 'image_legend',
+		'caption_style' => '',
+		'caption_post' => '',
+		'caption_none' => '',
+		'caption_separator' => '',
+	);
+}
+
+/**
+ * @todo (legacy): remove these javascript functions to an external .js file and include them through add_headline()
+ */
+if( $countFiles )
+{{{ // include JS
+	?>
+	<script type="text/javascript">
+	<!--
+	/**
+	 * Prepare for inserting images or file links into the item/post
+	 */
+	function js_act_on_selected()
+	{
+		// There may be an easier selector than below but couldn't make sense of it :(
+		disp_value = jQuery('#group_action option:selected').attr('value');
+		title_action = jQuery('#title_action option:selected').attr('value');
+		caption_action = jQuery('#caption_action option:selected').attr('value');
+
+		if( disp_value == 'float_left' )
+		{
+			insert_tag_for_selected_files( 'float', 'left', title_action, caption_action );
+			return false;
+		}
+		if( disp_value == 'float_right' )
+		{
+			insert_tag_for_selected_files( 'float', 'right', title_action, caption_action );
+			return false;
+		}
+		if( disp_value == 'centered' )
+		{
+			insert_tag_for_selected_files( 'center', 'center', title_action, caption_action );
+			return false;
+		}
+		if( disp_value == 'inline' )
+		{
+			insert_tag_for_selected_files( 'inline', 'inline', title_action, caption_action );
+			return false;
+		}
+
+		// other actions:
+		return true;
+	}
+
+	/**
+	 * Check if files are selected. This should be used as "onclick" handler for
+	 * "With selected" actions (onclick="return check_if_selected_files();").
+	 * @return boolean true, if something is selected, false if not.
+	 */
+	function check_if_selected_files()
+	{
+		elems = document.getElementsByName( 'fm_selected[]' );
+		var checked = 0;
+		for( i = 0; i < elems.length; i++ )
+		{
+			if( elems[i].checked )
+			{
+				checked++;
+			}
+		}
+		if( !checked )
+		{
+			alert( '<?php echo TS_('Nothing selected.') ?>' );
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	/**
+	 * Insert IMG tags into parent window for selected files
+	 */
+	function insert_tag_for_selected_files( what, where, title_action, caption_action )
+	{
+		var elems = document.getElementsByName( 'fm_selected[]' );
+		var snippet = '';
+
+		// these values might come from an editor plugin :)
+		var insert_tag = '<?php echo $file_tags['insert_tag']; ?>';
+		if( what == 'float' )
+		{
+			var insert_class = '<?php echo $file_tags['insert_class_floats']; ?>';
+			var insert_style = '<?php echo $file_tags['insert_style_floats']; ?>';
+		}
+		else if( what == 'center' )
+		{
+			var insert_class = '<?php echo $file_tags['insert_class_centered']; ?>';
+			var insert_style = '<?php echo $file_tags['insert_style_centered']; ?>';
+		}
+		var title_open = '<?php echo $file_tags['title_tag']; ?>';
+		var title_class = '<?php echo $file_tags['title_class']; ?>';
+		var title_style = '<?php echo $file_tags['title_style']; ?>';
+		var title_post = '<?php echo $file_tags['title_post']; ?>';
+		var image_pre = '<?php echo $file_tags['image_pre']; ?>';
+		var image_class = '<?php echo $file_tags['image_class']; ?>';
+		var image_style = '<?php echo $file_tags['image_style']; ?>';
+		var image_post = '<?php echo $file_tags['image_post']; ?>';
+		var caption_pre = '<?php echo $file_tags['caption_pre']; ?>';
+		var caption_tag = '<?php echo $file_tags['caption_tag']; ?>';
+		var caption_class = '<?php echo $file_tags['caption_class']; ?>';
+		var caption_style = '<?php echo $file_tags['caption_style']; ?>';
+		var caption_post = '<?php echo $file_tags['caption_post']; ?>';
+		var caption_separator = '<?php echo $file_tags['caption_separator']; ?>';
+
+		var snippet = ''; // this is what we will eventually insert into the item
+		for( i = 0; i < elems.length; i++ )
+		{
+			if( elems[i].checked )
+			{
+				id = elems[i].id.substring( elems[i].id.lastIndexOf('_')+1, elems[i].id.length );
+				link_value = document.getElementById( 'link_'+id ).value;
+				title_value = document.getElementById( 'title_'+id ).value;
+				alttxt_value = document.getElementById( 'alttxt_'+id ).value;
+				caption_value = document.getElementById( 'caption_'+id ).value;
+				dimens_value = document.getElementById( 'dimens_'+id ).value;
+
+				// ensure we have both a title_value and an alttxt_value
+				var link_array = link_value.split( "/" );
+				var filename = link_array.pop();
+
+				// dimens_value effectively tells us if we have an image or not
+				if( dimens_value == '' )
+				{ // this is a non-image ... and it needs a lot of help but not now. images first...
+					
+					if( title_value == '' ) { title_value = filename; }
+					if( alttxt_value == '' ) { alttxt_value = '<?php echo TS_('Link to ') ?>' + filename; }
+					snippet += '<a href="' + link_value + '" title="' + alttxt_value + '">' + title_value + '</a> ';
+				}
+				else
+				{ // THIS IS AN IMAGE FILE - WOOHOO!
+					// prep work - set some variables we'll need along the way
+					var dims_arr = dimens_value.split( "x" ); // this is the image width
+					var calculated_width = Math.round( parseFloat( dims_arr[0] ) + 12 );
+					var image_tag = ''; // for first build
+					var begin_block = ''; // for second build
+					var end_block = ''; // for second build
+					var title_html = ''; // for third build
+					var caption_html = ''; // for fourth build
+
+					// FIRST BUILD: the image tag. inserts, floats, and centered will all use the image tag
+					image_tag = '<img src="' + link_value + '"';
+					if( alttxt_value == '' ) { alttxt_value = filename; }
+					image_tag += ' alt="' + alttxt_value + '"';
+					image_tag += ' width="' + dims_arr[0] + '" height="' + dims_arr[1] + '"';
+					if( image_class != '' ) { image_tag += ' class="' + image_class + '"'; }
+					if( what != 'inline' && image_style != '' ) { image_tag += ' style="' + image_style + '"'; }
+					image_tag += ' />';
+					// for floats and centered we might have pre- and post- stuff to add
+					if( what == 'float' || what == 'center' )
+					{
+						image_tag = image_pre + image_tag + image_post;
+					}
+
+					// SECOND BUILD: the overall insertion block (only floats and centered)
+					if( what == 'float' || what == 'center' )
+					{
+						begin_block = '<' + insert_tag;
+						if( insert_class != '' ) { begin_block += ' class="' + insert_class + '"'; }
+						if( insert_style != '' ) { begin_block += ' style="' + insert_style + '"'; }
+						begin_block += '>';
+						var splitblocktag = insert_tag.split(" ");
+						end_block = '</' + splitblocktag[0] + '>';
+
+						// THIRD BUILD: a title block if desired (only floats and centered)
+						if( ( title_action == 'default' && title_value != '' ) || title_action == 'placeholder' )
+						{ // we want the title and have one, or we want a placeholder
+							title_html = '<' + title_open;
+							if( title_class != '' ) { title_html += ' class="' + title_class + '"'; }
+							if( title_style != '' ) { title_html += ' style="' + title_style + '"'; }
+							title_html += '>';
+							if( title_action == 'placeholder' ) { title_value = '<?php echo TS_('TITLE PLACEHOLDER') ?>'; }
+							var splittitletag = title_open.split(" ");
+							title_html += title_value + '</' + splittitletag[0] + '>';
+							title_html += title_post;
+						}
+
+						// FOURTH BUILD: a caption block if desired
+						if( ( caption_action == 'default' && caption_value != '' ) || caption_action == 'placeholder' )
+						{ // we want the caption and have one, or we want a placeholder
+							caption_html = caption_pre + '<' + caption_tag;
+							if( caption_class != '' ) { caption_html += ' class="' + caption_class + '"'; }
+							if( caption_style != '' ) { caption_html += ' style="' + caption_style + '"'; }
+							caption_html += '>';
+							if( caption_action == 'placeholder' ) { caption_value = '<?php echo TS_('CAPTION PLACEHOLDER') ?>'; }
+							var splitcaptiontag = caption_tag.split(" ");
+							caption_html += caption_value + '</' + splitcaptiontag[0] + '>';
+							caption_html += caption_post + caption_separator;
+						}
+						else
+						{ // we need the "splitter" for TinyMCE and maybe others one day
+							caption_html = caption_none + caption_separator;
+						}
+
+					} // end floats and centered
+
+					// build the snippet and replace some things...
+					snippet += begin_block + title_html + image_tag + caption_html + end_block + ' ';
+					snippet = snippet.replace( /FLOATDIRECTION/g, 'float' + where );
+					snippet = snippet.replace( /STYLEWIDTH/g, 'width:' + calculated_width + 'px;' );
+					snippet = snippet.replace( /WIDTHONLY/g, calculated_width );
+
+				} // end 'this is an image'
+
+			} // end elems.checked
+
+		} // end for each elem
+
+		// check it...
+		if( ! snippet.length )
+		{ // eh?
+			alert( '<?php echo TS_('You must select at least one file!') ?>' );
+			return false;
+		}
+		else
+		{ // ship it!
+			if (! (window.focus && window.opener))
+			{
+				self.close();
 				return true;
 			}
-
-			/**
-			 * Check if files are selected.
-			 *
-			 * This should be used as "onclick" handler for "With selected" actions (onclick="return check_if_selected_files();").
-			 * @return boolean true, if something is selected, false if not.
-			 */
-			function check_if_selected_files()
-			{
-				elems = document.getElementsByName( 'fm_selected[]' );
-				var checked = 0;
-				for( i = 0; i < elems.length; i++ )
-				{
-					if( elems[i].checked )
-					{
-						checked++;
-					}
-				}
-				if( !checked )
-				{
-					alert( '<?php echo TS_('Nothing selected.') ?>' );
-					return false;
-				}
-				else
-				{
-					return true;
-				}
-			}
-
-			/**
-			 * Insert IMG tags into parent window for selected files:
-			 */
-			function insert_tag_for_selected_files( floatdir )
-			{
-				var elems = document.getElementsByName( 'fm_selected[]' );
-				var snippet = '';
-				for( i = 0; i < elems.length; i++ )
-				{
-					if( elems[i].checked )
-					{
-						id = elems[i].id.substring( elems[i].id.lastIndexOf('_')+1, elems[i].id.length );
-						img_tag_info_field = document.getElementById( 'img_tag_'+id ).value;
-						// floating left or right?
-						if( floatdir == 'left' || floatdir == 'right' )
-						{
-							var pre_caption = '';
-							var the_caption = '';
-							var image_class = floatdir+'margin';
-							var image_caption = img_tag_info_field.split( "image_legend\">" );
-							if( image_caption.length > 1 )
-							{
-								image_caption = image_caption[1];
-								the_caption = image_caption.split( "<\/div>" );
-								pre_caption = '<span class="imgwrap float'+floatdir+' center">';
-								the_caption = '<br /><span class="image_legend">'+the_caption[0]+'</span></span>';
-								image_class = 'spanimage';
-							}
-							img_tag_info_field = img_tag_info_field.replace(/^.*(<img.+?)( \/>).*$/, pre_caption+'$1 class="'+image_class+'"$2'+the_caption );
-						}
-						snippet += img_tag_info_field + ' ';
-					}
-				}
-				if( ! snippet.length )
-				{
-					alert( '<?php echo TS_('You must select at least one file!') ?>' );
-					return false;
-				}
-				else
-				{
-					if (! (window.focus && window.opener))
-					{
-						self.close();
-						return true;
-					}
-					window.opener.focus();
-					textarea_wrap_selection( window.opener.document.getElementById("itemform_post_content"), snippet, '', 1, window.opener.document );
-					self.close();
-					return true;
-				}
-			}
-			// -->
-		</script>
-		<?php
+			window.opener.focus();
+			textarea_wrap_selection( window.opener.document.getElementById("itemform_post_content"), snippet, '', 1, window.opener.document );
+			self.close();
+			return true;
+		}
+
+	}
+	// -->
+	</script>
+	<?php
 	}}}
 ?>
-<!-- End of detailed file list -->
-<?php
-?>
+<!-- End of detailed file list but not the end of html comments in our code, obviously ;) -->

=== modified file 'qp_inc/plugins/_plugin.class.php'
--- qp_inc/plugins/_plugin.class.php	2011-02-01 17:45:46 +0000
+++ qp_inc/plugins/_plugin.class.php	2011-03-08 04:29:14 +0000
@@ -1347,6 +1347,16 @@
 
 
 	/**
+	 * Event handler: allows an editor plugin to write custom tags when inserting a file, usually an image.
+	 *
+	 * @return array Tags used to wrap files (usually images)
+	 */
+	function ItemInsertFileJavascript()
+	{
+	}
+
+
+	/**
 	 * Event handler: send a ping about a new item.
 	 *
 	 * @param array Associative array of parameters

=== modified file 'qp_inc/plugins/model/_plugins_admin.class.php'
--- qp_inc/plugins/model/_plugins_admin.class.php	2011-01-31 22:13:02 +0000
+++ qp_inc/plugins/model/_plugins_admin.class.php	2011-03-08 04:29:14 +0000
@@ -166,6 +166,7 @@
 				'ItemCanComment' => 'Asks the plugin if an item can receive comments/feedback.',
 				'ItemSendPing' => 'Send a ping to a service about new items.',
 				'ItemViewsIncreased' => 'Called when the view counter of an item got increased.',
+				'ItemInsertFileJavascript' => 'Allows an editor plugin to write custom tags when inserting a file, usually an image.',
 
 				'TemplateTag' => 'This method gets invoked when a plugin is called by its code. Providing this method causes the plugin to be listed as a widget.',
 

=== modified file 'qp_install/_functions_create.php'
--- qp_install/_functions_create.php	2010-12-31 12:12:03 +0000
+++ qp_install/_functions_create.php	2011-03-08 04:29:14 +0000
@@ -1058,7 +1058,7 @@
 	// Insert a post into blog #1:
 	$now = date('Y-m-d H:i:s',installer_timestamp());
 	$edited_Item = new Item();
-	$edited_Item->insert( 1, T_('Inserted Image post'), T_('<p><span class="imgwrap floatright center"><img src="'.$app_baseurl.'media/blogs/id_1/waterfall.jpg" alt="waterfall" title="waterfall" width="160" height="240" class="spanimage" /><br /><span class="image_legend">waterfall</span></span> This waterfall image was re-sized before uploading, then uploaded using the <strong>quick upload</strong> feature. Therefore the file name is also the title, alt text, and image caption. You can customize those details and even rename the file when you upload it if you use <strong>advanced upload properties</strong>, which is discussed in a different post.</p>
+	$edited_Item->insert( 1, T_('Inserted Image post'), T_('<p><span class="floatright center"><img src="'.$app_baseurl.'media/blogs/id_1/waterfall.jpg" alt="waterfall" title="waterfall" width="160" height="240" class="spanimage" /><br /><span class="image_legend">waterfall</span></span> This waterfall image was re-sized before uploading, then uploaded using the <strong>quick upload</strong> feature. Therefore the file name is also the title, alt text, and image caption. You can customize those details and even rename the file when you upload it if you use <strong>advanced upload properties</strong>, which is discussed in a different post.</p>
 
 <p>This image is floated to the right which is why the text flows alongside and under the image.  When you insert an image you can float it right, or left, or have it centered in a &lt;div&gt; if you like.</p>
 

=== modified file 'qp_plugins/tinymce_plugin/README.html'
--- qp_plugins/tinymce_plugin/README.html	2010-12-18 18:52:49 +0000
+++ qp_plugins/tinymce_plugin/README.html	2011-03-08 04:29:14 +0000
@@ -44,10 +44,42 @@
 <dt>Plugin Settings:</dt>
 <dd><ul>
 <li><span class="settings">Use TinyMCE (default)</span>: Sets the default condition for whether or not to use this plugin, which users can override in their profile. Default value is OFF (unchecked).</li>
-<li><span class="settings">Use compressor</span>: For users with slow internet connections, check this option to use "compressed" versions of the javascript files. Default value is OFF (unchecked).</li>
 <li><span class="settings">Directionality support</span>: This allows for better handling of "right to left" languages by providing buttons to switch between LTR and RTL. Default value is OFF (unchecked).</li>
 <li><span class="settings">Custom TinyMCE init</span>: I have no idea what this one does. All I know is the plugin has a setting for it and you get to type stuff in a box, so here it is in the readme file :) This field defaults to something.</li>
 </ul></dd>
+<dt>Insert Image Settings:</dt>
+<dd>Settings in blue are plain text only, settings in green allow html inputs<br />
+<strong>overall html block settings:</strong>
+<ul>
+<li><span class="settings_b">insert tag</span>: The tag for the overall "inserted image" block.  For core it is a simple 'span', for TinyMCE the default is a bit more complicated: <code>table align="center" width="WIDTHONLY"</code></li>
+<li><span class="settings_b">insert class (floats) / (centered)</span>: 2 settings, this is the class applied to the tag above. One for floating an image, the other for centering an image. If blank then class is not used.  Default is <code>FLOATDIRECTION</code></li>
+<li><span class="settings_b">insert style (floats) / (centered)</span>: 2 settings, this is the style applied to the tag above. One for floating an image, the other for centering an image. If blank then style is not used.  Default is <code>image_block center</code></li>
+</ul>
+<strong>title section settings:</strong>
+<ul>
+<li><span class="settings_b">title tag</span>: If you are using a title with your image, this is the tag for that section of the inserted code. Default is <code>caption</code></li>
+<li><span class="settings_b">title class</span>: This is the class applied to the title tag. If blank then class is not used. Default is <code>image_title</code></li>
+<li><span class="settings_b">title style</span>: This is the style applied to the title tag. If blank then style is not used. Default is (blank).</li>
+<li><span class="settings_c">post-title</span>: If a title section is used, this allows for some html bits after the title section. Core uses it, TinyMCE does not. Default is (blank)</li>
+</ul>
+<strong>image section settings:</strong>
+<ul>
+<li><span class="settings_c">pre-image</span>: This allows some html bits before the actual image tag. Default is <code>&lt;tbody>&lt;tr>&lt;td></code></li>
+<li><span class="settings_b">image class</span>: This is the class applied to the image tag. Default is <code>center</code></li>
+<li><span class="settings_b">image style</span>: This is the style applied to the image tag. Default is (blank)</li>
+<li><span class="settings_c">post-image</span>: This allows some html bits before the actual image tag. Default is (blank)</li>
+</ul>
+<strong>caption section settings:</strong>
+<ul>
+<li><span class="settings_c">pre-caption</span>: If a caption is present, this allows some html bits before the caption section. Default is <code>&lt;/td>&lt;/tr>&lt;tr></code></li>
+<li><span class="settings_b">caption tag</span>: The tag for the actual caption section. Default is <code>td</code></li>
+<li><span class="settings_b">caption class</span>: This is the class applied to the caption tag. Default is <code>image_legend</code></li>
+<li><span class="settings_b">caption style</span>: This is the style applied to the caption tag. Default is (blank)</li>
+<li><span class="settings_c">post-caption</span>: If a caption is present, this allows some html bits after the caption section. Default is (blank)</li>
+<li><span class="settings_c">NO caption</span>: If there is no caption present, this allows some html bits to fill that space sort of. TinyMCE needs it to close a TD. Default is <code>&lt;/td></code></li>
+<li><span class="settings_c">post caption separator</span>: This allows some html bits before closing the entire "insert image" block.  Default is <code>&lt;/tr>&lt;/tbody></code></li>
+</ul></dd>
+
 <dt>User Settings:</dt>
 <dd><ul>
 <li><span class="settings">Use TinyMCE</span>: This allows each user to use (or not use) the TinyMCE plugin. Default value is set by the installation owner on the plugin's settings page.</li>
@@ -69,11 +101,14 @@
 <dl>
 <dt>More Info:</dt>
 <dd><ul>
-<li>No additional information provided by the author.</li>
+<li>For all settings: if you enter "FLOATDIRECTION" (no quote marks) it will be replaced with "floatleft" or "floatright" depending on which way you want to float an image. The primary purpose is for a "class" attribute.</li>
+<li>For all settings: if you enter "STYLEWIDTH" (no quote marks) it will be replaced with "width:XXXpx;", where XXX is the image's width plus 12. The primary purpose is for a "style" attribute.</li>
+<li>For all settings: if you enter "WIDTHONLY" (no quote marks) it will be replaced with "XXX", where XXX is the image's width plus 12. The primary purpose is for a "width" attribute for a table.</li>
 </ul></dd>
 <dt>Credits:</dt>
 <dd><ul>
 <li>Thanks to Daniel Hahler (http://daniel.hahler.de/) for initial creation and release of this plugin for the b2evolution (http://b2evolution.net) project.</li>
+<li>Thanks to Kimberly (http://secretcorners.net/) for hammering on how inserting an image sucks when someone uses TinyMCE else this revision never would have been thought of.</li>
 </ul></dd>
 <dt>Links:</dt>
 <dd><ul>
@@ -87,10 +122,11 @@
 <h2>Release History:</h2>
 <div id="log">
 <dl>
+<dt>1.0</dt><dd>Uses new hook and settings to allow inserting in tables instead of spans (24-Feb-11)</dd>
 <dt>0.1</dt><dd>initial release (1-Jan-11)</dd>
 </dl>
 </div>
 
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

=== modified file 'qp_plugins/tinymce_plugin/_tinymce.plugin.php'
--- qp_plugins/tinymce_plugin/_tinymce.plugin.php	2010-09-25 12:29:17 +0000
+++ qp_plugins/tinymce_plugin/_tinymce.plugin.php	2011-03-08 04:29:14 +0000
@@ -53,7 +53,9 @@
 	 */
 	function GetDefaultSettings( & $params )
 	{
-		return array(
+		$plain_text_only = '<strong>'.T_('plain text only').'</strong>';
+		$html_allowed = '<strong class="red">'.T_('html allowed').'</strong>';
+		$default_settings = array(
 			'default_use_tinymce' => array(
 				'label' => $this->T_('Use TinyMCE (default)'),
 				'type' => 'checkbox',
@@ -74,9 +76,258 @@
 						.'height : "400"',
 				'note' => sprintf( $this->T_('Custom parameters to tinyMCE.init(). See the <a %s>TinyMCE manual</a>.'), 'href="http://wiki.moxiecode.com/index.php/TinyMCE:Configuration"' ),
 			),
+			'primary_start' => array(
+				'label' => $this->T_('Insert Image Settings'),
+				'layout' => 'begin_fieldset',
+			),
+			'primary_info' => array(
+				'label' => $this->T_('WARNING'),
+				'type' => 'info',
+				'info' => $this->T_('<strong>DO NOT CHANGE THE NEXT 20 SETTINGS IF YOU ARE NOT GOOD WITH HTML!!!</strong><ul><li>For all settings: if you enter "FLOATDIRECTION" (no quote marks) it will be replaced with "floatleft" or "floatright" depending on which way you want to float an image. The primary purpose is for a "class" attribute.</li><li>For all settings: if you enter "STYLEWIDTH" (no quote marks) it will be replaced with "width:XXXpx;", where XXX is the image\'s width plus 12. The primary purpose is for a "style" attribute.</li><li>For all settings: if you enter "WIDTHONLY" (no quote marks) it will be replaced with "XXX", where XXX is the image\'s width plus 12. The primary purpose is for a "width" attribute for a table (TinyMCE).</li><ul>'),
+			),
+			'primary_info_b' => array(
+				'label' => $this->T_('Info'),
+				'type' => 'info',
+				'info' => $this->T_('These settings appear in roughly the order they are used to help make sense of it all.<ul><li>Some settings are marked either "(floats)" or "(centered)". If we need different values for floating or centering we do it, otherwise the setting is shared across both methods.</li><li>ONLY "image class" and "image style" are used when inserting an image inline.</li></ul>'),
+			),
+			'overallblock_start' => array(
+				'label' => $this->T_('overall html block settings'),
+				'layout' => 'begin_fieldset',
+			),
+			'overallblock_info' => array(
+				'label' => $this->T_('Info'),
+				'type' => 'info',
+				'info' => $this->T_('These are for the entire inserted html block (title if present, image, and caption if present).'),
+			),
+			'insert_tag' => array(
+				'label' => $this->T_('insert tag'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => 'table align="center" width="WIDTHONLY"',
+				'note' => '<br />'.$plain_text_only,
+			),
+			'insert_class_floats' => array(
+				'label' => $this->T_('insert class (floats)'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => 'FLOATDIRECTION',
+				'note' => '<br />'.$plain_text_only,
+			),
+			'insert_class_centered' => array(
+				'label' => $this->T_('insert class (centered)'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => 'image_block center',
+				'note' => '<br />'.$plain_text_only,
+			),
+			'insert_style_floats' => array(
+				'label' => $this->T_('insert style (floats)'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => '',
+				'note' => '<br />'.$plain_text_only,
+			),
+			'insert_style_centered' => array(
+				'label' => $this->T_('insert style (centered)'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => '',
+				'note' => '<br />'.$plain_text_only,
+			),
+			'overallblock_end' => array( 'layout' => 'end_fieldset' ),
+
+			'titlesection_start' => array(
+				'label' => $this->T_('title section settings'),
+				'layout' => 'begin_fieldset',
+			),
+			'titlesection_info' => array(
+				'label' => $this->T_('Info'),
+				'type' => 'info',
+				'info' => $this->T_('These are used only if the title is displayed ("default" and a title exists, or "placeholder").'),
+			),
+			'title_tag' => array(
+				'label' => $this->T_('title tag'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => 'caption',
+				'note' => '<br />'.$plain_text_only,
+			),
+			'title_class' => array(
+				'label' => $this->T_('title class'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => 'image_title',
+				'note' => '<br />'.$plain_text_only,
+			),
+			'title_style' => array(
+				'label' => $this->T_('title style'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => '',
+				'note' => '<br />'.$plain_text_only,
+			),
+			'title_post' => array(
+				'label' => $this->T_('post-title'),
+				'type' => 'html_textarea', // allows "<"
+				'rows' => 1,
+				'cols' => 60,
+				'defaultvalue' => '',
+				'note' => $this->T_('added after closing the "title tag" ONLY IF there is a title').' &middot; '.$html_allowed,
+			),
+			'titlesection_end' => array( 'layout' => 'end_fieldset' ),
+			'imagesection_start' => array(
+				'label' => $this->T_('image section settings'),
+				'layout' => 'begin_fieldset',
+			),
+			'imagesection_info' => array(
+				'label' => $this->T_('Info'),
+				'type' => 'info',
+				'info' => $this->T_('These settings affect the actual IMG tag, including possible code before and after the image tag.'),
+			),
+			'imagesection_pre_start' => array(
+				'label' => $this->T_('before the image tag'),
+				'layout' => 'begin_fieldset',
+			),
+			'imagesection_pre_info' => array(
+				'label' => $this->T_('Info'),
+				'type' => 'info',
+				'info' => $this->T_('This is used between the title section and the image tag, even if there is no title section displayed.'),
+			),
+			'image_pre' => array(
+				'label' => $this->T_('pre-image'),
+				'type' => 'html_textarea', // allows "<"
+				'rows' => 1,
+				'cols' => 60,
+				'defaultvalue' => '<tbody><tr><td>',
+				'note' => $html_allowed,
+			),
+			'imagesection_pre_end' => array( 'layout' => 'end_fieldset' ),
+			'imagesection_attribs_start' => array(
+				'label' => $this->T_('image tag attributes'),
+				'layout' => 'begin_fieldset',
+			),
+			'image_class' => array(
+				'label' => $this->T_('image class'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => 'center',
+				'note' => '<br />'.$this->T_('class value for the IMG tag').' &middot; '.$plain_text_only,
+			),
+			'image_style' => array(
+				'label' => $this->T_('image style'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => '',
+				'note' => '<br />'.$this->T_('style value for the IMG tag').' &middot; '.$plain_text_only,
+			),
+			'imagesection_attribs_end' => array( 'layout' => 'end_fieldset' ),
+			'imagesection_post_start' => array(
+				'label' => $this->T_('after the image tag'),
+				'layout' => 'begin_fieldset',
+			),
+			'imagesection_post_info' => array(
+				'label' => $this->T_('Info'),
+				'type' => 'info',
+				'info' => $this->T_('This is used between the image tag and the caption section, even if there is no caption section displayed.'),
+			),
+			'image_post' => array(
+				'label' => $this->T_('post-image'),
+				'type' => 'html_textarea', // allows "<"
+				'rows' => 1,
+				'cols' => 60,
+				'defaultvalue' => '',
+				'note' => $html_allowed,
+			),
+			'imagesection_post_end' => array( 'layout' => 'end_fieldset' ),
+			'imagesection_end' => array( 'layout' => 'end_fieldset' ),
+			'captionsection_start' => array(
+				'label' => $this->T_('caption section settings'),
+				'layout' => 'begin_fieldset',
+			),
+			'captionsection_info' => array(
+				'label' => $this->T_('Info'),
+				'type' => 'info',
+				'info' => $this->T_('These are used only if the caption is displayed ("default" and a caption exists, or "placeholder").'),
+			),
+			'caption_pre' => array(
+				'label' => $this->T_('pre-caption'),
+				'type' => 'html_textarea', // allows "<"
+				'rows' => 1,
+				'cols' => 60,
+				'defaultvalue' => '</td></tr><tr>',
+				'note' => $this->T_('before the caption section tag').' &middot; '.$html_allowed,
+			),
+			'caption_tag' => array(
+				'label' => $this->T_('caption tag'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => 'td',
+				'note' => '<br />'.$plain_text_only,
+			),
+			'caption_class' => array(
+				'label' => $this->T_('caption class'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => 'image_legend',
+				'note' => '<br />'.$plain_text_only,
+			),
+			'caption_style' => array(
+				'label' => $this->T_('caption style'),
+				'type' => 'text',
+				'size' => 64,
+				'defaultvalue' => '',
+				'note' => '<br />'.$plain_text_only,
+			),
+			'caption_post' => array(
+				'label' => $this->T_('post-caption'),
+				'type' => 'html_textarea', // allows "<"
+				'rows' => 1,
+				'cols' => 60,
+				'defaultvalue' => '',
+				'note' => $this->T_('used after closing the caption tag').' &middot; '.$html_allowed,
+			),
+			'nocaption_start' => array(
+				'label' => $this->T_('no caption displayed'),
+				'layout' => 'begin_fieldset',
+			),
+			'nocaption_info' => array(
+				'label' => $this->T_('Info'),
+				'type' => 'info',
+				'info' => $this->T_('This is used only if there is no caption present (useful for TinyMCE)'),
+			),
+			'caption_none' => array(
+				'label' => $this->T_('NO caption'),
+				'type' => 'html_textarea', // allows "<"
+				'rows' => 1,
+				'cols' => 60,
+				'defaultvalue' => '</td>',
+				'note' => $html_allowed,
+			),
+			'nocaption_end' => array( 'layout' => 'end_fieldset' ),
+			'captionsplitter_start' => array(
+				'label' => $this->T_('Caption -> Closing separator'),
+				'layout' => 'begin_fieldset',
+			),
+			'captionsplitter_info' => array(
+				'label' => $this->T_('Info'),
+				'type' => 'info',
+				'info' => $this->T_('This is used between the caption section and the overall block closing, even if there is no caption section displayed.'),
+			),
+			'caption_separator' => array(
+				'label' => $this->T_('post caption separator'),
+				'type' => 'html_textarea', // allows "<"
+				'rows' => 1,
+				'cols' => 60,
+				'defaultvalue' => '</tr></tbody>',
+				'note' => $html_allowed,
+			),
+			'captionsplitter_end' => array( 'layout' => 'end_fieldset' ),
+			'captionsection_end' => array( 'layout' => 'end_fieldset' ),
 		);
+		return $default_settings;
 	}
 
+
 	/**
 	 * @see Plugin::GetExtraEvents()
 	 *
@@ -183,7 +434,7 @@
 		* @todo EdB: forcing expert to do away with simple but 'edit_layout' is still around (and still valuable?)
 		*
 		* <input id="tinymce_plugin_toggle_button" type="button" value="WYSIWYG" style="display:none"
-		* 	title="<?php echo htmlspecialchars($this->T_('Toggle between WYSIWYG and plain HTML editor')); ?>" />
+		*  title="<?php echo htmlspecialchars($this->T_('Toggle between WYSIWYG and plain HTML editor')); ?>" />
 		*
 		*/
 		$tmce_init = $this->get_tmce_init( 'expert' );
@@ -327,26 +578,26 @@
 
 		<?php
 		if( is_object($edited_Item) && !empty($edited_Item->editor_code) )
-		{	// We have a preference for the current post, follow it:
+		{ // We have a preference for the current post, follow it:
 			// Use tinyMCE if code matched the code of the current plugin.
 			// fp> Note: this is a temporary solution; in the long term, this will be part of the API and the appropriate plugin will be selected.
 			$use_tinymce = ($edited_Item->editor_code == $this->code);
 		}
 		else
-		{	// We have no pref, fall back to whatever current user has last used:
+		{ // We have no pref, fall back to whatever current user has last used:
 
 			// Has the user used MCE last time he edited this particular blog?
 			$use_tinymce = $this->UserSettings->get('use_tinymce_coll'.$Blog->ID );
 
 			if( is_null($use_tinymce) )
-			{	// We don't know for this blog, check if he used MCE last time he edited anything:
+			{ // We don't know for this blog, check if he used MCE last time he edited anything:
 				$use_tinymce = $this->UserSettings->get('use_tinymce');
 			}
 		}
 
 		if( $use_tinymce )
 		{ // User used MCE last time, load MCE now:
- 			// fp> why do we need to wrap in jQuery() here?
+			// fp> why do we need to wrap in jQuery() here?
 			echo '<script type="text/javascript">jQuery( tinymce_plugin_toggleEditor("'.$this->tmce_editor_id.'") );</script>';
 		}
 
@@ -487,7 +738,7 @@
 			$Template = $TemplateCache->get_by_ID( $Blog->template_ID );
 			$item_css_url = $templates_url.$Template->folder.'/item.css';
 			// else: $item_css_url = $rsc_url.'css/item_base.css';
-			$content_css = ','.$item_css_url;		// fp> TODO: this needs to be a param... "of course" -- if none: else item_default.css ?
+			$content_css = ','.$item_css_url; // fp> TODO: this needs to be a param... "of course" -- if none: else item_default.css ?
 		}
 		// else item_default.css -- is it still possible to have no template ?
 
@@ -499,7 +750,7 @@
 		$init_options[] = 'entity_encoding : "raw"';
 
 		// remove_linebreaks : false,
-		// not documented:	auto_cleanup_word : true,
+		// not documented: auto_cleanup_word : true,
 
 		$init = implode( ",\n", $init_options ).',
 			plugin_insertdate_dateFormat : "%Y-%m-%d",
@@ -538,7 +789,7 @@
 
 		// fp>This is a super dirty hack that we're going to use only until we have a clean API for handling WYSIWYG editors:
 		if( !empty($params['item']) )
-		{	// Save the status last used by this Item:
+		{ // Save the status last used by this Item:
 			// fp> TODO: also do that on CREATE post because it won't have been done here:
 			$sql = 'UPDATE T_items__item
 								 SET post_editor_code = '.$DB->quote( (int)$params['on'] ? $this->code : 'html' )
@@ -548,7 +799,7 @@
 
 		// Clean:
 		if( !empty($params['blog']) )
-		{	// This is in order to try & recall a specific state for each blog: (will be used for new posts especially)
+		{ // This is in order to try & recall a specific state for each blog: (will be used for new posts especially)
 			$this->UserSettings->set( 'use_tinymce_coll'.(int)$params['blog'], (int)$params['on'] );
 		}
 		$this->UserSettings->set( 'use_tinymce', (int)$params['on'] );
@@ -564,6 +815,41 @@
 		return array('save_editor_state');
 	}
 
+
+	/**
+	 * @see Plugin::ItemInsertFileJavascript()
+	 */
+	function ItemInsertFileJavascript()
+	{
+		if( ! $this->UserSettings->get('use_tinymce') )
+		{ // if this user does not use tinymce get out
+			return NULL;
+		}
+		// provide custom tag bits
+		return array(
+			'insert_tag' => $this->Settings->get('insert_tag'),
+			'insert_class_floats' => $this->Settings->get('insert_class_floats'),
+			'insert_class_centered' => $this->Settings->get('insert_class_centered'),
+			'insert_style_floats' => $this->Settings->get('insert_style_floats'),
+			'insert_style_centered' => $this->Settings->get('insert_style_centered'),
+			'title_tag' => $this->Settings->get('title_tag'),
+			'title_class' => $this->Settings->get('title_class'),
+			'title_style' => $this->Settings->get('title_style'),
+			'title_post' => $this->Settings->get('title_post'),
+			'image_pre' => $this->Settings->get('image_pre'),
+			'image_class' => $this->Settings->get('image_class'),
+			'image_style' => $this->Settings->get('image_style'),
+			'image_post' => $this->Settings->get('image_post'),
+			'caption_pre' => $this->Settings->get('caption_pre'),
+			'caption_tag' => $this->Settings->get('caption_tag'),
+			'caption_class' => $this->Settings->get('caption_class'),
+			'caption_style' => $this->Settings->get('caption_style'),
+			'caption_post' => $this->Settings->get('caption_post'),
+			'caption_none' => $this->Settings->get('caption_none'),
+			'caption_separator' => $this->Settings->get('caption_separator'),
+		);
+	}
+
 }
 
 ?>

=== modified file 'qp_plugins/tinymce_plugin/po/messages.pot'
--- qp_plugins/tinymce_plugin/po/messages.pot	2010-10-22 15:20:35 +0000
+++ qp_plugins/tinymce_plugin/po/messages.pot	2011-03-08 04:29:14 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://quamplures.net/\n"
-"POT-Creation-Date: 2010-09-06 10:50-0700\n"
+"Report-Msgid-Bugs-To: http://quam-plures.net/\n"
+"POT-Creation-Date: 2011-02-23 22:32-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -28,49 +28,253 @@
 msgid "Provides a javascript-powered \"WYSIWYG\" editor. Note that this editor sometimes makes \"bad\" code. If validation is important to you then you might be unhappy."
 msgstr ""
 
-#: ../_tinymce.plugin.php:58
+#: ../_tinymce.plugin.php:56
+msgid "plain text only"
+msgstr ""
+
+#: ../_tinymce.plugin.php:57
+msgid "html allowed"
+msgstr ""
+
+#: ../_tinymce.plugin.php:60
 msgid "Use TinyMCE (default)"
 msgstr ""
 
-#: ../_tinymce.plugin.php:61
+#: ../_tinymce.plugin.php:63
 msgid "This is the default, which users can override in their profile."
 msgstr ""
 
-#: ../_tinymce.plugin.php:64
-#: ../_tinymce.plugin.php:137
+#: ../_tinymce.plugin.php:66
+#: ../_tinymce.plugin.php:388
 msgid "Directionality support"
 msgstr ""
 
-#: ../_tinymce.plugin.php:67
+#: ../_tinymce.plugin.php:69
 msgid "Enable to add directionality icons to TinyMCE for better handling of right-to-left languages"
 msgstr ""
 
-#: ../_tinymce.plugin.php:70
+#: ../_tinymce.plugin.php:72
 msgid "Custom TinyMCE init"
 msgstr ""
 
-#: ../_tinymce.plugin.php:75
+#: ../_tinymce.plugin.php:77
 #, php-format
 msgid "Custom parameters to tinyMCE.init(). See the <a %s>TinyMCE manual</a>."
 msgstr ""
 
-#: ../_tinymce.plugin.php:130
+#: ../_tinymce.plugin.php:80
+msgid "Insert Image Settings"
+msgstr ""
+
+#: ../_tinymce.plugin.php:84
+msgid "WARNING"
+msgstr ""
+
+#: ../_tinymce.plugin.php:86
+msgid "<strong>DO NOT CHANGE THE NEXT 20 SETTINGS IF YOU ARE NOT GOOD WITH HTML!!!</strong><ul><li>For all settings: if you enter \"FLOATDIRECTION\" (no quote marks) it will be replaced with \"floatleft\" or \"floatright\" depending on which way you want to float an image. The primary purpose is for a \"class\" attribute.</li><li>For all settings: if you enter \"STYLEWIDTH\" (no quote marks) it will be replaced with \"width:XXXpx;\", where XXX is the image's width plus 12. The primary purpose is for a \"style\" attribute.</li><li>For all settings: if you enter \"WIDTHONLY\" (no quote marks) it will be replaced with \"XXX\", where XXX is the image's width plus 12. The primary purpose is for a \"width\" attribute for a table (TinyMCE).</li><ul>"
+msgstr ""
+
+#: ../_tinymce.plugin.php:89
+#: ../_tinymce.plugin.php:98
+#: ../_tinymce.plugin.php:144
+#: ../_tinymce.plugin.php:183
+#: ../_tinymce.plugin.php:192
+#: ../_tinymce.plugin.php:229
+#: ../_tinymce.plugin.php:248
+#: ../_tinymce.plugin.php:294
+#: ../_tinymce.plugin.php:312
+msgid "Info"
+msgstr ""
+
+#: ../_tinymce.plugin.php:91
+msgid "These settings appear in roughly the order they are used to help make sense of it all.<ul><li>Some settings are marked either \"(floats)\" or \"(centered)\". If we need different values for floating or centering we do it, otherwise the setting is shared across both methods.</li><li>ONLY \"image class\" and \"image style\" are used when inserting an image inline.</li></ul>"
+msgstr ""
+
+#: ../_tinymce.plugin.php:94
+msgid "overall html block settings"
+msgstr ""
+
+#: ../_tinymce.plugin.php:100
+msgid "These are for the entire inserted html block (title if present, image, and caption if present)."
+msgstr ""
+
+#: ../_tinymce.plugin.php:103
+msgid "insert tag"
+msgstr ""
+
+#: ../_tinymce.plugin.php:110
+msgid "insert class (floats)"
+msgstr ""
+
+#: ../_tinymce.plugin.php:117
+msgid "insert class (centered)"
+msgstr ""
+
+#: ../_tinymce.plugin.php:124
+msgid "insert style (floats)"
+msgstr ""
+
+#: ../_tinymce.plugin.php:131
+msgid "insert style (centered)"
+msgstr ""
+
+#: ../_tinymce.plugin.php:140
+msgid "title section settings"
+msgstr ""
+
+#: ../_tinymce.plugin.php:146
+msgid "These are used only if the title is displayed (\"default\" and a title exists, or \"placeholder\")."
+msgstr ""
+
+#: ../_tinymce.plugin.php:149
+msgid "title tag"
+msgstr ""
+
+#: ../_tinymce.plugin.php:156
+msgid "title class"
+msgstr ""
+
+#: ../_tinymce.plugin.php:163
+msgid "title style"
+msgstr ""
+
+#: ../_tinymce.plugin.php:170
+msgid "post-title"
+msgstr ""
+
+#: ../_tinymce.plugin.php:175
+msgid "added after closing the \"title tag\" ONLY IF there is a title"
+msgstr ""
+
+#: ../_tinymce.plugin.php:179
+msgid "image section settings"
+msgstr ""
+
+#: ../_tinymce.plugin.php:185
+msgid "These settings affect the actual IMG tag, including possible code before and after the image tag."
+msgstr ""
+
+#: ../_tinymce.plugin.php:188
+msgid "before the image tag"
+msgstr ""
+
+#: ../_tinymce.plugin.php:194
+msgid "This is used between the title section and the image tag, even if there is no title section displayed."
+msgstr ""
+
+#: ../_tinymce.plugin.php:197
+msgid "pre-image"
+msgstr ""
+
+#: ../_tinymce.plugin.php:206
+msgid "image tag attributes"
+msgstr ""
+
+#: ../_tinymce.plugin.php:210
+msgid "image class"
+msgstr ""
+
+#: ../_tinymce.plugin.php:214
+msgid "class value for the IMG tag"
+msgstr ""
+
+#: ../_tinymce.plugin.php:217
+msgid "image style"
+msgstr ""
+
+#: ../_tinymce.plugin.php:221
+msgid "style value for the IMG tag"
+msgstr ""
+
+#: ../_tinymce.plugin.php:225
+msgid "after the image tag"
+msgstr ""
+
+#: ../_tinymce.plugin.php:231
+msgid "This is used between the image tag and the caption section, even if there is no caption section displayed."
+msgstr ""
+
+#: ../_tinymce.plugin.php:234
+msgid "post-image"
+msgstr ""
+
+#: ../_tinymce.plugin.php:244
+msgid "caption section settings"
+msgstr ""
+
+#: ../_tinymce.plugin.php:250
+msgid "These are used only if the caption is displayed (\"default\" and a caption exists, or \"placeholder\")."
+msgstr ""
+
+#: ../_tinymce.plugin.php:253
+msgid "pre-caption"
+msgstr ""
+
+#: ../_tinymce.plugin.php:258
+msgid "before the caption section tag"
+msgstr ""
+
+#: ../_tinymce.plugin.php:261
+msgid "caption tag"
+msgstr ""
+
+#: ../_tinymce.plugin.php:268
+msgid "caption class"
+msgstr ""
+
+#: ../_tinymce.plugin.php:275
+msgid "caption style"
+msgstr ""
+
+#: ../_tinymce.plugin.php:282
+msgid "post-caption"
+msgstr ""
+
+#: ../_tinymce.plugin.php:287
+msgid "used after closing the caption tag"
+msgstr ""
+
+#: ../_tinymce.plugin.php:290
+msgid "no caption displayed"
+msgstr ""
+
+#: ../_tinymce.plugin.php:296
+msgid "This is used only if there is no caption present (useful for TinyMCE)"
+msgstr ""
+
+#: ../_tinymce.plugin.php:299
+msgid "NO caption"
+msgstr ""
+
+#: ../_tinymce.plugin.php:308
+msgid "Caption -> Closing separator"
+msgstr ""
+
+#: ../_tinymce.plugin.php:314
+msgid "This is used between the caption section and the overall block closing, even if there is no caption section displayed."
+msgstr ""
+
+#: ../_tinymce.plugin.php:317
+msgid "post caption separator"
+msgstr ""
+
+#: ../_tinymce.plugin.php:381
 msgid "Use TinyMCE"
 msgstr ""
 
-#: ../_tinymce.plugin.php:133
+#: ../_tinymce.plugin.php:384
 msgid "Check this to enable the extended Javascript editor (TinyMCE)."
 msgstr ""
 
-#: ../_tinymce.plugin.php:140
+#: ../_tinymce.plugin.php:391
 msgid "Enable to add directionality icons to TinyMCE that enables TinyMCE to better handle languages that are written from right to left."
 msgstr ""
 
-#: ../_tinymce.plugin.php:260
+#: ../_tinymce.plugin.php:511
 #, php-format
 msgid "TinyMCE javascript could not be loaded. Check the \"%s\" plugin setting."
 msgstr ""
 
-#: ../_tinymce.plugin.php:261
+#: ../_tinymce.plugin.php:512
 msgid "URL to TinyMCE"
 msgstr ""

=== modified file 'qp_rsc/css/basic.css'
--- qp_rsc/css/basic.css	2010-08-17 07:33:35 +0000
+++ qp_rsc/css/basic.css	2011-03-08 04:29:14 +0000
@@ -1,6 +1,7 @@
 /*
  * Obviously, this file no longer contains only basic styles.
- * It now also contains all sorts of base styles like the toolbar and debug for backward comaptibility with older templates... :/
+ * It now also contains all sorts of base styles like the toolbar
+ * and debug for backward comaptibility with older templates... :/
  */
 
 @import url("basic_styles.css"); /* Import the REAL basic styles */
@@ -10,9 +11,7 @@
 	margin: 0;
 }
 
-/**
- * Image styles
- */
+/* Image styles */
 img {
 	border: none;
 }
@@ -38,27 +37,48 @@
 	border: 1px solid #ccc;
 }
 
-div.image_block {
-/* WARNING: this will screw out backoffice layout (fulltext edit screen) in firefox!
-	overflow: hidden; */
+div.bImages, .image_block {
 	text-align: center;
 }
+.image_block {
+	clear: both;
+	display: block;
+}
+
+.image_block img {
+	margin: 1ex;
+}
+
+.image_block .image_legend {
+	display: block;
+}
 
 /* We only float image_blocks when in multiple image zone */
-div.multi_image_zone div.image_block {
+div.multi_image_zone .image_block {
 	margin: 1ex;
 	float: left;
 }
 
-div.image_block img {
-	margin: 1ex;
-}
-
 div.image_legend, .image_legend {
 	font-size: 84%;
 	color: #aaa;
 	margin: 1ex;
-}
+	text-align: center;
+}
+
+.image_title {
+	font-size: 1.4em;
+	color: #333333;
+	margin: 0 0 .2ex 0;
+}
+
+table.image_block, 
+table.image_block img, 
+table.image_block span.image_legend {
+margin:0 auto;
+padding:0;
+}
+
 .spanimage {
 margin: .2ex 1ex;
 }
@@ -126,8 +146,7 @@
 }
 
 /* *** SuperFish *** */
-
-/*** ESSENTIAL STYLES ***/
+/* ESSENTIAL STYLES */
 .sf-menu,
 .sf-menu * {
 	margin: 0;
@@ -316,7 +335,7 @@
 	background-position: -10px 0; /* arrow hovers for modern browsers*/
 }
 
-/*** shadows for all but IE6 ***/
+/* shadows for all but IE6 */
 .sf-shadow ul {
 	background: url('../img/superfish-shadow.png') no-repeat bottom right;
 	padding: 0 8px 9px 0;
@@ -330,9 +349,7 @@
 }
 
 
-/**
- * Default Form styles
- */
+/* Default Form styles */
 form {
 	margin: 0;
 	padding: 0;
@@ -392,12 +409,6 @@
 	padding : 1px;
 }
 
-/* fp> The following breaks the login screen and probably a lot more space constrained forms.
-.label{
-padding-right:3ex;
-}
-*/
-
 /* The following is a dirty fix. */
 .field_required .label{
 	background-image: url("../img/required-star.gif");
@@ -449,7 +460,6 @@
 	border: none;
 	margin: 1ex;
 	padding: 0;
-	/* border: 1px solid #00f; */
 }
 .fform fieldset.bordered {
 	border: 1px solid #ddd;
@@ -461,11 +471,9 @@
 	font-weight:bold;
 	margin: 0;
 	padding-top: .5ex;
-	/* border: 1px solid #f00; */
 }
 .fform div.input {
 	margin: 0 0 0 25%;
-	/* border: 1px solid #f00; */
 }
 * html .fform div.input {
 	height:1%; /* so IE6 gains layout (hasLayout) and does not cause 3px bug for lines below div.label (if div.input is heigher than div.label) */
@@ -473,12 +481,10 @@
 }
 .fform fieldset.input{
 	margin: 0;
-	/* border: 1px solid #0f0; */
 }
 .fform div.info {
 	margin: 0 0 0 25%;
 	padding-top: .5ex;
-	/* border: 1px solid #f00; */
 }
 
 /* hide checkbox in order to indent exactly the same size */
@@ -494,9 +500,7 @@
 }
 
 
-/*
-{{{ Messages
-*/
+/* Messages */
 div.log_container,
 div.action_messages {
 	margin:1ex;
@@ -541,7 +545,6 @@
 p.error {
 	margin: 1ex;
 }
-/* }}} */
 
 /* include errors, wrong params, deleted blog, etc... */
 div.template_error {
@@ -595,9 +598,7 @@
 	font-weight: normal;
 }
 
-/*
- * Bottom of page Debug output formatting:
- */
+/* Bottom of page Debug output formatting: */
 div.debug {
 	border: 2px solid #000;
 	padding: 1ex;
@@ -653,9 +654,7 @@
 	background-color: #eee;
 }
 
-/*
- * Definition Lists default styling
- */
+/* Definition Lists default styling */
 dl {
 	display: block;
 	margin: 1em 0 1em 0;