take out home/profile menu for all pages, use same format for settings menu

darcs-hash:20080611015609-84dde-e2789990adb9a166aa76d119b1e941dbf18fbcc9.gz

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 615a5cbae0e86116cc21b1bc73da2c5c85d9f881..5700014beceb163f214e731a3ca40566705c7a1b 100644 (file)
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -50,7 +50,7 @@ class SettingsAction extends Action {
        }
 
        function settings_menu() {
-               common_element_start('ul', 'settingsmenu menuish');
+               common_element_start('ul', array('id' => 'nav_views'));
                common_menu_item(common_local_url('profilesettings'),
                                                 _t('Profile'));
                common_menu_item(common_local_url('avatar'),

diff --git a/lib/util.php b/lib/util.php
index 2326e8bfa8742abb5b91bb78bc96fb7581163b0d..172b7a6b924f7671f2071a51bbb83617866edbb5 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -175,9 +175,6 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $notice=NULL
        }
        common_element_end('div');
        common_element_start('div', array('id' => 'content'));
-       if (common_logged_in()) {
-               common_views_menu();
-       }
 }
 
 function common_show_footer() {
@@ -216,6 +213,10 @@ function common_raw($xml) {
 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'));
@@ -231,7 +232,7 @@ function common_nav_menu() {
        common_element_end('ul');
 }
 
-function common_views_menu() {
+function common_views_menu($selected=NULL) {
        $user = common_current_user();
        common_element_start('ul', array('id' => 'nav_views'));
        common_menu_item(common_local_url('all', array('nickname' =>
@@ -239,7 +240,8 @@ function common_views_menu() {
                                         _t('Home'));
        common_menu_item(common_local_url('showstream', array('nickname' =>
                                                                                                                  $user->nickname)),
-                                        _t('Profile'),  $user->fullname || $user->nickname);
+                                        _t('Profile'),  
+                                        ($user->fullname) ? $user->fullname : $user->nickname);
        common_element_end('ul');
 }
 
@@ -297,14 +299,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');
 }
 
@@ -314,8 +312,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');
 }