Refs #2976: Converted most markup to use elgg-toggler elgg-toggles-* pattern

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

diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php
index 0172a2e1d2fcde28d49c54364df1aa479596c7f0..81ba8a7bf380001ccef97ef1641a258c1e898b13 100755 (executable)
--- a/mod/profile/views/default/profile/owner_block.php
+++ b/mod/profile/views/default/profile/owner_block.php
@@ -37,8 +37,8 @@ if (elgg_is_logged_in() && $actions) {
 $admin_links = '';
 if (elgg_is_admin_logged_in() && elgg_get_logged_in_user_guid() != elgg_get_page_owner_guid()) {
        $admin_links = '<ul class="profile-admin-menu-wrapper">';
-       $admin_links .= '<li><a class="elgg-toggle" id="elgg-toggler-admin-menu">Admin options&hellip;</a>';
-       $admin_links .= '<ul class="profile-admin-menu" id="elgg-togglee-admin-menu">';
+       $admin_links .= '<li><a class="elgg-toggler elgg-toggles-admin-menu">Admin options&hellip;</a>';
+       $admin_links .= '<ul class="profile-admin-menu" id="admin-menu">';
        foreach ($admin as $menu_item) {
                $admin_links .= elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
        }

diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php
index e755fae5bea7ccae4016e81a96cae6fdfa3424c6..16f9c877308669a653945e7f2c11232a32b4759d 100644 (file)
--- a/mod/reportedcontent/views/default/object/reported_content.php
+++ b/mod/reportedcontent/views/default/object/reported_content.php
@@ -57,12 +57,11 @@ if ($report->state == 'archived') {
                <?php echo elgg_view('output/url', array(
                        'href' => '#',
                        'text' => elgg_echo('reportedcontent:moreinfo'),
-                       'class' => "elgg-toggle",
-                       'id' => "elgg-toggler-report-$report->guid",
+                       'class' => "elgg-toggler elgg-toggles-report-$report->guid",
                ));
                ?>
        </p>
-       <div class="hidden" id="elgg-togglee-report-<?php echo $report->getGUID();?>">
+       <div class="hidden" id="report-<?php echo $report->getGUID();?>">
                <p>
                        <b><?php echo elgg_echo('reportedcontent:objecturl'); ?>:</b>
                        <?php echo elgg_view('output/url', array(

diff --git a/views/default/core/river/controls.php b/views/default/core/river/controls.php
index 21ce8414ccfabca3c13af754d6943eb1e365c7f9..9c330563596b046ecf28bffd6d748f2cb4a7b5ab 100644 (file)
--- a/views/default/core/river/controls.php
+++ b/views/default/core/river/controls.php
@@ -16,8 +16,7 @@ if (elgg_is_logged_in()) {
                        $params = array(
                                'href' => '#',
                                'text' => elgg_echo('generic_comments:text'),
-                               'class' => 'elgg-toggle',
-                               'id' => "elgg-toggler-{$object->getGUID()}",
+                               'class' => "elgg-toggler elgg-toggles-comments-add-{$object->getGUID()}",
                        );
                        echo elgg_view('output/url', $params);
                }

diff --git a/views/default/core/river/footer.php b/views/default/core/river/footer.php
index d4d01e57c22e51a0309a13d3a446970f4f8318fd..7cf9dd925e0a728bb5f60f11572e43c7785458f2 100644 (file)
--- a/views/default/core/river/footer.php
+++ b/views/default/core/river/footer.php
@@ -48,5 +48,5 @@ if ($comments) {
 
 // inline comment form
 echo elgg_view_form('comments/add', array(
-       'id' => "elgg-togglee-{$object->getGUID()}",
+       'id' => "comments-add-{$object->getGUID()}",
 ), array('entity' => $object, 'inline' => true));

diff --git a/views/default/object/widget/elements/controls.php b/views/default/object/widget/elements/controls.php
index 09f5fc947ffcea1130adefb2205e2fabc59f25ee..39eba471ab9c9def05d825e7545367b77f3f0a1d 100644 (file)
--- a/views/default/object/widget/elements/controls.php
+++ b/views/default/object/widget/elements/controls.php
@@ -33,8 +33,7 @@ if ($widget->canEdit()) {
                        'text' => ' ',
                        'title' => elgg_echo('widget:edit'),
                        'href' => "#",
-                       'class' => 'elgg-widget-edit-button elgg-toggle',
-                       'id' => "elgg-toggler-widget-$widget->guid"
+                       'class' => "elgg-widget-edit-button elgg-toggler elgg-toggles-widget-edit-$widget->guid",
                );
                $edit_link = elgg_view('output/url', $params);
        }

diff --git a/views/default/object/widget/elements/settings.php b/views/default/object/widget/elements/settings.php
index 05cc7b5ce754f08e08157548471bc9b8419697ca..5afe56ed80ed4834c998314259eb3b0e8e5dbae8 100644 (file)
--- a/views/default/object/widget/elements/settings.php
+++ b/views/default/object/widget/elements/settings.php
@@ -8,6 +8,6 @@
 $widget = elgg_extract('widget', $vars);
 ?>
 
-<div class="elgg-widget-edit" id="elgg-togglee-widget-<?php echo $widget->guid; ?>">
+<div class="elgg-widget-edit" id="widget-edit-<?php echo $widget->guid; ?>">
        <?php echo elgg_view_form('widgets/save', array(), $vars); ?>
 </div>

diff --git a/views/default/page/layouts/widgets/add_button.php b/views/default/page/layouts/widgets/add_button.php
index 0304c50a051995d286b1e63b17f7c3e01b8aa517..23c0b99eeee7c13e787ea43b75e5d1790cc55f7e 100644 (file)
--- a/views/default/page/layouts/widgets/add_button.php
+++ b/views/default/page/layouts/widgets/add_button.php
@@ -4,7 +4,7 @@
  */
 ?>
 <div class="elgg-widget-add-control">
-       <a class="elgg-button-action elgg-toggle" id="elgg-toggler-add-widgets">
+       <a class="elgg-button-action elgg-toggler elgg-toggles-widgets-add-panel">
                <?php echo elgg_echo('widgets:add'); ?>
        </a>
 </div>

diff --git a/views/default/page/layouts/widgets/add_panel.php b/views/default/page/layouts/widgets/add_panel.php
index 38c133c4aa38ffff3f1f3d38b748cbeee026b443..2786e83b224b8a3c14039912d8fee78c28b0260b 100644 (file)
--- a/views/default/page/layouts/widgets/add_panel.php
+++ b/views/default/page/layouts/widgets/add_panel.php
@@ -21,7 +21,7 @@ foreach ($widgets as $column_widgets) {
 }
 
 ?>
-<div class="elgg-widgets-add-panel hidden clearfix" id="elgg-togglee-add-widgets">
+<div class="elgg-widgets-add-panel hidden clearfix" id="widgets-add-panel">
        <p>
                <?php echo elgg_echo('widgets:add:description'); ?>
        </p>