From 189349bd891ecc0a8b2e633a3f360543fbee4045 Mon Sep 17 00:00:00 2001 From: "Duck (Jakob Munih)" Date: Wed, 25 Feb 2009 12:16:55 +0100 Subject: [PATCH] better UI --- folks/edit/friends/add.php | 4 +- folks/edit/friends/blacklist.php | 3 +- folks/edit/friends/for.php | 2 + folks/edit/friends/friends.php | 2 + folks/edit/friends/from.php | 2 + folks/edit/friends/index.php | 2 + folks/edit/friends/invite.php | 2 + folks/edit/friends/know.php | 2 + folks/edit/friends/of.php | 2 + folks/friends.php | 12 +----- folks/templates/edit/add.php | 2 - folks/templates/edit/friends.php | 2 - folks/templates/edit/invite.php | 2 - folks/templates/edit/tabs.php | 37 ----------------- folks/templates/friends/friends.php | 82 +++++++------------------------------ 15 files changed, 35 insertions(+), 123 deletions(-) delete mode 100644 folks/templates/edit/tabs.php diff --git a/folks/edit/friends/add.php b/folks/edit/friends/add.php index f90b3860d..7978c8e8a 100644 --- a/folks/edit/friends/add.php +++ b/folks/edit/friends/add.php @@ -66,7 +66,9 @@ Horde::addScriptFile('tables.js', 'horde', true); require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; -echo $tabs->render('blacklist'); +echo $tabs->render('add'); +require FOLKS_TEMPLATES . '/edit/header.php'; require FOLKS_TEMPLATES . '/edit/add.php'; +require FOLKS_TEMPLATES . '/edit/footer.php'; require $registry->get('templates', 'horde') . '/common-footer.inc'; \ No newline at end of file diff --git a/folks/edit/friends/blacklist.php b/folks/edit/friends/blacklist.php index eaaffebd4..a282bd9de 100644 --- a/folks/edit/friends/blacklist.php +++ b/folks/edit/friends/blacklist.php @@ -82,8 +82,9 @@ require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; echo $tabs->render('blacklist'); +require FOLKS_TEMPLATES . '/edit/header.php'; require FOLKS_TEMPLATES . '/edit/friends.php'; - $friend_form->renderActive(); +require FOLKS_TEMPLATES . '/edit/footer.php'; require $registry->get('templates', 'horde') . '/common-footer.inc'; \ No newline at end of file diff --git a/folks/edit/friends/for.php b/folks/edit/friends/for.php index 5ea034d02..12fe7b94f 100644 --- a/folks/edit/friends/for.php +++ b/folks/edit/friends/for.php @@ -52,6 +52,8 @@ require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; echo $tabs->render('friendsof'); +require FOLKS_TEMPLATES . '/edit/header.php'; require FOLKS_TEMPLATES . '/edit/friends.php'; +require FOLKS_TEMPLATES . '/edit/footer.php'; require $registry->get('templates', 'horde') . '/common-footer.inc'; \ No newline at end of file diff --git a/folks/edit/friends/friends.php b/folks/edit/friends/friends.php index 3fb489268..08d79f10e 100644 --- a/folks/edit/friends/friends.php +++ b/folks/edit/friends/friends.php @@ -49,6 +49,8 @@ require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; echo $tabs->render('friends'); +require FOLKS_TEMPLATES . '/edit/header.php'; require FOLKS_TEMPLATES . '/edit/friends.php'; +require FOLKS_TEMPLATES . '/edit/footer.php'; require $registry->get('templates', 'horde') . '/common-footer.inc'; \ No newline at end of file diff --git a/folks/edit/friends/from.php b/folks/edit/friends/from.php index e8ac38db0..904ffc9f4 100644 --- a/folks/edit/friends/from.php +++ b/folks/edit/friends/from.php @@ -44,6 +44,8 @@ require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; echo $tabs->render('friendsof'); +require FOLKS_TEMPLATES . '/edit/header.php'; require FOLKS_TEMPLATES . '/edit/friends.php'; +require FOLKS_TEMPLATES . '/edit/footer.php'; require $registry->get('templates', 'horde') . '/common-footer.inc'; \ No newline at end of file diff --git a/folks/edit/friends/index.php b/folks/edit/friends/index.php index 4abbb6a77..9a5e2b8e1 100644 --- a/folks/edit/friends/index.php +++ b/folks/edit/friends/index.php @@ -48,6 +48,8 @@ require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; echo $tabs->render('friends'); +require FOLKS_TEMPLATES . '/edit/header.php'; require FOLKS_TEMPLATES . '/edit/friends.php'; +require FOLKS_TEMPLATES . '/edit/footer.php'; require $registry->get('templates', 'horde') . '/common-footer.inc'; \ No newline at end of file diff --git a/folks/edit/friends/invite.php b/folks/edit/friends/invite.php index 9a291f39b..c0ea69e3a 100644 --- a/folks/edit/friends/invite.php +++ b/folks/edit/friends/invite.php @@ -58,6 +58,8 @@ require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; echo $tabs->render('friends'); +require FOLKS_TEMPLATES . '/edit/header.php'; require FOLKS_TEMPLATES . '/edit/invite.php'; +require FOLKS_TEMPLATES . '/edit/footer.php'; require $registry->get('templates', 'horde') . '/common-footer.inc'; \ No newline at end of file diff --git a/folks/edit/friends/know.php b/folks/edit/friends/know.php index 78d2de626..73805d54b 100644 --- a/folks/edit/friends/know.php +++ b/folks/edit/friends/know.php @@ -48,6 +48,8 @@ require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; echo $tabs->render('friends'); +require FOLKS_TEMPLATES . '/edit/header.php'; require FOLKS_TEMPLATES . '/edit/friends.php'; +require FOLKS_TEMPLATES . '/edit/footer.php'; require $registry->get('templates', 'horde') . '/common-footer.inc'; \ No newline at end of file diff --git a/folks/edit/friends/of.php b/folks/edit/friends/of.php index 6fa4cd32c..dcd5508b2 100644 --- a/folks/edit/friends/of.php +++ b/folks/edit/friends/of.php @@ -44,6 +44,8 @@ require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; echo $tabs->render('friendsof'); +require FOLKS_TEMPLATES . '/edit/header.php'; require FOLKS_TEMPLATES . '/edit/friends.php'; +require FOLKS_TEMPLATES . '/edit/footer.php'; require $registry->get('templates', 'horde') . '/common-footer.inc'; \ No newline at end of file diff --git a/folks/friends.php b/folks/friends.php index c7d6ade7c..5dd8be0e0 100644 --- a/folks/friends.php +++ b/folks/friends.php @@ -53,12 +53,11 @@ foreach ($friend_list as $user) { continue; } foreach ($activities as $activity) { - $firendActivities[$activity['activity_date']] = array('message' => $activity['activity_message'], - 'scope' => $activity['activity_scope'], - 'user' => $user); + $firendActivities[$activity['activity_date']] = $activity; } } krsort($firendActivities); +$firendActivities = array_slice($firendActivities, 0, 30); // Own activities $activities = $folks_driver->getActivity(Auth::getAuth()); @@ -68,13 +67,6 @@ if ($activities instanceof PEAR_Error) { exit; } -// Users online -$online = $folks_driver->getOnlineUsers(); -if ($online instanceof PEAR_Error) { - $notification->push($online); - $online = array(); -} - Horde::addScriptFile('stripe.js', 'horde', true); require FOLKS_TEMPLATES . '/common-header.inc'; diff --git a/folks/templates/edit/add.php b/folks/templates/edit/add.php index d2de40fb9..15f18ec68 100644 --- a/folks/templates/edit/add.php +++ b/folks/templates/edit/add.php @@ -1,3 +1 @@ - - renderActive(null, null, null, 'post')?> \ No newline at end of file diff --git a/folks/templates/edit/friends.php b/folks/templates/edit/friends.php index 0dee0a710..a296d3473 100644 --- a/folks/templates/edit/friends.php +++ b/folks/templates/edit/friends.php @@ -1,5 +1,3 @@ - -

