2 files changed, 16 insertions, 6 deletions
diff --git a/views/default/page/layouts/widgets/add_button.php b/views/default/page/layouts/widgets/add_button.php
index a8670146b..c33a45f99 100644
--- a/views/default/page/layouts/widgets/add_button.php
+++ b/views/default/page/layouts/widgets/add_button.php
@@ -4,7 +4,13 @@
  */
 ?>
 <div class="elgg-widget-add-control">
-	<a class="elgg-button elgg-button-action elgg-toggler" href="#widgets-add-panel">
-		<?php echo elgg_echo('widgets:add'); ?>
-	</a>
+<?php
+	echo elgg_view('output/url', array(
+		'href' => '#widgets-add-panel',
+		'text' => elgg_echo('widgets:add'),
+		'class' => 'elgg-button elgg-button-action',
+		'rel' => 'toggle',
+		'is_trusted' => true,
+	));
+?>
 </div>
diff --git a/views/default/page/layouts/widgets/add_panel.php b/views/default/page/layouts/widgets/add_panel.php
index 2786e83b2..d9b11342a 100644
--- a/views/default/page/layouts/widgets/add_panel.php
+++ b/views/default/page/layouts/widgets/add_panel.php
@@ -12,6 +12,7 @@ $context = $vars['context'];
 $exact = elgg_extract('exact_match', $vars, false);
 
 $widget_types = elgg_get_widget_types($context, $exact);
+uasort($widget_types, create_function('$a,$b', 'return strcmp($a->name,$b->name);'));
 
 $current_handlers = array();
 foreach ($widgets as $column_widgets) {
@@ -49,10 +50,13 @@ foreach ($widgets as $column_widgets) {
 ?>
 	</ul>
 <?php
-	$params = array(
+	echo elgg_view('input/hidden', array(
 		'name' => 'widget_context',
 		'value' => $context
-	);
-	echo elgg_view('input/hidden', $params);
+	));
+	echo elgg_view('input/hidden', array(
+		'name' => 'show_access',
+		'value' => (int)$vars['show_access']
+	));
 ?>
 </div>