move instructions to top in openid pages

[quix0rs-gnu-social.git] / actions / public.php

diff --git a/actions/public.php b/actions/public.php
index 270c082ba360cb279afb0752ef43f9fc50e47ed9..5d06c3c2951a887fe11d7c5c8df0fdf26fd43139 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -28,7 +28,11 @@ class PublicAction extends StreamAction {
 
                $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-               common_show_header(_t('Public timeline'), array($this, 'show_header'));
+               header('X-XRDS-Location: '. common_local_url('publicxrds'));
+               
+               common_show_header(_t('Public timeline'), 
+                                                  array($this, 'show_header'), NULL,  
+                                                  array($this, 'show_top'));
 
                # XXX: Public sidebar here?
 
@@ -37,11 +41,20 @@ class PublicAction extends StreamAction {
                common_show_footer();
        }
 
+       function show_top() {
+               if (common_logged_in()) {
+                       common_notice_form();
+               }
+       }
+       
        function show_header() {
                common_element('link', array('rel' => 'alternate',
                                                                         'href' => common_local_url('publicrss'),
                                                                         'type' => 'application/rss+xml',
                                                                         'title' => _t('Public Stream Feed')));
+               # for client side of OpenID authentication
+               common_element('meta', array('http-equiv' => 'X-XRDS-Location',
+                                                                        'content' => common_local_url('publicxrds')));
        }
        
        function show_notices($page) {