fixed a few bugs and updated the widget code

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

diff --git a/actions/widgets/save.php b/actions/widgets/save.php
index 8854d781083da791cd37a27ee290d7dd211e0ac7..a78f4ca757e2042d06fd2d4ed06b038f11c252c6 100644 (file)
--- a/actions/widgets/save.php
+++ b/actions/widgets/save.php
@@ -11,7 +11,8 @@ $params = get_input('params');
 
 $widget = get_entity($guid);
 if ($widget && $widget->saveSettings($params)) {
-       $view = "widgets/$widget->handler/view";
+       elgg_set_page_owner_guid($widget->getContainerGUID());
+       $view = "widgets/$widget->handler/content";
        echo elgg_view($view, array('entity' => $widget));
 } else {
        register_error(elgg_echo('widgets:save:failure'));

diff --git a/engine/classes/ElggDiskFilestore.php b/engine/classes/ElggDiskFilestore.php
index c7ca9fd055f5ce09315c3bf234537466ad871780..77405484250075988818512dfbc6f3323eea80de 100644 (file)
--- a/engine/classes/ElggDiskFilestore.php
+++ b/engine/classes/ElggDiskFilestore.php
@@ -63,7 +63,7 @@ class ElggDiskFilestore extends ElggFilestore {
 
                // Try and create the directory
                try {
-                       $this->make_directory_root($path);
+                       $this->makeDirectoryRoot($path);
                } catch (Exception $e) {
 
                }

diff --git a/js/lib/ui.js b/js/lib/ui.js
index 1ebc3bca61fa6f1ed7a604fd8eafbed64ffcca63..c7eda593c940fcbc9d3a334546be807eb90f9cfc 100644 (file)
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -6,7 +6,7 @@ elgg.ui.init = function () {
                $(this).stop().fadeOut('fast');\r
        });\r
 \r
-       $('.elgg-toggle').click(elgg.ui.toggle);\r
+       $('.elgg-toggle').live('click', elgg.ui.toggle);\r
        \r
        $('a.collapsibleboxlink').click(elgg.ui.toggleCollapsibleBox);\r
 \r

diff --git a/js/lib/ui.widgets.js b/js/lib/ui.widgets.js
index 867b53af5fb9050e97f791f5efb3ec723b44f96f..87f552d50ecc72ec0c8548f2e43d4d98001923a0 100644 (file)
--- a/js/lib/ui.widgets.js
+++ b/js/lib/ui.widgets.js
@@ -24,10 +24,10 @@ elgg.ui.widgets.init = function() {
        });\r
 \r
        $('.elgg-widgets-add-panel li.elgg-widget-available').click(elgg.ui.widgets.add);\r
-       $('a.elgg-widget-delete-button').click(elgg.ui.widgets.remove);\r
-       $('a.elgg-widget-edit-button').click(elgg.ui.widgets.editToggle);\r
-       $('.elgg-widget-edit > form ').submit(elgg.ui.widgets.saveSettings);\r
-       $('a.elgg-widget-collapse-button').click(elgg.ui.widgets.collapseToggle);\r
+\r
+       $('a.elgg-widget-delete-button').live('click', elgg.ui.widgets.remove);\r
+       $('.elgg-widget-edit > form ').live('submit', elgg.ui.widgets.saveSettings);\r
+       $('a.elgg-widget-collapse-button').live('click', elgg.ui.widgets.collapseToggle);\r
 \r
        elgg.ui.widgets.equalHeight(".elgg-widgets");\r
 };\r
@@ -62,10 +62,6 @@ elgg.ui.widgets.add = function(event) {
                success: function(json) {\r
                        $('#elgg-widget-col-1').prepend(json.output);\r
                        var $widget = $('#elgg-widget-col-1').children(":first");\r
-                       $widget.find('a.elgg-widget-delete-button').click(elgg.ui.widgets.remove);\r
-                       $widget.find('a.elgg-widget-edit-button').click(elgg.ui.widgets.editToggle);\r
-                       $widget.find('a.elgg-widget-collapse-button').click(elgg.ui.widgets.collapseToggle);\r
-                       $widget.find('.elgg-widget-edit > form ').submit(elgg.ui.widgets.saveSettings);\r
                }\r
        });\r
        event.preventDefault();\r
