Fixes #2802 put state class on list element rather than span

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

diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index d5a8208b0ba3655fc63bd3776bc18aae498e7d79..4ebe5a6f1db856057669a5d386296691a1f6573f 100644 (file)
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -33,11 +33,11 @@
        color: white;
        text-decoration: none;
 }
-.elgg-pagination .elgg-state-disabled {
+.elgg-pagination .elgg-state-disabled span {
        color: #CCCCCC;
        border-color: #CCCCCC;
 }
-.elgg-pagination .elgg-state-selected {
+.elgg-pagination .elgg-state-selected span {
        color: #555555;
        border-color: #555555;
 }

diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index 153395c4d2b5ba71c9eb383cb76e3f8d90565509..98b85201e2742c542720ffc79de8138e7a02d777 100644 (file)
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -94,12 +94,12 @@ if ($pages->prev['href']) {
        $link = elgg_view('output/url', $pages->prev);
        echo "<li>$link</li>";
 } else {
-       echo "<li><span class=\"elgg-state-disabled\">{$pages->prev['text']}</span></li>";
+       echo "<li class=\"elgg-state-disabled\"><span>{$pages->prev['text']}</span></li>";
 }
 
 foreach ($pages->items as $page) {
        if ($page == $current_page) {
-               echo "<li><span class=\"elgg-state-selected\">$page</span></li>";
+               echo "<li class=\"elgg-state-selected\"><span>$page</span></li>";
        } else {
                $page_offset = (($page - 1) * $limit);
                $url = elgg_http_add_url_query_elements($base_url, array($offset_key => $page_offset));
@@ -111,7 +111,7 @@ if ($pages->next['href']) {
        $link = elgg_view('output/url', $pages->next);
        echo "<li>$link</li>";
 } else {
-       echo "<li><span class=\"elgg-state-disabled\">{$pages->next['text']}</span></li>";
+       echo "<li class=\"elgg-state-disabled\"><span>{$pages->next['text']}</span></li>";
 }
 
 echo '</ul>';