2 files changed, 12 insertions, 17 deletions
diff --git a/views/default/layout/shells/widgets/add_button.php b/views/default/layout/shells/widgets/add_button.php
index d281a2ffa..492f0f6fc 100644
--- a/views/default/layout/shells/widgets/add_button.php
+++ b/views/default/layout/shells/widgets/add_button.php
@@ -1,13 +1,8 @@
 <?php
-
-?>
-<div id="widget-add-button">
-<?php
-$options = array(
-	'href' => '#',
-	'text' => elgg_echo('widgets:add'),
-	'class' => 'elgg-action-button',
-);
-echo elgg_view('output/url', $options);
+/**
+ * Button area for showing the add widgets panel
+ */
 ?>
+<div class="elgg-widget-add-control elgg-toggle" id="elgg-toggler-add-widgets">
+	<a class="elgg-action-button"><?php echo elgg_echo('widgets:add'); ?></a>
 </div>
diff --git a/views/default/layout/shells/widgets/add_panel.php b/views/default/layout/shells/widgets/add_panel.php
index d9acc5518..1e2dc3bbc 100644
--- a/views/default/layout/shells/widgets/add_panel.php
+++ b/views/default/layout/shells/widgets/add_panel.php
@@ -13,27 +13,27 @@ foreach ($widgets as $column_widgets) {
 }
 
 ?>
-<div class="widgets-add-panel hidden">
+<div class="elgg-widgets-add-panel hidden" id="elgg-togglee-add-widgets">
 	<p>
 		<?php echo elgg_echo('widgets:add:description'); ?>
 	</p>
 	<ul>
 <?php
 		foreach ($widget_types as $handler => $widget_type) {
-			$id = "widget-type-$handler";
+			$id = "elgg-widget-type-$handler";
 			// check if widget added and only one instance allowed
 			if ($widget_type->multiple == false && in_array($handler, $current_handlers)) {
-				$class = 'widget-unavailable';
+				$class = 'elgg-widget-unavailable';
 				$tooltip = elgg_echo('widget:unavailable');
 			} else {
-				$class = 'widget-available';
+				$class = 'elgg-widget-available';
 				$tooltip = $widget_type->description;
 			}
 
 			if ($widget_type->multiple) {
-				$class .= ' widget-multiple';
+				$class .= ' elgg-widget-multiple';
 			} else {
-				$class .= ' widget-single';
+				$class .= ' elgg-widget-single';
 			}
 
 			echo "<li title=\"$tooltip\" id=\"$id\" class=\"$class\">$widget_type->name</li>";
@@ -42,7 +42,7 @@ foreach ($widgets as $column_widgets) {
 	</ul>
 <?php
 	$params = array(
-		'internalname' => 'widget-context',
+		'internalname' => 'widget_context',
 		'value' => $context
 	);
 	echo elgg_view('input/hidden', $params);