3 files changed, 44 insertions, 34 deletions

diff --git a/views/default/widgets/controls.php b/views/default/widgets/controls.php
index 881057969..891a53595 100644
--- a/views/default/widgets/controls.php
+++ b/views/default/widgets/controls.php
@@ -10,17 +10,18 @@ $widget = $vars['widget'];
 
 $params = array(
 	'text' => 'delete',
-	'href' => '#', //elgg_get_site_url() . "action/widgets/delete?guid=$widget->guid",
+	'href' => elgg_get_site_url() . "action/widgets/delete?guid=$widget->guid",
 	'is_action' => true,
-	'class' => 'widget_delete',
-	'internalid' => "widget_delete_$widget->guid"
+	'class' => 'widget_delete_button',
+	'internalid' => "widget_delete_button_$widget->guid"
 );
 $delete_link = elgg_view('output/url', $params);
 
 $params = array(
 	'text' => 'edit',
-	'href' => elgg_get_site_url() . "#",
-	'is_action' => true,
+	'href' => "#",
+	'class' => 'widget_edit_button',
+	'internalid' => "widget_edit_button_$widget->guid"
 );
 $edit_link = elgg_view('output/url', $params);
 
diff --git a/views/default/widgets/editwrapper.php b/views/default/widgets/editwrapper.php
index 0ac1de6d0..cf985445b 100644
--- a/views/default/widgets/editwrapper.php
+++ b/views/default/widgets/editwrapper.php
@@ -1,38 +1,41 @@
 <?php
 /**
- * Elgg edit widget layout
+ * Elgg widget edit settings
  *
  * @package Elgg
  * @subpackage Core
  */
 
-$guid = $vars['entity']->getGUID();
+$widget = $vars['widget'];
 
-$form_body = $vars['body'];
-$form_body .= "<p><label>" . elgg_echo('access') . ": " . elgg_view('input/access', array('internalname' => 'params[access_id]','value' => $vars['entity']->access_id)) . "</label></p>";
-$form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $guid)) . elgg_view('input/hidden', array('internalname' => 'noforward', 'value' => 'true')) . elgg_view('input/submit', array('internalname' => "submit$guid", 'value' => elgg_echo('save'))) . "</p>";
+$edit_view = "widgets/$widget->handler/edit";
+$custom_form_section = elgg_view($edit_view, array('entity' => $widget));
 
-echo elgg_view('input/form', array('internalid' => "widgetform$guid", 'body' => $form_body, 'action' => "action/widgets/save"))
-?>
-<script type="text/javascript">
-$(document).ready(function() {
-
-	$("#widgetform<?php echo $guid; ?>").submit(function () {
-
-		$("#submit<?php echo $guid; ?>").attr("disabled","disabled");
-		$("#submit<?php echo $guid; ?>").attr("value","<?php echo elgg_echo("saving"); ?>");
-		$("#widgetcontent<?php echo $guid; ?>").html('<?php echo elgg_view('ajax/loader',array('slashes' => true)); ?>');
-		$("#widget<?php echo $guid; ?> .toggle_box_edit_panel").click();
-
-		var variables = $("#widgetform<?php echo $guid; ?>").serialize();
-		$.post($("#widgetform<?php echo $guid; ?>").attr("action"),variables,function() {
-			$("#submit<?php echo $guid; ?>").attr("disabled","");
-			$("#submit<?php echo $guid; ?>").attr("value","<?php echo elgg_echo("save"); ?>");
-			$("#widgetcontent<?php echo $guid; ?>").load("<?php echo elgg_get_site_url(); ?>pg/view/<?php echo $guid; ?>?shell=no&username=<?php echo elgg_get_page_owner()->username; ?>&context=<?php echo elgg_get_context(); ?>&callback=true");
-		});
-		return false;
+$access = elgg_view('input/access', array('internalname' => 'params[access_id]','value' => $widget->access_id));
+$hidden = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $widget->guid)) .
+$hidden .= elgg_view('input/hidden', array('internalname' => 'noforward', 'value' => 'true'));
+$submit = elgg_view('input/submit', array('internalname' => "submit$guid", 'value' => elgg_echo('save')));
 
-	});
+$body = <<<___END
+	$custom_form_section
+	<p>
+		<label>Access:</label> $access
+	</p>
+	<p>
+		$hidden
+		$submit
+	</p>
+___END;
 
-});
-</script>
\ No newline at end of file
+?>
+<div class="widget_edit">
+<?php
+$params = array(
+	'body' => $body,
+	'action' => "action/widgets/save",
+	'internalid' => "widgetform$guid"
+);
+echo elgg_view('input/form', $params);
+// _<?php echo $widget->guid; 
+?>
+</div>
diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php
index 55cdd18b6..52ca87cab 100644
--- a/views/default/widgets/wrapper.php
+++ b/views/default/widgets/wrapper.php
@@ -24,18 +24,24 @@ if ($vars['entity'] instanceof ElggObject && $vars['entity']->getSubtype() == 'w
 $title = "Widget Title";
 
 $display_view = "widgets/$handler/view";
-$edit_view = "widgets/$handler/edit";
+
+$can_edit = $widget->canEdit();
 
 ?>
 <div class="widget draggable" id="widget_<?php echo $widget->guid; ?>">
 	<div class="widget_title drag_handle">
 		<h3><?php echo $title; ?></h3>
 		<?php
-		if ($widget->canEdit()) {
+		if ($can_edit) {
 			echo elgg_view('widgets/controls', array('widget' => $widget));
 		}
 		?>
 	</div>
+	<?php
+	if ($can_edit) {
+		echo elgg_view('widgets/editwrapper', array('widget' => $widget));
+	}
+	?>
 	<div class="widget_content">
 		<?php echo elgg_view($display_view, $vars); ?>
 		<p>Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>