converted widgets to modules

git-svn-id: http://code.elgg.org/elgg/trunk@7928 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 27 insertions, 24 deletions

diff --git a/views/default/layout/objects/widget/controls.php b/views/default/layout/objects/widget/controls.php
index 9693ba42f..bd1e96ea7 100644
--- a/views/default/layout/objects/widget/controls.php
+++ b/views/default/layout/objects/widget/controls.php
@@ -2,18 +2,17 @@
 /**
  * Elgg widget controls
  *
- * @package Elgg
- * @subpackage Core
+ * @uses $vars['widget']
+ * @uses $vars['show_edit'] Whether to show the edit button (true)
  */
 
 $widget = $vars['widget'];
+$show_edit = elgg_get_array_value('show_edit', $vars, true);
 
 $params = array(
 	'text' => ' ',
 	'href' => "#",
 	'class' => 'elgg-widget-collapse-button',
-//	'internalid' => "elgg-toggler-widget-$widget->guid"
-//	'internalid' => "elgg-widget-collapse-button-$widget->guid"
 );
 $collapse_link = elgg_view('output/url', $params);
 
@@ -29,20 +28,20 @@ if ($widget->canEdit()) {
 	);
 	$delete_link = elgg_view('output/url', $params);
 
-	$params = array(
-		'text' => ' ',
-		'title' => elgg_echo('widget:edit'),
-		'href' => "#",
-		'class' => 'elgg-widget-edit-button elgg-toggle',
-		'internalid' => "elgg-toggler-widget-$widget->guid"
-	);
-	$edit_link = elgg_view('output/url', $params);
+	if ($show_edit) {
+		$params = array(
+			'text' => ' ',
+			'title' => elgg_echo('widget:edit'),
+			'href' => "#",
+			'class' => 'elgg-widget-edit-button elgg-toggle',
+			'internalid' => "elgg-toggler-widget-$widget->guid"
+		);
+		$edit_link = elgg_view('output/url', $params);
+	}
 }
 
 echo <<<___END
-<div class="elgg-widget-controls">
 	$collapse_link
 	$delete_link
 	$edit_link
-</div>
 ___END;
diff --git a/views/default/layout/objects/widget/settings.php b/views/default/layout/objects/widget/settings.php
index 8020983c6..c53ea8fc6 100644
--- a/views/default/layout/objects/widget/settings.php
+++ b/views/default/layout/objects/widget/settings.php
@@ -2,27 +2,31 @@
 /**
  * Elgg widget edit settings
  *
- * @package Elgg
- * @subpackage Core
+ * @uses $vars['widget']
+ * @uses $vars['show_access']
  */
 
 $widget = $vars['widget'];
+$show_access = elgg_get_array_value('show_access', $vars, true);
 
 $edit_view = "widgets/$widget->handler/edit";
 $custom_form_section = elgg_view($edit_view, array('entity' => $widget));
 
-$access_label = elgg_echo('access');
-$access = elgg_view('input/access', array('internalname' => 'params[access_id]','value' => $widget->access_id));
-$access_html = "<p><label>$access_label:</label> $access</p>";
+$access = '';
+if ($show_access) {
+	$access = elgg_view('input/access', array(
+		'internalname' => 'params[access_id]',
+		'value' => $widget->access_id,
+	));
+}
+
+if (!$custom_form_section && !$access) {
+	return true;
+}
 
 $hidden = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $widget->guid));
 $submit = elgg_view('input/submit', array('value' => elgg_echo('save')));
 
-// dashboard widgets do not get access controls
-if (elgg_in_context('dashboard')) {
-	$access = '';
-}
-
 $body = <<<___END
 	$custom_form_section
 	$access