Use modal dialog instead of popup window to edit block settings

1 files changed, 99 insertions, 132 deletions

diff --git a/index_edit.php b/index_edit.php
index b26cd0d2c3..a9a87507dd 100644
--- a/index_edit.php
+++ b/index_edit.php
@@ -133,39 +133,7 @@ if ($action=='update') {
 	exit;
 }
 
-if ($action=="configure") {
-	if (array_key_exists($block_id, $blocks['main'])) {
-		$block_name=$blocks['main'][$block_id];
-	} elseif (array_key_exists($block_id, $blocks['side'])) {
-		$block_name=$blocks['side'][$block_id];
-	} else {
-		$controller->addInlineJavaScript('opener.window.location.reload(); window.close();');
-		exit;
-	}
-	$class_name=$block_name.'_WT_Module';
-	$block=new $class_name;
-	echo '<table class="facts_table">';
-	echo '<tr><td class="facts_label">';
-	echo '<h2>', WT_I18N::translate('Configure'), '</h2>';
-	echo '</td></tr>';
-	echo '<tr><td class="facts_label03">';
-	echo '<b>', $block->getTitle(), ' - ', $block->getDescription(), '</b>';
-	echo '</td></tr>';
-	echo '</table>';
-	echo '<form name="block" method="post" action="index_edit.php?action=configure&amp;ctype=', $ctype, '&amp;block_id=', $block_id, '">';
-	echo '<input type="hidden" name="save" value="1">';
-	echo '<table border="0" class="facts_table">';
-	$block->configureBlock($block_id);
-	echo '<tr><td colspan="2" class="topbottombar">';
-	echo '<input type="button" value="', WT_I18N::translate('Save'), '" onclick="document.block.submit();">';
-	echo '&nbsp;&nbsp;<input type ="button" value="', WT_I18N::translate('Cancel'), '" onclick="window.close()">';
-	echo '</td></tr>';
-	echo '</table>';
-	echo '</form>';
-	echo WT_JS_START;
-	echo 'var pastefield; function paste_id(value) {pastefield.value=value;}';
-	echo WT_JS_END;
-} else { ?>
+?>
 	<script type="text/javascript">
 	<!--
 /**
@@ -292,106 +260,105 @@ if ($action=="configure") {
 	function save_form() {
 		document.config_setup.submit();
 	}
-	//-->
-	</script>
-	<form name="config_setup" method="post" action="index_edit.php">
-	<input type="hidden" name="ctype" value="<?php echo $ctype; ?>">
-	<input type="hidden" name="action" value="update">
-	<input type="hidden" name="name" value="<?php echo $name; ?>">
-	<table border="1">
-	<tr><td class="topbottombar" colspan="7">
-	<?php
-	echo '<b>', WT_I18N::translate('Change the blocks on this page'), '</b>';
-	echo '</td></tr>';
-	// NOTE: Row 1: Column legends
-	echo '<tr>';
-		echo '<td class="descriptionbox center vmiddle" colspan="2">';
-			echo '<b>', WT_I18N::translate('Main Section Blocks'), '</b>';
-		echo '</td>';
-		echo '<td class="descriptionbox center vmiddle" colspan="3">';
-			echo '<b>', WT_I18N::translate('Available Blocks'), '</b>';
-		echo '</td>';
-		echo '<td class="descriptionbox center vmiddle" colspan="2">';
-			echo '<b>', WT_I18N::translate('Right Section Blocks'), '</b>';
-		echo '</td>';
-	echo '</tr>';
-	echo '<tr>';
-	// NOTE: Row 2 column 1: Up/Down buttons for left (main) block list
-	echo '<td class="optionbox width20px center vmiddle">';
-		echo '<a onclick="move_up_block(\'main_select\');" title="', WT_I18N::translate('Move up'), '">', $IconUarrow, '</a>';
-		echo '<br>';
-		echo '<a onclick="move_down_block(\'main_select\');" title="', WT_I18N::translate('Move down'), '">', $IconDarrow, '</a>';
-		echo '<br><br>';
-		echo help_link('block_move_up');
-	echo '</td>';
-	// NOTE: Row 2 column 2: Left (Main) block list
-	echo '<td class="optionbox">';
-		echo '<select multiple="multiple" id="main_select" name="main[]" size="10" onchange="show_description(\'main_select\');">';
-		foreach ($blocks['main'] as $block_id=>$block_name) {
-			echo '<option value="', $block_id, '">', $all_blocks[$block_name]->getTitle(), '</option>';
-		}
-		echo '</select>';
-	echo '</td>';
-	// NOTE: Row 2 column 3: Left/Right buttons for left (main) block list
-	echo '<td class="optionbox width20 vmiddle">';
-		echo '<a onclick="move_left_right_block(\'main_select\', \'right_select\');" title="', WT_I18N::translate('Move Right'), '">', $IconRDarrow, '</a>';
-		echo '<br>';
-		echo '<a onclick="move_left_right_block(\'main_select\', \'available_select\');" title="', WT_I18N::translate('Remove'), '">', $IconRarrow, '</a>';
-		echo '<br>';
-		echo '<a onclick="move_left_right_block(\'available_select\', \'main_select\');" title="', WT_I18N::translate('Add'), '">', $IconLarrow, '</a>';
-		echo '<br><br>';
-		echo help_link('block_move_right');
-	echo '</td>';
-	// Row 2 column 4: Middle (Available) block list
-	echo '<td class="optionbox">';
-		echo '<select id="available_select" name="available[]" size="10" onchange="show_description(\'available_select\');">';
-		foreach ($all_blocks as $block_name=>$block) {
-			echo '<option value="', $block_name, '">', $block->getTitle(), '</option>';
-		}
-		echo '</select>';
-	echo '</td>';
-	// NOTE: Row 2 column 5: Left/Right buttons for right block list
-	echo '<td class="optionbox width20 vmiddle">';
-		echo '<a onclick="move_left_right_block(\'right_select\', \'main_select\');" title="', WT_I18N::translate('Move Left'), '">', $IconLDarrow, '</a>';
-		echo '<br>';
-		echo '<a onclick="move_left_right_block(\'right_select\', \'available_select\');" title="', WT_I18N::translate('Remove'), '">', $IconLarrow, '</a>';
-		echo '<br>';
-		echo '<a onclick="move_left_right_block(\'available_select\', \'right_select\');" title="', WT_I18N::translate('Add'), '">', $IconRarrow, '</a>';
-		echo '<br><br>';
-		echo help_link('block_move_right');
+//-->
+</script>
+<form name="config_setup" method="post" action="index_edit.php">
+<input type="hidden" name="ctype" value="<?php echo $ctype; ?>">
+<input type="hidden" name="action" value="update">
+<input type="hidden" name="name" value="<?php echo $name; ?>">
+<table border="1">
+<tr><td class="topbottombar" colspan="7">
+<?php
+echo '<b>', WT_I18N::translate('Change the blocks on this page'), '</b>';
+echo '</td></tr>';
+// NOTE: Row 1: Column legends
+echo '<tr>';
+	echo '<td class="descriptionbox center vmiddle" colspan="2">';
+		echo '<b>', WT_I18N::translate('Main Section Blocks'), '</b>';
 	echo '</td>';
-	// NOTE: Row 2 column 6: Right block list
-	echo '<td class="optionbox">';
-		echo '<select multiple="multiple" id="right_select" name="right[]" size="10" onchange="show_description(\'right_select\');">';
-		foreach ($blocks['side'] as $block_id=>$block_name) {
-			echo '<option value="', $block_id, '">', $all_blocks[$block_name]->getTitle(), '</option>';
-		}
-		echo '</select>';
+	echo '<td class="descriptionbox center vmiddle" colspan="3">';
+		echo '<b>', WT_I18N::translate('Available Blocks'), '</b>';
 	echo '</td>';
-	// NOTE: Row 2 column 7: Up/Down buttons for right block list
-	echo '<td class="optionbox width20 vmiddle">';
-		echo '<a onclick="move_up_block(\'right_select\');" title="', WT_I18N::translate('Move up'), '">', $IconUarrow, '</a>';
-		echo '<br>';
-		echo '<a onclick="move_down_block(\'right_select\');" title="', WT_I18N::translate('Move down'), '">', $IconDarrow. '</a>';
-		echo '<br><br>';
-		echo help_link('block_move_up');
+	echo '<td class="descriptionbox center vmiddle" colspan="2">';
+		echo '<b>', WT_I18N::translate('Right Section Blocks'), '</b>';
 	echo '</td>';
-	echo '</tr>';
-	// NOTE: Row 3 columns 1-7: Summary description of currently selected block
-	echo '<tr><td class="descriptionbox wrap" colspan="7"><div id="instructions">';
-	echo WT_I18N::translate('Highlight a  block name and then click on one of the arrow icons to move that highlighted block in the indicated direction.');
-	echo '</div></td></tr>';
-	echo '<tr><td class="topbottombar" colspan="7">';
+echo '</tr>';
+echo '<tr>';
+// NOTE: Row 2 column 1: Up/Down buttons for left (main) block list
+echo '<td class="optionbox width20px center vmiddle">';
+	echo '<a onclick="move_up_block(\'main_select\');" title="', WT_I18N::translate('Move up'), '">', $IconUarrow, '</a>';
+	echo '<br>';
+	echo '<a onclick="move_down_block(\'main_select\');" title="', WT_I18N::translate('Move down'), '">', $IconDarrow, '</a>';
+	echo '<br><br>';
+	echo help_link('block_move_up');
+echo '</td>';
+// NOTE: Row 2 column 2: Left (Main) block list
+echo '<td class="optionbox">';
+	echo '<select multiple="multiple" id="main_select" name="main[]" size="10" onchange="show_description(\'main_select\');">';
+	foreach ($blocks['main'] as $block_id=>$block_name) {
+		echo '<option value="', $block_id, '">', $all_blocks[$block_name]->getTitle(), '</option>';
+	}
+	echo '</select>';
+echo '</td>';
+// NOTE: Row 2 column 3: Left/Right buttons for left (main) block list
+echo '<td class="optionbox width20 vmiddle">';
+	echo '<a onclick="move_left_right_block(\'main_select\', \'right_select\');" title="', WT_I18N::translate('Move Right'), '">', $IconRDarrow, '</a>';
+	echo '<br>';
+	echo '<a onclick="move_left_right_block(\'main_select\', \'available_select\');" title="', WT_I18N::translate('Remove'), '">', $IconRarrow, '</a>';
+	echo '<br>';
+	echo '<a onclick="move_left_right_block(\'available_select\', \'main_select\');" title="', WT_I18N::translate('Add'), '">', $IconLarrow, '</a>';
+	echo '<br><br>';
+	echo help_link('block_move_right');
+echo '</td>';
+// Row 2 column 4: Middle (Available) block list
+echo '<td class="optionbox">';
+	echo '<select id="available_select" name="available[]" size="10" onchange="show_description(\'available_select\');">';
+	foreach ($all_blocks as $block_name=>$block) {
+		echo '<option value="', $block_name, '">', $block->getTitle(), '</option>';
+	}
+	echo '</select>';
+echo '</td>';
+// NOTE: Row 2 column 5: Left/Right buttons for right block list
+echo '<td class="optionbox width20 vmiddle">';
+	echo '<a onclick="move_left_right_block(\'right_select\', \'main_select\');" title="', WT_I18N::translate('Move Left'), '">', $IconLDarrow, '</a>';
+	echo '<br>';
+	echo '<a onclick="move_left_right_block(\'right_select\', \'available_select\');" title="', WT_I18N::translate('Remove'), '">', $IconLarrow, '</a>';
+	echo '<br>';
+	echo '<a onclick="move_left_right_block(\'available_select\', \'right_select\');" title="', WT_I18N::translate('Add'), '">', $IconRarrow, '</a>';
+	echo '<br><br>';
+	echo help_link('block_move_right');
+echo '</td>';
+// NOTE: Row 2 column 6: Right block list
+echo '<td class="optionbox">';
+	echo '<select multiple="multiple" id="right_select" name="right[]" size="10" onchange="show_description(\'right_select\');">';
+	foreach ($blocks['side'] as $block_id=>$block_name) {
+		echo '<option value="', $block_id, '">', $all_blocks[$block_name]->getTitle(), '</option>';
+	}
+	echo '</select>';
+echo '</td>';
+// NOTE: Row 2 column 7: Up/Down buttons for right block list
+echo '<td class="optionbox width20 vmiddle">';
+	echo '<a onclick="move_up_block(\'right_select\');" title="', WT_I18N::translate('Move up'), '">', $IconUarrow, '</a>';
+	echo '<br>';
+	echo '<a onclick="move_down_block(\'right_select\');" title="', WT_I18N::translate('Move down'), '">', $IconDarrow. '</a>';
+	echo '<br><br>';
+	echo help_link('block_move_up');
+echo '</td>';
+echo '</tr>';
+// NOTE: Row 3 columns 1-7: Summary description of currently selected block
+echo '<tr><td class="descriptionbox wrap" colspan="7"><div id="instructions">';
+echo WT_I18N::translate('Highlight a  block name and then click on one of the arrow icons to move that highlighted block in the indicated direction.');
+echo '</div></td></tr>';
+echo '<tr><td class="topbottombar" colspan="7">';
 
-	/* This section temporarily removed as it does not work (kiwi - 15/08/2011)
-	if (WT_USER_IS_ADMIN && $ctype=='user') {
-		echo WT_I18N::translate('Use these blocks as the default block configuration for all users?'), '<input type="checkbox" name="setdefault" value="1"><br><br>';
-	}*/
-	echo '<input type="button" value="', WT_I18N::translate('Reset to Default Blocks'), '" onclick="window.location=\'index_edit.php?ctype=', $ctype, '&amp;action=reset&amp;name=', addslashes($name), '\';">';
-	echo '&nbsp;&nbsp;';
-	echo '<input type="button" value="', WT_I18N::translate('Save'), '" onclick="select_options(); save_form();">';
-	echo '&nbsp;&nbsp;';
-	echo '<input type ="button" value="', WT_I18N::translate('Cancel'), '" onclick="opener.window.location.reload(); window.close();">';
-	echo '</td></tr></table>';
-	echo '</form>';
-}
+/* This section temporarily removed as it does not work (kiwi - 15/08/2011)
+if (WT_USER_IS_ADMIN && $ctype=='user') {
+	echo WT_I18N::translate('Use these blocks as the default block configuration for all users?'), '<input type="checkbox" name="setdefault" value="1"><br><br>';
+}*/
+echo '<input type="button" value="', WT_I18N::translate('Reset to Default Blocks'), '" onclick="window.location=\'index_edit.php?ctype=', $ctype, '&amp;action=reset&amp;name=', addslashes($name), '\';">';
+echo '&nbsp;&nbsp;';
+echo '<input type="button" value="', WT_I18N::translate('Save'), '" onclick="select_options(); save_form();">';
+echo '&nbsp;&nbsp;';
+echo '<input type ="button" value="', WT_I18N::translate('Cancel'), '" onclick="opener.window.location.reload(); window.close();">';
+echo '</td></tr></table>';
+echo '</form>';