5 files changed, 22 insertions, 6 deletions
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index a96aaaa90..129a8c637 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -150,6 +150,7 @@ echo elgg_view('css/elements/skin', $vars);
 	padding: 10px;
 	margin: 0 5px 15px;
 	background: #dedede;
+	border: 2px solid #cccccc;
 }
 .elgg-widgets-add-panel ul {
 	padding: 0;
@@ -162,13 +163,19 @@ echo elgg_view('css/elements/skin', $vars);
 	width: 200px;
 	padding: 4px;
 	background-color: #cccccc;
+	border: 2px solid #b0b0b0;
+	font-weight: bold;
 }
 .elgg-widgets-add-panel li a {
 	display: block;
 }
 .elgg-widget-available {
+	color: #333333;
 	cursor: pointer;
 }
+.elgg-widget-available:hover {
+	background-color: #bcbcbc;
+}
 .elgg-widget-unavailable {
 	color: #888888;
 }
diff --git a/views/default/graphics/ajax_loader.php b/views/default/graphics/ajax_loader.php
index b1f35971a..e539188f2 100644
--- a/views/default/graphics/ajax_loader.php
+++ b/views/default/graphics/ajax_loader.php
@@ -4,11 +4,17 @@
  *
  * @package Elgg
  * @subpackage Core
+ *
+ * @uses $vars['id']
  */
 
+if (isset($vars['internalid'])) {
+	$id = "id=\"{$vars['internalid']}\"";
+}
+
 $loader = <<< END
 
-<div align="center" class="ajax-loader hidden"></div>
+<div align="center" class="ajax-loader hidden" $id></div>
 
 END;
 
diff --git a/views/default/layout/objects/widget/controls.php b/views/default/layout/objects/widget/controls.php
index b07a42e22..79e434f1a 100644
--- a/views/default/layout/objects/widget/controls.php
+++ b/views/default/layout/objects/widget/controls.php
@@ -12,7 +12,8 @@ $params = array(
 	'text' => ' ',
 	'href' => "#",
 	'class' => 'elgg-widget-collapse-button',
-	'internalid' => "elgg-widget-collapse-button-$widget->guid"
+//	'internalid' => "elgg-toggler-widget-$widget->guid"
+//	'internalid' => "elgg-widget-collapse-button-$widget->guid"
 );
 $collapse_link = elgg_view('output/url', $params);
 
@@ -30,8 +31,8 @@ $params = array(
 	'text' => ' ',
 	'title' => elgg_echo('widget:edit'),
 	'href' => "#",
-	'class' => 'elgg-widget-edit-button',
-	'internalid' => "elgg-widget-edit-button-$widget->guid"
+	'class' => 'elgg-widget-edit-button elgg-toggle',
+	'internalid' => "elgg-toggler-widget-$widget->guid"
 );
 $edit_link = elgg_view('output/url', $params);
 
diff --git a/views/default/layout/objects/widget/settings.php b/views/default/layout/objects/widget/settings.php
index c1e00c3f1..8020983c6 100644
--- a/views/default/layout/objects/widget/settings.php
+++ b/views/default/layout/objects/widget/settings.php
@@ -33,7 +33,7 @@ $body = <<<___END
 ___END;
 
 ?>
-<div class="elgg-widget-edit">
+<div class="elgg-widget-edit" id="elgg-togglee-widget-<?php echo $widget->guid; ?>">
 <?php
 $params = array(
 	'body' => $body,
diff --git a/views/default/layout/shells/widgets.php b/views/default/layout/shells/widgets.php
index 0c21e7042..82489b37f 100644
--- a/views/default/layout/shells/widgets.php
+++ b/views/default/layout/shells/widgets.php
@@ -43,4 +43,6 @@ for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
 	echo '</div>';
 }
 
-elgg_pop_context();
-\ No newline at end of file
+elgg_pop_context();
+
+echo elgg_view('graphics/ajax_loader', array('internalid' => 'elgg-widget-loader'));
+\ No newline at end of file