Remove FIXME-marked Opera links until they actually work

diff --git a/actions/all.php b/actions/all.php
index a53bbea07b4c0f541e91fcab6a4e761651d6b02c..03179a2468cfa0396f28e43e7f15c3ea4bf19764 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -69,17 +69,6 @@ class AllAction extends ProfileAction
                               sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname)));
     }
 
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'all', array('nickname' => $this->user->nickname));
-    }
-
     function showLocalNav()
     {
         $nav = new PersonalGroupNav($this);

diff --git a/actions/favorited.php b/actions/favorited.php
index 7e31303e3b87ea11fa71e8046cab24ea3a729d53..c902d80f5387e2e5c4f9f50a770864380c9cbd94 100644 (file)
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -221,15 +221,4 @@ class FavoritedAction extends Action
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
                           $this->page, 'favorited');
     }
-
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'favorited');
-    }
 }

diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 909935bec81a616128ae76deb4dcbe14a1ab9436..21e5ebbaa19c443b0bc81f8f9163b827eb488655 100644 (file)
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -137,15 +137,4 @@ class GroupmembersAction extends Action
                           $this->page, 'groupmembers',
                           array('nickname' => $this->group->nickname));
     }
-
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'groupmembers', array('nickname' => $this->group->nickname));
-    }
 }

diff --git a/actions/groups.php b/actions/groups.php
index e20acce70656189098b60f6c66e7a0a6645ce6de..26b52a5fcd4dde75618205ccb3716900a8a4d6b8 100644 (file)
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -129,15 +129,4 @@ class GroupsAction extends Action
         $gbm = new GroupsByMembersSection($this);
         $gbm->show();
     }
-
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'groups', array('nickname' => $this->group->nickname));
-    }
 }

