From 2da8c3e8428f09bab7aefa39cadc0a4f2d6f7a80 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 19 Nov 2010 22:34:17 +0000
Subject: improving interactions of widgets - containment wasn't working due to
 height issues

git-svn-id: http://code.elgg.org/elgg/trunk@7353 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/widgets/add.php               |  1 -
 engine/lib/widgets.php                |  2 +-
 js/lib/ui.widgets.js                  |  7 +++++--
 views/default/css.php                 | 12 +++++++----
 views/default/layouts/widgets.php     |  7 ++++++-
 views/default/widgets/add.php         | 34 ------------------------------
 views/default/widgets/add_panel.php   | 34 ++++++++++++++++++++++++++++++
 views/default/widgets/editwrapper.php | 39 -----------------------------------
 views/default/widgets/settings.php    | 39 +++++++++++++++++++++++++++++++++++
 views/default/widgets/wrapper.php     |  2 +-
 10 files changed, 94 insertions(+), 83 deletions(-)
 delete mode 100644 views/default/widgets/add.php
 create mode 100644 views/default/widgets/add_panel.php
 delete mode 100644 views/default/widgets/editwrapper.php
 create mode 100644 views/default/widgets/settings.php

diff --git a/actions/widgets/add.php b/actions/widgets/add.php
index eebbd1438..001c139d8 100644
--- a/actions/widgets/add.php
+++ b/actions/widgets/add.php
@@ -11,7 +11,6 @@ $handler = get_input('handler');
 $context = get_input('context');
 $column = get_input('column', 1);
 
