Merge pull request #115 from hypeJunction/widgets_menu

3 files changed, 31 insertions, 57 deletions

diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index ef85d4dd5..7750c208f 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -158,16 +158,7 @@
 .elgg-module-widget.elgg-state-draggable > .elgg-head {
 	cursor: move;
 }
-.elgg-module-widget > .elgg-head a {
-	position: absolute;
-	top: 4px;
-	display: inline-block;
-	width: 18px;
-	height: 18px;
-	padding: 2px 2px 0 0;
-}
 a.elgg-widget-collapse-button {
-	left: 5px;
 	color: #c5c5c5;
 }
 a.elgg-widget-collapse-button:hover,
@@ -181,12 +172,6 @@ a.elgg-widget-collapse-button:before {
 a.elgg-widget-collapsed:before {
 	content: "\25BA";
 }
-a.elgg-widget-delete-button {
-	right: 5px;
-}
-a.elgg-widget-edit-button {
-	right: 25px;
-}
 .elgg-module-widget > .elgg-body {
 	background-color: white;
 	width: 100%;
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index d5b20896a..62f370069 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -534,4 +534,26 @@
 *************************************** */
 .elgg-menu-extras {
 	margin-bottom: 15px;
-}
\ No newline at end of file
+}
+
+/* ***************************************
+	WIDGET MENU
+*************************************** */
+.elgg-menu-widget > li {
+	position: absolute;
+	top: 4px;
+	display: inline-block;
+	width: 18px;
+	height: 18px;
+	padding: 2px 2px 0 0;
+}
+
+.elgg-menu-widget > .elgg-menu-item-collapse {
+	left: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-delete {
+	right: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-settings {
+	right: 25px;
+}
diff --git a/views/default/object/widget/elements/controls.php b/views/default/object/widget/elements/controls.php
index 866dcc787..d1d630c4f 100644
--- a/views/default/object/widget/elements/controls.php
+++ b/views/default/object/widget/elements/controls.php
@@ -6,44 +6,11 @@
  * @uses $vars['show_edit'] Whether to show the edit button (true)
  */
 
-$widget = $vars['widget'];
-$show_edit = elgg_extract('show_edit', $vars, true);
-
-$params = array(
-	'text' => ' ',
-	'href' => "#elgg-widget-content-$widget->guid",
-	'class' => 'elgg-widget-collapse-button',
-	'rel' => 'toggle',
-);
-$collapse_link = elgg_view('output/url', $params);
-
-$delete_link = $edit_link = '';
-if ($widget->canEdit()) {
-	$params = array(
-		'text' => elgg_view_icon('delete-alt'),
-		'title' => elgg_echo('widget:delete', array($widget->getTitle())),
-		'href' => "action/widgets/delete?widget_guid=$widget->guid",
-		'is_action' => true,
-		'is_trusted' => true,
-		'class' => 'elgg-widget-delete-button',
-		'id' => "elgg-widget-delete-button-$widget->guid"
-	);
-	$delete_link = elgg_view('output/url', $params);
-
-	if ($show_edit) {
-		$params = array(
-			'text' => elgg_view_icon('settings-alt'),
-			'title' => elgg_echo('widget:edit'),
-			'href' => "#widget-edit-$widget->guid",
-			'class' => "elgg-widget-edit-button",
-			'rel' => 'toggle',
-		);
-		$edit_link = elgg_view('output/url', $params);
-	}
-}
-
-echo <<<___END
-	$collapse_link
-	$delete_link
-	$edit_link
-___END;
+echo elgg_view_menu('widget', array(
+	'entity' => elgg_extract('widget', $vars),
+	'params' => array(
+		'show_edit' => elgg_extract('show_edit', $vars, true)
+	),
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));