diff --git a/actions/inbox.php b/actions/inbox.php
index 7b5cf2d203d8f6abf1380ac74cc6e234f1d1d125..f14ba631fd9bad1633b014338ab173c21f64682f 100644 (file)
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -46,15 +46,15 @@ require_once INSTALLDIR.'/lib/mailbox.php';
 
 class InboxAction extends MailboxAction
 {
-    
+
     /**
      * Title of the page
      *
      * @return string page title
      */
-    
+
     function title()
-    {        
+    {
         if ($this->page > 1) {
             return sprintf(_("Inbox for %s - page %d"), $this->user->nickname,
                 $this->page);
@@ -63,22 +63,11 @@ class InboxAction extends MailboxAction
         }
     }
 
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'inbox', array('nickname' => $this->user->nickname));
-    }
-
     /**
      * Retrieve the messages for this user and this page
      *
      * Does a query for the right messages
-     *  
+     *
      * @return Message data object with stream for messages
      *
      * @see MailboxAction::getMessages()
@@ -95,7 +84,7 @@ class InboxAction extends MailboxAction
 
         if ($message->find()) {
             return $message;
-        } else {            
+        } else {
             return null;
         }
     }

diff --git a/actions/outbox.php b/actions/outbox.php
index deef1cc870f5ef9a7ef6c2643be3f59a1f116958..a875e9ad95b54ccb6d0ee0a254c14df0b5024706 100644 (file)
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -62,22 +62,11 @@ class OutboxAction extends MailboxAction
         }
     }
 
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'outbox', array('nickname' => $this->user->nickname));
-    }
-
     /**
      * retrieve the messages for this user and this page
      *
      * Does a query for the right messages
-     *  
+     *
      * @return Message data object with stream for messages
      *
      * @see MailboxAction::getMessages()

diff --git a/actions/public.php b/actions/public.php
index d2f9da6460f86d0decf408200fb9c4ab8f221e87..27153f13159daf2c990ba7937cc697e0724ad27f 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -135,17 +135,6 @@ class PublicAction extends Action
                               _('Public Stream Feed (Atom)')));
     }
 
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'public');
-    }
-
     /**
      * Extra head elements
      *

diff --git a/actions/replies.php b/actions/replies.php
index dfb520d64974ae5c104e8f9e8c5b7caeab400e09..eac4d0a3aeeda3622eec4bcbaec8a787fbbe82ac 100644 (file)
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -138,17 +138,6 @@ class RepliesAction extends Action
         return array(new Feed(Feed::RSS1, $rssurl, $rsstitle));
     }
 
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'replies', array('nickname' => $this->user->nickname));
-    }
-
     /**
      * show the personal group nav
      *

diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index eed62a2ab308f79dfdb318ee61cbebf338367d72..865045337aa9c07e8421f4801aeaa4f584f7e718 100644 (file)
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -150,18 +150,6 @@ class ShowfavoritesAction extends Action
         return array(new Feed(Feed::RSS1, $feedurl, $feedtitle));
     }
 
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'showfavorites', array('nickname' => $this->user->nickname));
-    }
-
-
     /**
      * show the personal group nav
      *

diff --git a/actions/showgroup.php b/actions/showgroup.php
index a7df397273af91e940b8fa816745add5df24f728..29b6fa1e61be25ee576a7256a4d89eb1bb88daa3 100644 (file)
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -311,17 +311,6 @@ class ShowgroupAction extends Action
                                                         $this->group->nickname)));
     }
 
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'showgroup', array('nickname' => $this->group->nickname));
-    }
-
     /**
      * Fill in the sidebar.
      *

diff --git a/actions/showstream.php b/actions/showstream.php
index 82665e5b8b3841f1c68015ecb0be4359a617128b..c1a2c337a0da3ab070c05a75ddb5bca728226c17 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -135,17 +135,6 @@ class ShowstreamAction extends ProfileAction
                               sprintf(_('FOAF for %s'), $this->user->nickname)));
     }
 
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'showstream', array('nickname' => $this->user->nickname));
-    }
-
     function extraHead()
     {
         // for remote subscriptions etc.

diff --git a/actions/tag.php b/actions/tag.php
index 02f3e35225cca6976fc7efe5a8b0930b346664eb..f5ca06f0555669df257712765c57652456f42cec 100644 (file)
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -51,7 +51,6 @@ class TagAction extends Action
         $pop->show();
     }
 
-
     function title()
     {
         if ($this->page == 1) {
@@ -77,17 +76,6 @@ class TagAction extends Action
                               sprintf(_('Feed for tag %s'), $this->tag)));
     }
 
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'tag', array('tag' => $this->tag));
-    }
-
     function showPageNotice()
     {
         return sprintf(_('Messages tagged "%s", most recent first'), $this->tag);

diff --git a/lib/action.php b/lib/action.php
index 6b130b6d553484e0be8d7e790e9706303b8bfac8..7c7c52c2c19d5b8baf702d3502021e8851ff8fd7 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -124,7 +124,6 @@ class Action extends HTMLOutputter // lawsuit
         $this->showShortcutIcon();
         $this->showStylesheets();
         $this->showScripts();
-        $this->showRelationshipLinks();
         $this->showOpenSearch();
         $this->showFeeds();
         $this->showDescription();
@@ -261,19 +260,6 @@ class Action extends HTMLOutputter // lawsuit
         }
     }
 
-    /**
-     * Show document relationship links
-     *
-     * SHOULD overload
-     *
-     * @return nothing
-     */
-    function showRelationshipLinks()
-    {
-        // output <link> elements with appropriate HTML4.01 link types:
-        // http://www.w3.org/TR/html401/types.html#type-links
-    }
-
     /**
      * Show OpenSearch headers
      *
@@ -1055,36 +1041,4 @@ class Action extends HTMLOutputter // lawsuit
     {
         return null;
     }
-
-    /**
-     * Generate document metadata for sequential navigation
-     *
-     * @param boolean $have_before is there something before?
-     * @param boolean $have_after  is there something after?
-     * @param integer $page        current page
-     * @param string  $action      current action
-     * @param array   $args        rest of query arguments
-     *
-     * @return nothing
-     */
-    function sequenceRelationships($have_next, $have_previous, $page, $action, $args=null)
-    {
-        // Outputs machine-readable pagination in <link> elements.
-        // Pattern taken from $this->pagination() method.
-
-        // "next" is equivalent to "after"
-        if ($have_next) {
-            $pargs   = array('page' => $page-1);
-            $this->element('link', array('rel' => 'next',
-                                         'href' => common_local_url($action, $args, $pargs),
-                                         'title' => _('Next')));
-        }
-        // "previous" is equivalent to "before"
-        if ($have_previous=true) { // FIXME
-            $pargs   = array('page' => $page+1);
-            $this->element('link', array('rel' => 'prev',
-                                         'href' => common_local_url($action, $args, $pargs),
-                                         'title' => _('Previous')));
-        }
-    }
 }