Merge branch 'nobase' into 0.7.x

diff --combined lib/action.php
index b9e8ee6c16c30dfe0f71695ef30b222e36d57007,b02f525f0b07582da8aff836f2b8f40f5bdc9a88..2ec9329e052d25d90745a8bae55638e21e17f5b8
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -124,7 -124,6 +124,7 @@@ class Action extends HTMLOutputter // l
          $this->showShortcutIcon();
          $this->showStylesheets();
          $this->showScripts();
 +        $this->showRelationshipLinks();
          $this->showOpenSearch();
          $this->showFeeds();
          $this->showDescription();
@@@ -193,10 -192,6 +193,6 @@@
      {
          if (Event::handle('StartShowStyles', array($this))) {
              if (Event::handle('StartShowLaconicaStyles', array($this))) {
-                 $this->element('link', array('rel' => 'stylesheet',
-                                              'type' => 'text/css',
-                                              'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION,
-                                              'media' => 'screen, projection, tv'));
                  $this->element('link', array('rel' => 'stylesheet',
                                               'type' => 'text/css',
                                               'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
@@@ -265,19 -260,6 +261,19 @@@
          }
      }
  
 +    /**
 +     * 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
       *
@@@ -1056,36 -1038,4 +1052,36 @@@
      {
          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')));
 +        }
 +    }
  }