menu on home and profile

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index df8ae724199d16a3d6a20d50c6dc1467b3c4bf77..def3a57506f9037c4d85fea46bd23ae15cb6f2ab 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -169,22 +169,30 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $notice=NULL
                                                                ($config['site']['logo']) : theme_path('logo.png'),
                                                                'alt' => $config['site']['name'],
                                                                'id' => 'logo'));
+       common_element_end('a');
        if (common_logged_in()) {
                common_notice_form();
        }
        common_element_end('div');
        common_element_start('div', array('id' => 'content'));
-       if (common_logged_in()) {
-               common_views_menu();
-       }
 }
 
 function common_show_footer() {
        global $xw, $config;
        common_element_end('div'); # content div
        common_foot_menu();
-       common_element_start('div', 'footer');
-       common_license_block();
+       common_element_start('div', array('id' => 'footer'));
+       common_element('img', array('id' => 'cc',
+                                                               'src' => $config['license']['image'],
+                                                               'alt' => $config['license']['title']));
+       common_element_start('p');
+       common_text(_t('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
+       common_element('a', array('class' => 'license',
+                                                         'rel' => 'license',
+                                                         href => $config['license']['url']),
+                                  $config['license']['title']);
+       common_text(_t('. Contributors should be attributed by full name or nickname.'));
+       common_element_end('p');
        common_element_end('div');
        common_element_end('div');
        common_element_end('body');
@@ -202,29 +210,16 @@ function common_raw($xml) {
        $xw->writeRaw($xml);
 }
 
-function common_license_block() {
-       global $config, $xw;
-       common_element_start('p', 'license');
-       common_element_start('a', array('class' => 'license',
-                                                                       'rel' => 'license',
-                                                                       href => $config['license']['url']));
-       common_element('img', array('class' => 'license',
-                                                               'src' => $config['license']['image'],
-                                                               'alt' => $config['license']['title']));
-       common_element_end('a');
-       common_text(_t('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
-       common_element('a', array('class' => 'license',
-                                                         'rel' => 'license',
-                                                         href => $config['license']['url']),
-                                  $config['license']['title']);
-       common_text(_t('. Contributors should be attributed by full name or nickname.'));
-       common_element_end('p');
-}
-
 function common_nav_menu() {
        $user = common_current_user();
        common_element_start('ul', array('id' => 'nav'));
+       if ($user) {
+               common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
+                                                _t('Home'));
+       }
        common_menu_item(common_local_url('public'), _t('Public'));
+       common_menu_item(common_local_url('doc', array('title' => 'help')),
+                                        _t('Help'));
        if ($user) {
                common_menu_item(common_local_url('profilesettings'),
                                                 _t('Settings'));
@@ -237,21 +232,10 @@ function common_nav_menu() {
        common_element_end('ul');
 }
 
-function common_views_menu() {
-       common_menu_item(common_local_url('all', array('nickname' =>
-                                                                                                  $user->nickname)),
-                                        _t('Home'));
-       common_menu_item(common_local_url('showstream', array('nickname' =>
-                                                                                                                 $user->nickname)),
-                                        _t('Profile'),  $user->fullname || $user->nickname);
-}
-
 function common_foot_menu() {
        common_element_start('ul', array('id' => 'nav_sub'));
        common_menu_item(common_local_url('doc', array('title' => 'about')),
                                         _t('About'));
-       common_menu_item(common_local_url('doc', array('title' => 'help')),
-                                        _t('Help'));
        common_menu_item(common_local_url('doc', array('title' => 'privacy')),
                                         _t('Privacy'));
        common_menu_item(common_local_url('doc', array('title' => 'source')),
@@ -259,12 +243,16 @@ function common_foot_menu() {
        common_element_end('ul');
 }
 
-function common_menu_item($url, $text, $title=NULL) {
+function common_menu_item($url, $text, $title=NULL, $is_selected) {
+       $lattrs = array();
+       if ($is_selected) {
+               $lattrs['class'] = 'current';
+       }
+       common_element_start('li', $lattrs);
        $attrs['href'] = $url;
        if ($title) {
                $attrs['title'] = $title;
        }
-       common_element_start('li', 'menuitem');
        common_element('a', $attrs, $text);
        common_element_end('li');
 }
@@ -302,14 +290,10 @@ function common_password($id, $label) {
 function common_submit($id, $label) {
        global $xw;
        common_element_start('p');
-       common_element_start('label', array('for' => $id));
-       $xw->writeRaw(' ');
-       common_element_end('label');
        common_element('input', array('type' => 'submit',
                                                                  'id' => $id,
                                                                  'name' => $id,
-                                                                 'value' => $label,
-                                                                 'class' => 'button'));
+                                                                 'value' => $label));
        common_element_end('p');
 }
 
@@ -319,8 +303,7 @@ function common_textarea($id, $label, $content=NULL) {
        common_element('textarea', array('rows' => 3,
                                                                         'cols' => 40,
                                                                         'name' => $id,
-                                                                        'id' => $id,
-                                                                        'class' => 'width50'),
+                                                                        'id' => $id),
                                   ($content) ? $content : ' ');
        common_element_end('p');
 }
@@ -390,7 +373,7 @@ function common_current_user() {
 # get canonical version of nickname for comparison
 function common_canonical_nickname($nickname) {
        # XXX: UTF-8 canonicalization (like combining chars)
-       return $nickname;
+       return strtolower($nickname);
 }
 
 # get canonical version of email for comparison
@@ -588,13 +571,17 @@ function common_notice_form() {
        common_element_start('form', array('id' => 'status_form',
                                                                           'method' => 'POST',
                                                                           'action' => common_local_url('newnotice')));
+       common_element_start('p');
        common_element('label', array('for' => 'status_update',
                                                                  'id' => 'status_label'),
                                   _t('What\'s up, ').$user->nickname.'?');
-       common_element('textarea', 'status_textarea');
+       common_element('textarea', array('id' => 'status_textarea',
+                                                                        'name' => 'status_textarea'));
        common_element('input', array('id' => 'status_submit',
+                                                                 'name' => 'status_submit',
                                                                  'type' => 'submit',
                                                                  'value' => _t('Send')));
+       common_element_end('p');
        common_element_end('form');
 }