Fixes #3828 correct list classes

diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index f0f4bd9dc32f111167849df1389877c4a2cbde2e..beba7d2b71619f68f32f3ef83d88e72774f2397f 100644 (file)
--- a/engine/lib/deprecated-1.8.php
+++ b/engine/lib/deprecated-1.8.php
@@ -2424,7 +2424,7 @@ $posted_max = 0, $pagination = true) {
                'offset' => $offset,
                'limit' => $limit,
                'pagination' => $pagination,
-               'list-class' => 'elgg-river-list',
+               'list-class' => 'elgg-list-river',
        );
 
        return elgg_view('page/components/list', $params);

diff --git a/engine/lib/river.php b/engine/lib/river.php
index 64ddcfdc1e999bbc584259ec7304f81d63a2790b..a11e6145c1a54d4aea1577e77204f4ba0da76bad 100644 (file)
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -378,7 +378,7 @@ function elgg_list_river(array $options = array()) {
                'offset'     => (int) max(get_input('offset', 0), 0),
                'limit'      => (int) max(get_input('limit', 20), 0),
                'pagination' => TRUE,
-               'list_class' => 'elgg-river',
+               'list_class' => 'elgg-list-river elgg-river', // @todo remove elgg-river in Elgg 1.9
        );
 
        $options = array_merge($defaults, $options);

diff --git a/engine/lib/views.php b/engine/lib/views.php
index f6e5aa6b8963efe06e7cb4f1b5f3b7bde7551ad0..9a236508f60f124ccd80412aeccf377f145745e7 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1044,7 +1044,7 @@ $list_type_toggle = true, $pagination = true) {
 function elgg_view_annotation_list($annotations, array $vars = array()) {
        $defaults = array(
                'items' => $annotations,
-               'list_class' => 'elgg-annotation-list',
+               'list_class' => 'elgg-list-annotation elgg-annotation-list', // @todo remove elgg-annotation-list in Elgg 1.9
                'full_view' => true,
                'offset_key' => 'annoff',
        );

diff --git a/mod/likes/views/default/likes/count.php b/mod/likes/views/default/likes/count.php
index bdc50bcd1b9c0255fee01329476c4bf82d6324ad..071a069bde775d2838d1f65590539e91e4864715 100644 (file)
--- a/mod/likes/views/default/likes/count.php
+++ b/mod/likes/views/default/likes/count.php
@@ -24,8 +24,13 @@ if ($num_of_likes) {
                'href' => "#likes-$guid"
        );
        $list = elgg_view('output/url', $params);
-       $list .= "<div class='elgg-module elgg-module-popup elgg-likes-list hidden clearfix' id='likes-$guid'>";
-       $list .= elgg_list_annotations(array('guid' => $guid, 'annotation_name' => 'likes', 'limit' => 99));
+       $list .= "<div class='elgg-module elgg-module-popup elgg-likes hidden clearfix' id='likes-$guid'>";
+       $list .= elgg_list_annotations(array(
+               'guid' => $guid,
+               'annotation_name' => 'likes',
+               'limit' => 99,
+               'list_class' => 'elgg-list-likes'
+       ));
        $list .= "</div>";
        echo $list;
 }

diff --git a/mod/likes/views/default/likes/css.php b/mod/likes/views/default/likes/css.php
index fabf54e4643e5b7193ea7044fa19450fb437d26b..1ec07b3668da5adbf526962e5a498e240cb2bda2 100644 (file)
--- a/mod/likes/views/default/likes/css.php
+++ b/mod/likes/views/default/likes/css.php
@@ -7,7 +7,7 @@
 /* ***************************************
        Likes
 *************************************** */
-.elgg-likes-list {
+.elgg-likes {
        width: 345px;
        position: absolute;
 }

diff --git a/mod/likes/views/default/likes/js.php b/mod/likes/views/default/likes/js.php
index b7e000539fe3db09b8b990a6ff161538b4e8dcde..f701ebedf994515a5a7ea20b84551a90b596e75f 100644 (file)
--- a/mod/likes/views/default/likes/js.php
+++ b/mod/likes/views/default/likes/js.php
@@ -15,7 +15,7 @@
  * @return {Object}
  */
 elgg.ui.likesPopupHandler = function(hook, type, params, options) {
-       if (params.target.hasClass('elgg-likes-list')) {
+       if (params.target.hasClass('elgg-likes')) {
                options.my = 'right bottom';
                options.at = 'left top';
                return options;

diff --git a/mod/messageboard/views/default/messageboard/js.php b/mod/messageboard/views/default/messageboard/js.php
index 5d89fcd690d23b2aa884a3d9cc8959d7db7eb6ee..e5495409a2f6d4c0b7aab345d61a6e3fae2977be 100644 (file)
--- a/mod/messageboard/views/default/messageboard/js.php
+++ b/mod/messageboard/views/default/messageboard/js.php
@@ -23,7 +23,7 @@ elgg.messageboard.submit = function(e) {
                data: data,
                success: function(json) {
                        // the action always returns the full ul and li wrapped annotation.
-                       var ul = form.next('ul.elgg-annotation-list');
+                       var ul = form.next('ul.elgg-list-annotation');
 
                        if (ul.length < 1) {
                                form.parent().append(json.output);

diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index 4a09ca74ecbe6af83f6a6d4b7dbeff8670d035a8..f675ab7cb760928867a76a4f6fed58038ca38c14 100644 (file)
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -146,10 +146,10 @@
 /* ***************************************
        River
 *************************************** */
-.elgg-river {
+.elgg-list-river {
        border-top: 1px solid #CCC;
 }
-.elgg-river > li {
+.elgg-list-river > li {
        border-bottom: 1px solid #CCC;
 }
 .elgg-river-item {