Merge branch '0.7.x' into 0.8.x

diff --combined lib/action.php
index ff75ee855477634ebc373fbbd91e1f5f53a8e58e,2ec9329e052d25d90745a8bae55638e21e17f5b8..3e43ffe3e3ee1427d53c571ee4fb52b639b31aa6
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -124,6 -124,7 +124,7 @@@ class Action extends HTMLOutputter // l
          $this->showShortcutIcon();
          $this->showStylesheets();
          $this->showScripts();
+         $this->showRelationshipLinks();
          $this->showOpenSearch();
          $this->showFeeds();
          $this->showDescription();
@@@ -260,6 -261,19 +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
       *
@@@ -844,12 -858,10 +858,12 @@@
          }
          if ($lm) {
              header('Last-Modified: ' . date(DATE_RFC1123, $lm));
 -            if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
 -                $ims = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']);
 +            if (array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) {
 +                $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
 +                $ims = strtotime($if_modified_since);
                  if ($lm <= $ims) {
 -                    $if_none_match = $_SERVER['HTTP_IF_NONE_MATCH'];
 +                    $if_none_match = (array_key_exists('HTTP_IF_NONE_MATCH', $_SERVER)) ?
 +                      $_SERVER['HTTP_IF_NONE_MATCH'] : null;
                      if (!$if_none_match ||
                          !$etag ||
                          $this->_hasEtag($etag, $if_none_match)) {
@@@ -1040,4 -1052,36 +1054,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')));
+         }
+     }
  }

diff --combined theme/default/css/display.css
index 2f41a9843c836ccdf9185b69f7f74094e05e49e5,69a600cc286303440516d5038f8c59c6df5dd0ee..0c8fae166ff14895d72f022056ddff3bdd92eb6a
--- 1/theme/default/css/display.css
--- 2/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@@ -72,7 -72,6 +72,6 @@@ border-top-color:#D1D9E4
  border-top-color:#97BFD1;
  }
  
- 
  #content .notice p.entry-content a:visited {
  background-color:#fcfcfc;
  }
@@@ -84,7 -83,6 +83,6 @@@ background-color:#fcfffc
  background-color:#CEE1E9;
  }
  
- 
  #notice_text-count {
  color:#333;
  }
@@@ -114,7 -112,6 +112,6 @@@ background-color:rgba(255, 255, 255, 0.
  background-color:rgba(255, 255, 255, 0.7);
  }
  
- 
  .error {
  background-color:#F7E8E8;
  }
@@@ -122,7 -119,6 +119,6 @@@
  background-color:#EFF3DC;
  }
  
- 
  #anon_notice {
  background-color:#97BFD1;
  color:#fff;
@@@ -133,7 -129,6 +129,6 @@@ border-color:#fff
  background-color:#A9BF4F;
  }
  
- 
  #export_data li a {
  background-repeat:no-repeat;
  background-position:0 45%;
@@@ -172,22 -167,20 +167,20 @@@ background-color:#97BFD1
  }
  
  .entity_edit a {
 -background-image:url(../images/icons/twotone/green/edit.gif);
 +background-image:url(../../base/images/icons/twotone/green/edit.gif);
  }
  .entity_send-a-message a {
 -background-image:url(../images/icons/twotone/green/quote.gif);
 +background-image:url(../../base/images/icons/twotone/green/quote.gif);
  }
  .entity_nudge p,
  .form_user_nudge input.submit {
 -background-image:url(../images/icons/twotone/green/mail.gif);
 +background-image:url(../../base/images/icons/twotone/green/mail.gif);
  }
  .form_user_block input.submit,
  .form_user_unblock input.submit {
 -background-image:url(../images/icons/twotone/green/shield.gif);
 +background-image:url(../../base/images/icons/twotone/green/shield.gif);
  }
  
- 
- 
  /* NOTICES */
  .notices li.over {
  background-color:#fcfcfc;
@@@ -198,16 -191,16 +191,16 @@@
  background-color:transparent;
  }
  .notice-options .notice_reply a {
 -background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 +background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
  }
  .notice-options form.form_favor input.submit {
 -background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 +background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
  }
  .notice-options form.form_disfavor input.submit {
 -background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
 +background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
  }
  .notice-options .notice_delete a {
 -background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 +background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
  }
  
  .notices div.entry-content,