@@ -141,20 +137,7 @@ elgg.ui.widgets.remove = function(event) {
 }\r
 \r
 /**\r
- * Toggle the edit panel of a widget\r
- *\r
- * Yes, I'm quite bad at selectors.\r
- *\r
- * @param {Object} event\r
- * @return void\r
- */\r
-elgg.ui.widgets.editToggle = function(event) {\r
-       $(this).parent().parent().find('.elgg-widget-edit').slideToggle('medium');\r
-       event.preventDefault();\r
-}\r
-\r
-/**\r
- * Toogle the collapse state of the widget\r
+ * Toggle the collapse state of the widget\r
  *\r
  * @param {Object} event\r
  * @return void\r
@@ -176,8 +159,13 @@ elgg.ui.widgets.collapseToggle = function(event) {
 elgg.ui.widgets.saveSettings = function(event) {\r
        $(this).parent().slideToggle('medium');\r
        var $widgetContent = $(this).parent().parent().children('.elgg-widget-content');\r
-       // @todo - change to ajax loader\r
-       $widgetContent.html('loading');\r
+       \r
+       // stick the ajaxk loader in there\r
+       var $loader = $('#elgg-widget-loader').clone();\r
+       $loader.attr('id', '#elgg-widget-active-loader');\r
+       $loader.removeClass('hidden');\r
+       $widgetContent.html($loader);\r
+\r
        elgg.action('widgets/save', {\r
                data: $(this).serialize(),\r
                success: function(json) {\r

diff --git a/mod/pages/views/default/pages/pagelisting.php b/mod/pages/views/default/pages/pagelisting.php
index 0c4a411fbf2e4f1d6e9ca67499f4e1e27d1c265a..b5034313fca7faca04a32f74c72052de912412cf 100644 (file)
--- a/mod/pages/views/default/pages/pagelisting.php
+++ b/mod/pages/views/default/pages/pagelisting.php
@@ -24,9 +24,9 @@ if ($latest) {
 
 
        $info .= "<p class=\"owner_timestamp\">" . elgg_echo("pages:strapline",
-                                       array(elgg_view_friendly_time($time_updated)),
+                                       array(elgg_view_friendly_time($time_updated),
                                        "<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
-       ) . "</p>";
+       )) . "</p>";
 }
 
 echo elgg_view_listing($icon, $info);

diff --git a/mod/pages/views/default/pages/pageprofile.php b/mod/pages/views/default/pages/pageprofile.php
index 7008e668c05e6b381f201e8cc845052cc6c274e5..f8399556ad753fbefb4b96556e0a4069de599d19 100644 (file)
--- a/mod/pages/views/default/pages/pageprofile.php
+++ b/mod/pages/views/default/pages/pageprofile.php
@@ -63,9 +63,9 @@ if ($rev) {
                        $owner = get_entity($owner_guid);
 
                        echo elgg_echo("pages:strapline",
-                                                       array(elgg_view_friendly_time($time_updated)),
+                                                       array(elgg_view_friendly_time($time_updated),
                                                        "<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
-                       );
+                       ));
 
                ?>
        </p>

diff --git a/pages/dashboard.php b/pages/dashboard.php
index c6a24773ae8324fe7930b9e7fcd29eed7f740c2d..6cd19e1cf8efa069a98864c5cd5f9dc39036fa6c 100644 (file)
--- a/pages/dashboard.php
+++ b/pages/dashboard.php
@@ -11,7 +11,7 @@ gatekeeper();
 
 // Set context and title
 elgg_set_context('dashboard');
-set_page_owner(get_loggedin_userid());
+elgg_set_page_owner_guid(get_loggedin_userid());
 $title = elgg_echo('dashboard');
 
 // wrap intro message in a div

diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index a96aaaa9008f1d4db8765433746850b19bf32c0d..129a8c6373ee08e8974415a220353f77d75e3b4b 100644 (file)
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -150,6 +150,7 @@ echo elgg_view('css/elements/skin', $vars);
        padding: 10px;
        margin: 0 5px 15px;
        background: #dedede;
+       border: 2px solid #cccccc;
 }
 .elgg-widgets-add-panel ul {
        padding: 0;
@@ -162,13 +163,19 @@ echo elgg_view('css/elements/skin', $vars);
        width: 200px;
        padding: 4px;
        background-color: #cccccc;
+       border: 2px solid #b0b0b0;
+       font-weight: bold;
 }
 .elgg-widgets-add-panel li a {
        display: block;
 }
 .elgg-widget-available {
+       color: #333333;
        cursor: pointer;
 }
+.elgg-widget-available:hover {
+       background-color: #bcbcbc;
+}
 .elgg-widget-unavailable {
        color: #888888;
 }

diff --git a/views/default/graphics/ajax_loader.php b/views/default/graphics/ajax_loader.php
index b1f35971a390435cdf509ee4973bd09975c187c7..e539188f222cf7b759144c04dde8f2f4e86e6fa0 100644 (file)
--- a/views/default/graphics/ajax_loader.php
+++ b/views/default/graphics/ajax_loader.php
@@ -4,11 +4,17 @@
  *
  * @package Elgg
  * @subpackage Core
+ *
+ * @uses $vars['id']
  */
 
