From: ewinslow Date: Tue, 1 Mar 2011 19:48:05 +0000 (+0000) Subject: Fixes #3032: toggler pattern is now ...... Wow, so much nicer. 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 f0553dfb7..1e1981ab9 100644 --- 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 df3c102ce..3118bb408 100644 --- 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- - * The id of the element being toggled is + * Set the href to target the item you want to toggle () * * @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 e458469e4..b8f912649 100755 --- 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 = '
    '; - $admin_links .= '
  • Admin options…'; - $admin_links .= '
      '; + $admin_links .= '
    • Admin options…'; + $admin_links .= '
        '; 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 9ac878ab4..044a40012 100644 --- 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') { title; ?>
        '#', + 'href' => "#report-$report->guid", 'text' => elgg_echo('reportedcontent:moreinfo'), - 'class' => "elgg-toggler elgg-toggles-report-$report->guid", + 'class' => "elgg-toggler", )); ?>

        diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php index 06a9a15fb..3c62a5448 100644 --- 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')); ?> - \ No newline at end of file + + \ No newline at end of file diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php index d89506319..4ff2dffa8 100644 --- a/views/default/object/plugin/advanced.php +++ b/views/default/object/plugin/advanced.php @@ -191,7 +191,15 @@ if (elgg_view_exists($settings_view)) {

        -
        +
        + "#elgg-plugin-manifest-{$plugin->getID()}", + 'text' => elgg_echo("admin:plugins:label:moreinfo"), + 'class' => 'elgg-toggler', + )); + ?> +