summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-05-19 10:12:19 -0400
committerEvan Prodromou <evan@prodromou.name>2008-05-19 10:12:19 -0400
commit749178f34371aabb8a22166fe64920a42679dcc5 (patch)
tree59779e38ccc73b17decbd01dd279dbf3688a0cc9
parentc87951f89518e276a85f41eaecf34da0720f49c5 (diff)
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
-rw-r--r--actions/all.php1
-rw-r--r--actions/newnotice.php2
-rw-r--r--actions/shownotice.php2
-rw-r--r--actions/showstream.php27
-rw-r--r--doc/TODO26
-rw-r--r--index.php5
-rw-r--r--lib/common.php1
7 files changed, 46 insertions, 18 deletions
diff --git a/actions/all.php b/actions/all.php
index 7cd1f5beb..3994e8666 100644
--- 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 fa7badd3d..dd1f71b41 100644
--- 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 b7a96f0ab..ec91f1d4f 100644
--- 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 82a55518d..63ba0d9af 100644
--- 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 293576622..7884fb2e5 100644
--- 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 26a0946f0..35168621b 100644
--- 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 38efe3403..a35db3a9b 100644
--- 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();
}