From 38f3f8bac3e90a359aa66c299a2d92cd8ed6685e Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Thu, 28 Feb 2008 23:55:26 +0000 Subject: [PATCH] ActionItem38: listing "manage friends" in control panel --- app/views/friends/index.rhtml | 8 ++++++++ app/views/profile_editor/index.rhtml | 2 ++ public/images/icons-app/README | 25 +++++++++++++------------ public/images/icons-app/friends.png | Bin 0 -> 3692 bytes public/images/icons-app/friends.svg | 361 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 384 insertions(+), 12 deletions(-) create mode 100644 public/images/icons-app/friends.png create mode 100644 public/images/icons-app/friends.svg diff --git a/app/views/friends/index.rhtml b/app/views/friends/index.rhtml index 2aac4e2..e318703 100644 --- a/app/views/friends/index.rhtml +++ b/app/views/friends/index.rhtml @@ -10,6 +10,14 @@ <% end %> +<% if @friends.empty? %> +

+ + <%= _('You have no friends yet. Go make some.') %> + +

+<% end %> + <% button_bar do %> <%= button(:back, _('Go back'), :controller => 'profile_editor') %> diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml index 85ed8c0..191cd12 100644 --- a/app/views/profile_editor/index.rhtml +++ b/app/views/profile_editor/index.rhtml @@ -19,6 +19,8 @@ <%= file_manager_button(_('Change Password'), 'icons-app/change-password.png', :controller => 'account', :action => 'change_password') if profile.person? %> + <%= file_manager_button(_('Manage friends'), 'icons-app/friends.png', :controller => 'friends', :action => 'index') if profile.person? %> + <%= file_manager_button(_('Manage Members'), 'icons-app/members.png', :controller => 'profile_members') if profile.organization? %> <%= file_manager_button(_('Consumed Products'), 'icons-app/consumed_product.png', :controller => 'consumed_products') %> diff --git a/public/images/icons-app/README b/public/images/icons-app/README index 4127bdf..2ac4f21 100644 --- a/public/images/icons-app/README +++ b/public/images/icons-app/README @@ -15,18 +15,19 @@ links with names more sensible for Noosfero. Source for icons ================ -Icon Source Theme ------------------------------- ------------ -gnome-settings-background.png dlg-neu -gnome-settings-theme.png Nuovo -password.png dlg-neu -abiword_48.png dlg-neu -gnome-other.png Nuovo -user_icon.png dlg-neu -gnome-home.png Nuovo -gtk-yes.png dlg-neu -users.png (locally modified) dlg-neu -stock_todo.png Nuovo +Icon Source Theme +------------------------------ ------------ +gnome-settings-background.png dlg-neu +gnome-settings-theme.png Nuovo +password.png dlg-neu +abiword_48.png dlg-neu +gnome-other.png Nuovo +user_icon.png dlg-neu +gnome-home.png Nuovo +gtk-yes.png dlg-neu +users.png (locally modified) dlg-neu +stock_todo.png Nuovo +friends.png (modified version of users.png) Nuovo Icons rasterization =================== diff --git a/public/images/icons-app/friends.png b/public/images/icons-app/friends.png new file mode 100644 index 0000000..faedfa0 Binary files /dev/null and b/public/images/icons-app/friends.png differ diff --git a/public/images/icons-app/friends.svg b/public/images/icons-app/friends.svg new file mode 100644 index 0000000..df8717f --- /dev/null +++ b/public/images/icons-app/friends.svg @@ -0,0 +1,361 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + -- libgit2 0.21.2