- renderActive(null, null, null, 'post')?> \ No newline at end of file diff --git a/folks/templates/edit/tabs.php b/folks/templates/edit/tabs.php deleted file mode 100644 index 1f1675309..000000000 --- a/folks/templates/edit/tabs.php +++ /dev/null @@ -1,37 +0,0 @@ -

-
-
- -getOnlineUsers(); -if ($online instanceof PEAR_Error) { - return $online; -} - -// Get groups -$groups = $friends->getGroups(); -if ($groups instanceof PEAR_Error) { - $notification->push($groups); - $groups = array(); -} - -$vars = Variables::getDefaultVariables(); -$ftabs = new Horde_UI_Tabs('ftab', $vars); - -$ftabs->addTab(_("Add"), Horde::applicationUrl('edit/friends/add.php'), 'add'); -$ftabs->addTab(_("All"), Horde::applicationUrl('edit/friends/index.php'), 'all'); -$ftabs->addTab(_("Invite"), Horde::applicationUrl('edit/friends/invite.php'), 'invite'); - -foreach ($groups as $group_id => $group_name) { - $ftabs->addTab($group_name, Horde::applicationUrl('edit/friends/friends.php'), $group_id); -} - -$ftabs->addTab(_("Might know"), Horde::applicationUrl('edit/friends/know.php'), 'know'); -$ftabs->addTab(_("Wainting for"), Horde::applicationUrl('edit/friends/for.php'), 'for'); -$ftabs->addTab(_("Wainting from"), Horde::applicationUrl('edit/friends/from.php'), 'from'); -$ftabs->addTab(_("I am friend of"), Horde::applicationUrl('edit/friends/of.php'), 'of'); -$ftabs->addTab(_("Blacklist"), Horde::applicationUrl('edit/friends/blacklist.php'), 'blacklist'); - -echo $ftabs->render(); diff --git a/folks/templates/friends/friends.php b/folks/templates/friends/friends.php index 284abdbd1..cf96daf0b 100644 --- a/folks/templates/friends/friends.php +++ b/folks/templates/friends/friends.php @@ -8,80 +8,14 @@

- - - - - - - - $activity) { - echo '' - . '' - . ' '; -} +$list = $firendActivities; +require FOLKS_TEMPLATES . '/block/activities.php'; ?> -
' - . ' ' - . $activity['user'] . '' . $activity['message'] . '
' . - '' . Folks::format_datetime($activity_date) . '' - . '
- -
-
- -

- - -

- - - - - - - - - - - - - - - -
- - get('name', $activity['activity_scope']) ?> - -
- -
- -

- Horde::applicationUrl('user.php'), - 'id' => 'user', - 'name' => _("View profile"))); -if ($registry->hasInterface('letter')) { - $actions[] = array('url' => $registry->callByPackage('letter', 'compose', ''), - 'id' => 'user_to', - 'name' => _("Send message")); -} -$list = array_intersect($friend_list, array_flip($online)); -require FOLKS_TEMPLATES . '/block/users.php'; -?> - -
-
-

+
+
+ +

+ + +

+ + -- 2.11.0