Fixes #3032: toggler pattern is now <a href="#target" class="elgg-toggler">...</a...

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

diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php
index f0553dfb74cf87fa197e65b64d701d03b1c9abff..1e1981ab907366c338a952498ae471fc583d001e 100644 (file)
--- a/engine/classes/ElggMenuItem.php
+++ b/engine/classes/ElggMenuItem.php
@@ -413,6 +413,8 @@ class ElggMenuItem {
         * @params array $vars Options to pass to output/url if a link
         *
         * @return string
+        * 
+        * @todo View code in a model.  How do we feel about that?
         */
        public function getContent(array $vars = array()) {
 

diff --git a/js/lib/ui.js b/js/lib/ui.js
index df3c102ce5489e101460fa7c4c56254f071003b7..3118bb408ff1c5438bb83ef2290dd5da456b9b4a 100644 (file)
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -25,8 +25,7 @@ elgg.ui.init = function () {
  * Toggles an element based on clicking a separate element
  *
  * Use .elgg-toggler on the toggler element
- * Add another class to the toggler called elgg-toggles-<id>
- * The id of the element being toggled is <id>
+ * Set the href to target the item you want to toggle (<a href="#id-of-target">)
  *
  * @param {Object} event
  * @return void
@@ -34,11 +33,9 @@ elgg.ui.init = function () {
 elgg.ui.toggles = function(event) {
        event.preventDefault();
 
-       $(this).toggleClass('elgg-state-active');
+       var target = $(this).toggleClass('elgg-state-active').attr('href');
 
-       var togglees = $(this).attr('class').match(/elgg-toggles-[^ ]*/i);
-
-       $('#' + togglees[0].replace('elgg-toggles-', '')).slideToggle('medium');
+       $(target).slideToggle('medium');
 }
 
 /**

diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php
index e458469e424381a52acc77b6d0937c4f3a4fdb86..b8f912649d21321e15f636f9af6530b4cc5eeafc 100755 (executable)
--- a/mod/profile/views/default/profile/owner_block.php
+++ b/mod/profile/views/default/profile/owner_block.php
@@ -33,8 +33,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-toggler elgg-toggles-admin-menu">Admin options&hellip;</a>';
-       $admin_links .= '<ul class="profile-admin-menu" id="admin-menu">';
+       $admin_links .= '<li><a class="elgg-toggler href="#profile-menu-admin">Admin options&hellip;</a>';
+       $admin_links .= '<ul class="profile-admin-menu" id="profile-menu-admin">';
        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 9ac878ab4cc9b132f6fe8f7332c50795df9f4677..044a40012f47e862b36eb1e95a8a8e25b2bcf8d5 100644 (file)
--- a/mod/reportedcontent/views/default/object/reported_content.php
+++ b/mod/reportedcontent/views/default/object/reported_content.php
@@ -55,9 +55,9 @@ if ($report->state == 'archived') {
                <?php echo $report->title; ?>
                <br />
                <?php echo elgg_view('output/url', array(
-                       'href' => '#',
+                       'href' => "#report-$report->guid",
                        'text' => elgg_echo('reportedcontent:moreinfo'),
-                       'class' => "elgg-toggler elgg-toggles-report-$report->guid",
+                       'class' => "elgg-toggler",
                ));
                ?>
        </p>

diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php
index 06a9a15fbdcca8fe17c6c6ceca5a39b6e13495f3..3c62a5448f04fb692861bddcf713469b27ac7159 100644 (file)
--- a/views/default/core/account/login_dropdown.php
+++ b/views/default/core/account/login_dropdown.php
@@ -21,8 +21,10 @@ $body = elgg_view_form('login', array('action' => "{$login_url}action/login"), a
                echo elgg_view('output/url', array(
                        'href' => 'pg/login',
                        'text' => elgg_echo('login'),
-                       'class' => "elgg-button elgg-button-dropdown elgg-toggler elgg-toggles-login-dropdown-box",
                )); 
                echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); 
        ?>
-</div>
\ No newline at end of file
+</div>
+<script>
+       $('#login-dropdown > a').attr('href', '#login-dropdown-box').addClass('elgg-toggler elgg-button elgg-button-dropdown');
+</script>
\ No newline at end of file

diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index d895063199f1a77e0532946d5ea13d538a51813d..4ff2dffa8add77d693904257c4ed95b948d10a6b 100644 (file)
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -191,7 +191,15 @@ if (elgg_view_exists($settings_view)) {
                        <div class="plugin_description"><?php echo $description; ?></div>
                        <p class="plugin_author"><?php echo $author . ' - ' . $website; ?></p>
        
-                       <div class="pts"><a class="elgg-toggler elgg-toggles-elgg-plugin-manifest-<?php echo $plugin->getID(); ?>"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></div>
+                       <div class="pts">
+                       <?php 
+                               echo elgg_view('output/url', array(
+                                       'href' => "#elgg-plugin-manifest-{$plugin->getID()}",
+                                       'text' => elgg_echo("admin:plugins:label:moreinfo"),
+                                       'class' => 'elgg-toggler',
+                               ));
+                       ?>
+                       </div>
                </div>
        </div>
        <div class="hidden manifest_file" id="elgg-plugin-manifest-<?php echo $plugin->getID(); ?>">

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

diff --git a/views/default/page/layouts/widgets/add_button.php b/views/default/page/layouts/widgets/add_button.php
index cfcbcc9989ab61e1f8e6c31949f5af8faea33087..614b25332f4531d129d2475e7c0c85405963778e 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 elgg-button-action elgg-toggler elgg-toggles-widgets-add-panel">
+       <a class="elgg-button elgg-button-action elgg-toggler" href="#elgg-toggles-widgets-add-panel">
                <?php echo elgg_echo('widgets:add'); ?>
        </a>
 </div>

diff --git a/views/default/river/item/controls.php b/views/default/river/item/controls.php
index 32653452bdd435e5b742557e8faa3a2df110628b..96979f2c5da2f197c39a8d334d58654439cb5bf5 100644 (file)
--- a/views/default/river/item/controls.php
+++ b/views/default/river/item/controls.php
@@ -15,9 +15,9 @@ if (elgg_is_logged_in()) {
                if ($object->canComment()) {
                        elgg_register_menu_item('river', array(
                                'name' => 'comment',
-                               'href' => '#',
+                               'href' => "#comments-add-$object->guid",
                                'text' => elgg_echo('generic_comments:text'),
-                               'class' => "elgg-toggler elgg-toggles-comments-add-{$object->getGUID()}",
+                               'class' => "elgg-toggler",
                        ));
                }