-$guid = false;
 if (!empty($user_guid)) {
 	$user = get_entity($user_guid);
 	if ($user && $user->canEdit()) {
diff --git a/engine/lib/widgets.php b/engine/lib/widgets.php
index 1343e1319..1646c18d4 100644
--- a/engine/lib/widgets.php
+++ b/engine/lib/widgets.php
@@ -57,7 +57,7 @@ function elgg_get_widgets($user_guid, $context) {
  * @since 1.8
  */
 function elgg_create_widget($owner_guid, $handler, $access_id = null) {
-	if (empty($owner_guid) || empty($handler) || !elgg_widget_type_exists($handler)) {
+	if (empty($owner_guid) || empty($handler) || !elgg_is_widget_type($handler)) {
 		return false;
 	}
 
diff --git a/js/lib/ui.widgets.js b/js/lib/ui.widgets.js
index bee4b2126..ac55d0e7f 100644
--- a/js/lib/ui.widgets.js
+++ b/js/lib/ui.widgets.js
@@ -12,6 +12,9 @@ elgg.ui.widgets.init = function() {
 		handle:               'div.drag_handle',
 		forcePlaceholderSize: true,
 		placeholder:          'widget_placeholder',
+		//containment:          '.widget_layout',
+		opacity:              0.8,
+		revert:               500,
 		stop:                 function(event, ui) {
 			elgg.action('widgets/move', {
 				data: {
@@ -26,11 +29,11 @@ elgg.ui.widgets.init = function() {
 	});
 
 	$('#widget_add_button a').bind('click', function(event) {
-		$('.widgets_add').slideToggle('medium');
+		$('.widgets_add_panel').slideToggle('medium');
 		event.preventDefault();
 	});
 
-	$('.widgets_add a').bind('click', function(event) {
+	$('.widgets_add_panel a').bind('click', function(event) {
 		elgg.action('widgets/add', {
 			data: {
 				handler: $(this).attr('id'),
diff --git a/views/default/css.php b/views/default/css.php
index 29930d445..286beeece 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -881,21 +881,21 @@ li.navigation_more ul li {
 	margin-bottom: 15px;
 	margin-right: 5px;
 }
-.widgets_add {
+.widgets_add_panel {
 	padding: 10px;
 	margin: 0 5px 15px;
 	background: #dedede;
 }
-.widgets_add ul {
+.widgets_add_panel ul {
 	padding: 0;
 	margin: 0;
 }
-.widgets_add li {
+.widgets_add_panel li {
 	float: left;
 	margin: 2px 10px;
 	list-style: none;
 }
-.widgets_add li a {
+.widgets_add_panel li a {
 	display: block;
 	width: 200px;
 	padding: 4px;
@@ -906,7 +906,11 @@ li.navigation_more ul li {
 	padding: 2px;
 	margin: 0 5px 15px;
 }
+.widget:hover {
+	background-color: #cccccc;
+}
 .widget_title {
+	background-color: #dedede;
 	height: 30px;
 	line-height: 30px;
 }
diff --git a/views/default/layouts/widgets.php b/views/default/layouts/widgets.php
index 055b0453e..692d01acc 100644
--- a/views/default/layouts/widgets.php
+++ b/views/default/layouts/widgets.php
@@ -25,9 +25,11 @@ if (elgg_can_edit_widgets()) {
 		'widgets' => $widgets,
 		'context' => $context,
 	);
-	echo elgg_view('widgets/add', $params);
+	echo elgg_view('widgets/add_panel', $params);
 }
 
+echo '<div class="widget_layout">';
+
 echo $vars['box'];
 
 $widget_class = "widget_{$num_columns}_columns";
@@ -43,4 +45,7 @@ for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
 	echo '</div>';
 }
 
+echo '<div class="clearfloat"></div>';
+echo '</div>';
+
 elgg_pop_context();
\ No newline at end of file
diff --git a/views/default/widgets/add.php b/views/default/widgets/add.php
deleted file mode 100644
index c8576cf06..000000000
--- a/views/default/widgets/add.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-$widgets = $vars['widgets'];
-$widget_types = elgg_get_widget_types();
-
-$context = $vars['context'];
-
-?>
-<div class="widgets_add hidden">
-	<p>
-		<?php echo elgg_echo('widgets:add:description'); ?>
-	</p>
-	<ul>
-<?php
-		foreach ($widget_types as $handler => $widget_type) {
-			$options = array(
-				'text' => $widget_type->name,
-				'href' => '#',
-				'internalid' => $handler,
-			);
-			$link = elgg_view('output/url', $options);
-			echo "<li>$link</li>";
-		}
-?>
-	</ul>
-<?php
-	$params = array(
-		'internalname' => 'widget_context',
-		'value' => $context
-	);
-	echo elgg_view('input/hidden', $params);
-?>
-	<div class="clearfloat"></div>
-</div>
diff --git a/views/default/widgets/add_panel.php b/views/default/widgets/add_panel.php
new file mode 100644
index 000000000..70d80f41c
--- /dev/null
+++ b/views/default/widgets/add_panel.php
@@ -0,0 +1,34 @@
+<?php
+
+$widgets = $vars['widgets'];
+$widget_types = elgg_get_widget_types();
+
+$context = $vars['context'];
+
+?>
+<div class="widgets_add_panel hidden">
+	<p>
+		<?php echo elgg_echo('widgets:add:description'); ?>
+	</p>
+	<ul>
+<?php
+		foreach ($widget_types as $handler => $widget_type) {
+			$options = array(
+				'text' => $widget_type->name,
+				'href' => '#',
+				'internalid' => $handler,
+			);
+			$link = elgg_view('output/url', $options);
+			echo "<li>$link</li>";
+		}
+?>
+	</ul>
+<?php
+	$params = array(
+		'internalname' => 'widget_context',
+		'value' => $context
+	);
+	echo elgg_view('input/hidden', $params);
+?>
+	<div class="clearfloat"></div>
+</div>
diff --git a/views/default/widgets/editwrapper.php b/views/default/widgets/editwrapper.php
deleted file mode 100644
index 73166b718..000000000
--- a/views/default/widgets/editwrapper.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Elgg widget edit settings
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$widget = $vars['widget'];
-
-$edit_view = "widgets/$widget->handler/edit";
-$custom_form_section = elgg_view($edit_view, array('entity' => $widget));
-
-$access_text = elgg_echo('access');
-$access = elgg_view('input/access', array('internalname' => 'params[access_id]','value' => $widget->access_id));
-$hidden = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $widget->guid));
-$submit = elgg_view('input/submit', array('value' => elgg_echo('save')));
-
-$body = <<<___END
-	$custom_form_section
-	<p>
-		<label>$access_text:</label> $access
-	</p>
-	<p>
-		$hidden
-		$submit
-	</p>
-___END;
-
-?>
-<div class="widget_edit">
-<?php
-$params = array(
-	'body' => $body,
-	'action' => "action/widgets/save"
-);
-echo elgg_view('input/form', $params);
-?>
-</div>
diff --git a/views/default/widgets/settings.php b/views/default/widgets/settings.php
new file mode 100644
index 000000000..73166b718
--- /dev/null
+++ b/views/default/widgets/settings.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Elgg widget edit settings
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$widget = $vars['widget'];
+
+$edit_view = "widgets/$widget->handler/edit";
+$custom_form_section = elgg_view($edit_view, array('entity' => $widget));
+
+$access_text = elgg_echo('access');
+$access = elgg_view('input/access', array('internalname' => 'params[access_id]','value' => $widget->access_id));
+$hidden = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $widget->guid));
+$submit = elgg_view('input/submit', array('value' => elgg_echo('save')));
+
+$body = <<<___END
+	$custom_form_section
+	<p>
+		<label>$access_text:</label> $access
+	</p>
+	<p>
+		$hidden
+		$submit
+	</p>
+___END;
+
+?>
+<div class="widget_edit">
+<?php
+$params = array(
+	'body' => $body,
+	'action' => "action/widgets/save"
+);
+echo elgg_view('input/form', $params);
+?>
+</div>
diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php
index 8e92c119b..6963989f9 100644
--- a/views/default/widgets/wrapper.php
+++ b/views/default/widgets/wrapper.php
@@ -35,7 +35,7 @@ $can_edit = $widget->canEdit();
 	</div>
 	<?php
 	if ($can_edit) {
-		echo elgg_view('widgets/editwrapper', array('widget' => $widget));
+		echo elgg_view('widgets/settings', array('widget' => $widget));
 	}
 	?>
 	<div class="widget_content">
-- 
cgit v1.2.3