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

diff --git a/actions/widgets/add.php b/actions/widgets/add.php
index eebbd14386380423b62d95e62b66bee3b96f5aa9..001c139d818c89b3a9a7bb4b24f1711ba6b4447a 100644 (file)
--- 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 1343e131924af1dbd9a9bc2aabd37035fa1252ad..1646c18d441aee1cb4375ff8e887be6cd1777008 100644 (file)
--- 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 bee4b2126cadf95d66d4e044bacb5b34c92792d8..ac55d0e7f26ea9990dabe7b3f472a80e105359ca 100644 (file)
--- 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',\r
                forcePlaceholderSize: true,\r
                placeholder:          'widget_placeholder',\r
+               //containment:          '.widget_layout',\r
+               opacity:              0.8,\r
+               revert:               500,\r
                stop:                 function(event, ui) {\r
                        elgg.action('widgets/move', {\r
                                data: {\r
@@ -26,11 +29,11 @@ elgg.ui.widgets.init = function() {
        });\r
 \r
        $('#widget_add_button a').bind('click', function(event) {\r
-               $('.widgets_add').slideToggle('medium');\r
+               $('.widgets_add_panel').slideToggle('medium');\r
                event.preventDefault();\r
        });\r
 \r
-       $('.widgets_add a').bind('click', function(event) {\r
+       $('.widgets_add_panel a').bind('click', function(event) {\r
                elgg.action('widgets/add', {\r
                        data: {\r
                                handler: $(this).attr('id'),\r

diff --git a/views/default/css.php b/views/default/css.php
index 29930d4459204b94cbc32ef1da73bcf0963a7dc9..286beeece506820bb0a1e8bf1d4315ec5e52a37c 100644 (file)
--- 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 055b0453eff85013a8e4a828a4bf1e2729dbeea4..692d01accba6ccc648929d63602e94354de81ae5 100644 (file)
--- 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_panel.php
similarity index 94%
rename from views/default/widgets/add.php
rename to views/default/widgets/add_panel.php
index c8576cf06e795a226f79130a997f98342d9cdaef..70d80f41c486b56c30e88d60abb6833d9b092324 100644 (file)
--- a/views/default/widgets/add.php
+++ b/views/default/widgets/add_panel.php
@@ -6,7 +6,7 @@ $widget_types = elgg_get_widget_types();
 $context = $vars['context'];
 
 ?>
-<div class="widgets_add hidden">
+<div class="widgets_add_panel hidden">
        <p>
                <?php echo elgg_echo('widgets:add:description'); ?>
        </p>

diff --git a/views/default/widgets/editwrapper.php b/views/default/widgets/settings.php
similarity index 100%
rename from views/default/widgets/editwrapper.php
rename to views/default/widgets/settings.php

diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php
index 8e92c119b7f851221895886aba524153afdedf71..6963989f96721ccb7254dc41d4fd14fe31139984 100644 (file)
--- 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">