better headers

Added H1 headers to all pages. Added H2 headers to sections of pages,
where appropriate.

Moved a lot of TODOs around.

Made the public stream the default if no action is specified.

darcs-hash:20080519141219-84dde-f9917a8351596060faa7ff5d231417773764a8fd.gz

diff --git a/actions/all.php b/actions/all.php
index 7cd1f5beba9a9146c23eb62f0986c42de0e87447..3994e8666724daa51400af682b65f1c26be4ed0e 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -43,6 +43,7 @@ class AllAction extends ShowstreamAction {
                $notice->find();
                
                common_element_start('div', 'notices');
+               common_element('h2', 'notices', _t('Notices'));
 
                while ($notice->fetch()) {
                        $this->show_notice($notice);

diff --git a/actions/newnotice.php b/actions/newnotice.php
index fa7badd3def07fb7906b2061c7ebd1af34e92136..dd1f71b41082ef1ee41e860323a4e9aeb57d04d6 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -53,6 +53,7 @@ class NewnoticeAction extends Action {
        }
        
        function show_form() {
+               common_show_header(_t('New notice'));
                common_element_start('form', array('id' => 'newnotice', 'method' => 'POST',
                                                                                   'action' => common_local_url('newnotice')));
                common_element('span', 'nickname', $profile->nickname);
@@ -61,5 +62,6 @@ class NewnoticeAction extends Action {
                                                                                 'id' => 'content'));
                common_element('input', array('type' => 'submit', 'value' => 'Send'));
                common_element_end('form');
+               common_show_footer();
        }
 }
\ No newline at end of file