+if (isset($vars['internalid'])) {
+       $id = "id=\"{$vars['internalid']}\"";
+}
+
 $loader = <<< END
 
-<div align="center" class="ajax-loader hidden"></div>
+<div align="center" class="ajax-loader hidden" $id></div>
 
 END;
 

diff --git a/views/default/layout/objects/widget/controls.php b/views/default/layout/objects/widget/controls.php
index b07a42e22337d4543fe30f6f48317b01168ad4e1..79e434f1a3c2d9cb03b19550f4573082dbf41208 100644 (file)
--- a/views/default/layout/objects/widget/controls.php
+++ b/views/default/layout/objects/widget/controls.php
@@ -12,7 +12,8 @@ $params = array(
        'text' => ' ',
        'href' => "#",
        'class' => 'elgg-widget-collapse-button',
-       'internalid' => "elgg-widget-collapse-button-$widget->guid"
+//     'internalid' => "elgg-toggler-widget-$widget->guid"
+//     'internalid' => "elgg-widget-collapse-button-$widget->guid"
 );
 $collapse_link = elgg_view('output/url', $params);
 
@@ -30,8 +31,8 @@ $params = array(
        'text' => ' ',
        'title' => elgg_echo('widget:edit'),
        'href' => "#",
-       'class' => 'elgg-widget-edit-button',
-       'internalid' => "elgg-widget-edit-button-$widget->guid"
+       'class' => 'elgg-widget-edit-button elgg-toggle',
+       'internalid' => "elgg-toggler-widget-$widget->guid"
 );
 $edit_link = elgg_view('output/url', $params);
 

diff --git a/views/default/layout/objects/widget/settings.php b/views/default/layout/objects/widget/settings.php
index c1e00c3f1d3836ac40a152191022dfe67b2d76df..8020983c60dccb482b71e12fe14bc254e53ee1b9 100644 (file)
--- a/views/default/layout/objects/widget/settings.php
+++ b/views/default/layout/objects/widget/settings.php
@@ -33,7 +33,7 @@ $body = <<<___END
 ___END;
 
 ?>
-<div class="elgg-widget-edit">
+<div class="elgg-widget-edit" id="elgg-togglee-widget-<?php echo $widget->guid; ?>">
 <?php
 $params = array(
        'body' => $body,

diff --git a/views/default/layout/shells/widgets.php b/views/default/layout/shells/widgets.php
index 0c21e7042faacb67faaed60d3aebac290de7fa52..82489b37f645eddf1c5091ae2b73571bedf391eb 100644 (file)
--- a/views/default/layout/shells/widgets.php
+++ b/views/default/layout/shells/widgets.php
@@ -43,4 +43,6 @@ for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
        echo '</div>';
 }
 
-elgg_pop_context();
\ No newline at end of file
+elgg_pop_context();
+
+echo elgg_view('graphics/ajax_loader', array('internalid' => 'elgg-widget-loader'));
\ No newline at end of file