moved widget into layout/objects as one of our core css objects

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

diff --git a/views/default/widgets/wrapper.php b/views/default/layout/objects/widget.php
similarity index 82%
rename from views/default/widgets/wrapper.php
rename to views/default/layout/objects/widget.php
index 5c71aa8f88aeaa0d1d2681d37a30eee0858ba41d..d109693e107859fef6ae1aad902806ae256c8344 100644 (file)
--- a/views/default/widgets/wrapper.php
+++ b/views/default/layout/objects/widget.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Elgg widget wrapper
+ * Widget object
  *
- * @package Elgg
- * @subpackage Core
+ * @uses $vars['entity']
  */
 
 $widget = $vars['entity'];
@@ -30,13 +29,13 @@ $widget_instance = "widget-instance-$handler";
        </div>
        <?php
        if ($can_edit) {
-               echo elgg_view('widgets/controls', array('widget' => $widget));
+               echo elgg_view('layout/objects/widget/controls', array('widget' => $widget));
        }
        ?>
        <div class="widget-container">
                <?php
                if ($can_edit) {
-                       echo elgg_view('widgets/settings', array('widget' => $widget));
+                       echo elgg_view('layout/objects/widget/settings', array('widget' => $widget));
                }
                ?>
                <div class="widget-content">

diff --git a/views/default/widgets/controls.php b/views/default/layout/objects/widget/controls.php
similarity index 100%
rename from views/default/widgets/controls.php
rename to views/default/layout/objects/widget/controls.php

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

diff --git a/views/default/layout/shells/widgets.php b/views/default/layout/shells/widgets.php
index 130b2eaad8fe3969378fab6d6900d003d09530b3..e5b63114bb4fef865d0d9ecfd495ff461ae7b617 100644 (file)
--- a/views/default/layout/shells/widgets.php
+++ b/views/default/layout/shells/widgets.php
@@ -19,13 +19,13 @@ $widgets = elgg_get_widgets($owner->guid, $context);
 
 if (elgg_can_edit_widget_layout($context)) {
        if ($show_add_widgets) {
-               echo elgg_view('widgets/add-button');
+               echo elgg_view('layout/shells/widgets/add_button');
        }
        $params = array(
                'widgets' => $widgets,
                'context' => $context,
        );
-       echo elgg_view('widgets/add_panel', $params);
+       echo elgg_view('layout/shells/widgets/add_panel', $params);
 }
 
 echo $vars['box'];

diff --git a/views/default/widgets/add_button.php b/views/default/layout/shells/widgets/add_button.php
similarity index 100%
rename from views/default/widgets/add_button.php
rename to views/default/layout/shells/widgets/add_button.php

diff --git a/views/default/widgets/add_panel.php b/views/default/layout/shells/widgets/add_panel.php
similarity index 100%
rename from views/default/widgets/add_panel.php
rename to views/default/layout/shells/widgets/add_panel.php

diff --git a/views/default/object/widget.php b/views/default/object/widget.php
index b3ef5bb8ce5f709a3d20c874612a24a9c71a69de..1da5897c396358836baee9af2e9a2a0693870a7e 100644 (file)
--- a/views/default/object/widget.php
+++ b/views/default/object/widget.php
@@ -6,4 +6,4 @@
  * @subpackage Core
  */
 
-echo elgg_view('widgets/wrapper',$vars);
+echo elgg_view('layout/objects/widget', $vars);