@@@ -230,9 -223,8 +223,8 @@@ background-color:#fcfcfc
  }
  /*END: NOTICES */
  
- 
  #new_group a {
 -background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
 +background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
  }
  
  .pagination .nav_prev a,
@@@ -241,10 -233,10 +233,10 @@@ background-repeat:no-repeat
  border-color:#D1D9E4;
  }
  .pagination .nav_prev a {
 -background-image:url(../images/icons/twotone/green/arrow-left.gif);
 +background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
  background-position:10% 45%;
  }
  .pagination .nav_next a {
 -background-image:url(../images/icons/twotone/green/arrow-right.gif);
 +background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
  background-position:90% 45%;
  }

diff --combined theme/identica/css/display.css
index a961188979074bec764bb9747961610398942294,d05578d4395c1794affa3030d44c07f3ffbe8e54..cc19da0f708ecab64658599e1e93c5047ce6def3
--- 1/theme/identica/css/display.css
--- 2/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@@ -72,7 -72,6 +72,6 @@@ border-top-color:#CEE1E9
  border-top-color:#87B4C8;
  }
  
- 
  #content .notice p.entry-content a:visited {
  background-color:#fcfcfc;
  }
@@@ -84,7 -83,6 +83,6 @@@ background-color:#fcfffc
  background-color:#CEE1E9;
  }
  
- 
  #notice_text-count {
  color:#333;
  }
@@@ -114,7 -112,6 +112,6 @@@ background-color:rgba(135, 180, 200, 0.
  background-color:rgba(255, 255, 255, 0.7);
  }
  
- 
  .error {
  background-color:#F7E8E8;
  }
@@@ -122,7 -119,6 +119,6 @@@
  background-color:#EFF3DC;
  }
  
- 
  #anon_notice {
  background-color:#87B4C8;
  color:#fff;
@@@ -133,7 -129,6 +129,6 @@@ border-color:#fff
  background-color:#9BB43E;
  }
  
- 
  #export_data li a {
  background-repeat:no-repeat;
  background-position:0 45%;
@@@ -172,22 -167,20 +167,20 @@@ background-color:#87B4C8
  }
  
  .entity_edit a {
 -background-image:url(../images/icons/twotone/green/edit.gif);
 +background-image:url(../../base/images/icons/twotone/green/edit.gif);
  }
  .entity_send-a-message a {
 -background-image:url(../images/icons/twotone/green/quote.gif);
 +background-image:url(../../base/images/icons/twotone/green/quote.gif);
  }
  .entity_nudge p,
  .form_user_nudge input.submit {
 -background-image:url(../images/icons/twotone/green/mail.gif);
 +background-image:url(../../base/images/icons/twotone/green/mail.gif);
  }
  .form_user_block input.submit,
  .form_user_unblock input.submit {
 -background-image:url(../images/icons/twotone/green/shield.gif);
 +background-image:url(../../base/images/icons/twotone/green/shield.gif);
  }
  
- 
- 
  /* NOTICES */
  .notices li.over {
  background-color:#fcfcfc;
@@@ -198,16 -191,16 +191,16 @@@
  background-color:transparent;
  }
  .notice-options .notice_reply a {
 -background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 +background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
  }
  .notice-options form.form_favor input.submit {
 -background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 +background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
  }
  .notice-options form.form_disfavor input.submit {
 -background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
 +background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
  }
  .notice-options .notice_delete a {
 -background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 +background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
  }
  
  .notices div.entry-content,
@@@ -230,9 -223,8 +223,8 @@@ background-color:#fcfcfc
  }
  /*END: NOTICES */
  
- 
  #new_group a {
 -background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
 +background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
  }
  
  .pagination .nav_prev a,
@@@ -241,10 -233,10 +233,10 @@@ background-repeat:no-repeat
  border-color:#CEE1E9;
  }
  .pagination .nav_prev a {
 -background-image:url(../images/icons/twotone/green/arrow-left.gif);
 +background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
  background-position:10% 45%;
  }
  .pagination .nav_next a {
 -background-image:url(../images/icons/twotone/green/arrow-right.gif);
 +background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
  background-position:90% 45%;
  }