diff --git a/actions/shownotice.php b/actions/shownotice.php
index b7a96f0ab0895b5af9087e399c35e7c7f2de022b..ec91f1d4fa2c70fc01c63a36154e4d2b4855e3e7 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -36,7 +36,7 @@ class ShownoticeAction extends Action {
                
                # Looks like we're good; show the header
        
-               common_show_header($profile->nickname);
+               common_show_header($profile->nickname." status on ".$notice->created);
        
                $this->show_notice($notice);
        

diff --git a/actions/showstream.php b/actions/showstream.php
index 82a55518da60fdfafca3b770d25847d853a45757..63ba0d9af0210b40cb093b602890ff97991d9f48 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -92,6 +92,9 @@ class ShowstreamAction extends StreamAction {
 
        function show_profile($profile) {
                common_element_start('div', 'profile');
+               
+               common_element('h2', 'nickname', $profile->nickname);
+               
                $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
                if ($avatar) {
                        common_element('img', array('src' => $avatar->url,
@@ -100,7 +103,6 @@ class ShowstreamAction extends StreamAction {
                                                                                'height' => AVATAR_PROFILE_SIZE,
                                                                                'title' => $profile->nickname));
                }
-               common_element('span', 'nickname', $profile->nickname);
                if ($profile->fullname) {
                        if ($profile->homepage) {
                                common_element('a', array('href' => $profile->homepage,
@@ -136,7 +138,7 @@ class ShowstreamAction extends StreamAction {
                                                                          'name' => 'unsubscribeto',
                                                                          'type' => 'hidden',
                                                                          'value' => $profile->nickname));
-               common_element('input', array('type' => 'submit'), _t('unsubscribe'));
+               common_element('input', array('type' => 'submit'), _t('Unsubscribe'));
                common_element_end('form');
        }
 
@@ -147,6 +149,8 @@ class ShowstreamAction extends StreamAction {
 
                common_element_start('div', 'subscriptions');
 
+               common_element('h2', 'subscriptions', _t('Subscriptions'));
+               
                $cnt = 0;
 
                if ($subs) {
@@ -212,6 +216,9 @@ class ShowstreamAction extends StreamAction {
                        $notice_count = 0;
                }
 
+               common_element_start('div', 'statistics');
+               common_element('h2', 'statistics', _t('Statistics'));
+               
                # Other stats...?
                common_element_start('dl', 'statistics');
                common_element('dt', _t('Subscriptions'));
@@ -221,6 +228,8 @@ class ShowstreamAction extends StreamAction {
                common_element('dt', _t('Notices'));
                common_element('dd', $notice_count);
                common_element_end('dl');
+               
+               common_element_end('div');
        }
 
        function show_notices($profile) {
@@ -237,7 +246,8 @@ class ShowstreamAction extends StreamAction {
                $notice->find();
 
                common_element_start('div', 'notices');
-
+               common_element('h2', 'notices', _t('Notices'));
+               
                while ($notice->fetch()) {
                        $this->show_notice($notice);
                }
@@ -246,18 +256,23 @@ class ShowstreamAction extends StreamAction {
        }
 
        function show_last_notice($profile) {
+               
+               common_element_start('div', 'lastnotice');
+               common_element('h2', 'lastnotice', _t('Currently'));
+
                $notice = DB_DataObject::factory('notice');
                $notice->profile_id = $profile->id;
                $notice->orderBy('created DESC');
                $notice->limit(0, 1);
-               $notice->find();
-
-               while ($notice->fetch()) {
+               
+               if ($notice->find(true)) {
                        # FIXME: URL, image, video, audio
                        common_element('span', array('class' => 'content'),
                                                   $notice->content);
                        common_element('span', array('class' => 'date'),
                                                   common_date_string($notice->created));
                }
+               
+               common_element_end('div');
        }
 }

diff --git a/doc/TODO b/doc/TODO
index 293576622d1ef8cf7bc39f0514da7eb9dd47ed25..7884fb2e59d0872ed21de5afb070de5dd66150e6 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -25,8 +25,11 @@
 + common_redirect()
 + configuration system ($config)
 + release 0.1
+- design from Open Source Web Designs
++ add H1 to each page
++ add H2 for each page section
 - doc action
-- default to public stream
++ default to public stream
 - default avatar
 - default HTML type
 - set Content-Type
@@ -44,23 +47,17 @@
 - FOAF dump for user
 - license on showstream
 - license on shownotice
-- design from Open Source Web Designs
 - TOS checkbox on register
 - pretty URLs
-- XML sitemap generation
 - site logo
+- instructions
+- release 0.2
+- set Last-Modified
+- XML sitemap generation
 - theme per site
 - theme per profile
 - email confirmation for registration
 - change cookie handling for anon users to be more cache-friendly
-- release 0.2
-- content negotiation for interface language
-- content negotiation for content type
-- content negotiation for encoding
-- content negotiation for charset
-- If-Modified-Since support
-- Vary
-- delete a notice
 - gettext
 - subscribe remote
 - add subscriber remote
@@ -74,6 +71,13 @@
 - RDFa for subscriber pages
 - RDFa for subscribed pages
 - plugins and hooks
+- content negotiation for interface language
+- content negotiation for content type
+- content negotiation for encoding
+- content negotiation for charset
+- If-Modified-Since support
+- Vary
+- delete a notice
 - release 0.3
 - @ messages
 - # tags

diff --git a/index.php b/index.php
index 26a0946f06301ab61fbd0da957439782765a2cc0..35168621b90515365e25be1df38e53f8c1507a8b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -23,6 +23,11 @@ define('LACONICA', true);
 require_once(INSTALLDIR . "/lib/common.php");
 
 $action = $_REQUEST['action'];
+
+if (!$action) {
+       common_redirect(common_local_url('public'));
+}
+
 $actionfile = INSTALLDIR."/actions/$action.php";
 
 if (file_exists($actionfile)) {

diff --git a/lib/common.php b/lib/common.php
index 38efe34033d36347726b7e0a257843c3c1a1cb74..a35db3a9b2c15400bff663c3bf2e284d76cbce7c 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -114,6 +114,7 @@ function common_show_header($pagetitle) {
                                   $pagetitle . " - " . $config['site']['name']);
        common_element_end('head');
        common_element_start('body');
+       common_element('h1', 'title', $pagetitle);
        common_head_menu();
 }