CSS can handle alternating row colouring now

diff --git a/plugins/Directory/css/directory.css b/plugins/Directory/css/directory.css
index d49c28fe559cb73dbad001a16de656d140770c57..b4fe68d4cc202695536ed20a46742e5ebe2bd85e 100644 (file)
--- a/plugins/Directory/css/directory.css
+++ b/plugins/Directory/css/directory.css
@@ -41,10 +41,6 @@ table.profile_list tr {
     float: none;
 }
 
-table.profile_list tr.alt {
-    background-color: #def; /* zebra stripe */
-}
-
 table.profie_list td {
     width: 100%;
     padding: 0;
@@ -61,4 +57,4 @@ th.current.reverse {
     background-image: url(../images/control_arrow_up.gif);
     background-repeat: no-repeat;
     background-position: 60% 2px;
-}
\ No newline at end of file
+}

diff --git a/plugins/Directory/lib/sortablesubscriptionlist.php b/plugins/Directory/lib/sortablesubscriptionlist.php
index 75c42a5fdfc06fd254d6aca69b482295d0822dcc..d6df6c64cda02b44ba29ba0c94122b65cf7c68f8 100644 (file)
--- a/plugins/Directory/lib/sortablesubscriptionlist.php
+++ b/plugins/Directory/lib/sortablesubscriptionlist.php
@@ -27,11 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/subscriptionlist.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Widget to show a sortable list of subscriptions
@@ -128,32 +124,9 @@ class SortableSubscriptionList extends SubscriptionList
         $this->out->elementEnd('table');
     }
 
-    function showProfiles()
+    function newListItem($profile)
     {
-        // Note: we don't use fetchAll() because it's borked with query()
-
-        $profiles = array();
-
-        while ($this->profile->fetch()) {
-            $profiles[] = clone($this->profile);
-        }
-
-        $cnt = count($profiles);
-
-        $max = min($cnt, $this->maxProfiles());
-
-        for ($i = 0; $i < $max; $i++) {
-            $odd = ($i % 2 == 0); // for zebra striping
-            $pli = $this->newListItem($profiles[$i], $odd);
-            $pli->show();
-        }
-
-        return $cnt;
-    }
-
-    function newListItem($profile, $odd)
-    {
-        return new SortableSubscriptionListItem($profile, $this->owner, $this->action, $odd);
+        return new SortableSubscriptionListItem($profile, $this->owner, $this->action);
     }
 }
 
@@ -162,11 +135,10 @@ class SortableSubscriptionListItem extends SubscriptionListItem
     /** Owner of this list */
     var $owner = null;
 
-    function __construct($profile, $owner, $action, $alt)
+    function __construct($profile, $owner, $action)
     {
         parent::__construct($profile, $owner, $action);
 
-        $this->alt   = $alt; // is this row alternate?
         $this->owner = $owner;
     }
 
@@ -177,10 +149,6 @@ class SortableSubscriptionListItem extends SubscriptionListItem
             'id'    => 'profile-' . $this->profile->id
         );
 
-        if ($this->alt) {
-            $attr['class'] .= ' alt';
-        }
-
         $this->out->elementStart('tr', $attr);
     }
 

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index ddc225fb82d073f8288e1534b1e3e30dc7fc5f9c..20f9aa775fe16613735e3d360d29009fcdbc72cb 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1622,6 +1622,11 @@ ul.profile_list li {
     display: block;
 }
 
+table.profile_list tbody tr:nth-child(2n+1) {
+    background-color: #fafafa !important;
+    border: none !important;
+}
+
 .entity_profile .entity_nickname,
 .entity_profile .entity_fn {
 margin-left:0;

diff --git a/theme/neo-gnu/css/display.css b/theme/neo-gnu/css/display.css
index 39cce89e482edb178fd01b8aeca1c89de754c53a..be9b80d41c5b9fbad12b35f552d2a408cccd3490 100644 (file)
--- a/theme/neo-gnu/css/display.css
+++ b/theme/neo-gnu/css/display.css
@@ -1141,11 +1141,6 @@ table.profile_list {
         background: url(../images/bluearrow_up.png) no-repeat top right;
 }
 
-table.profile_list tr.alt {
-    background-color: #fafafa !important;
-    border: none !important;
-}
-
 td.entity_profile {
     width: auto;
     min-width: 250px;

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 601845164b5d532d3465492fb116c63de102bac9..575e6b73868c8a06340a6be015698e810011e2f8 100644 (file)
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -938,11 +938,6 @@ table.profile_list {
         background: url(../images/bluearrow_up.png) no-repeat top right;
 }
 
-table.profile_list tr.alt {
-    background-color: #fafafa !important;
-    border: none !important;
-}
-
 td.entity_profile {
     width: auto;
     min-width: 250px;