Commit 57d930746426e6ce811c6446770481a243a531e0
1 parent
b1ba3e6a
Exists in
master
and in
29 other branches
ActionItem154: using better default images
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1384 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
7 changed files
with
19 additions
and
11 deletions
Show diff stats
app/helpers/application_helper.rb
| ... | ... | @@ -369,19 +369,24 @@ module ApplicationHelper |
| 369 | 369 | # |
| 370 | 370 | # If the profile has no image set yet, then a default image is used. |
| 371 | 371 | def profile_image(profile) |
| 372 | + image_tag(profile_icon(profile)) | |
| 373 | + end | |
| 374 | + | |
| 375 | + def profile_icon(profile) | |
| 372 | 376 | if profile.image |
| 373 | - image_tag(profile.image.public_filename(:thumb)) | |
| 377 | + profile.image.public_filename(:minor) | |
| 374 | 378 | else |
| 375 | 379 | if profile.organization? |
| 376 | 380 | if profile.kind_of?(Community) |
| 377 | - image_tag('community-default.png') | |
| 381 | + 'icons-app/users.png' | |
| 378 | 382 | else |
| 379 | - image_tag('organization-default.png') | |
| 383 | + 'icons-app/gnome-home.png' | |
| 380 | 384 | end |
| 381 | 385 | else |
| 382 | - image_tag('person-default.png') | |
| 386 | + 'icons-app/user_icon.png' | |
| 383 | 387 | end |
| 384 | 388 | end |
| 389 | + | |
| 385 | 390 | end |
| 386 | 391 | |
| 387 | 392 | # displays a link to the profile homepage with its image (as generated by | ... | ... |
app/views/profile_editor/index.rhtml
| ... | ... | @@ -26,16 +26,19 @@ |
| 26 | 26 | <% end %> |
| 27 | 27 | |
| 28 | 28 | <% if @profile.person? %> |
| 29 | - <h2><%= _('My organizations') %></h2> | |
| 29 | + <h2><%= _('My groups') %></h2> | |
| 30 | 30 | |
| 31 | 31 | <% file_manager do %> |
| 32 | 32 | |
| 33 | - <% @profile.enterprise_memberships.each do |em| %> | |
| 34 | - <%= file_manager_button(em.name, em.image ? em.image.public_filename(:minor) : 'icons-app/organization.png', :profile => em.identifier, :controller => 'profile_editor' ) %> | |
| 33 | + <% @profile.memberships.each do |group| %> | |
| 34 | + <%= file_manager_button(group.name, profile_icon(group) , :profile => group.identifier, :controller => 'profile_editor' ) %> | |
| 35 | 35 | <% end %> |
| 36 | 36 | |
| 37 | 37 | <% end %> |
| 38 | 38 | |
| 39 | - <%= button(:add, _('Register a new Enterprise'), :controller => 'enterprise_registration') %> | |
| 39 | + <% button_bar do %> | |
| 40 | + <%= button(:add, _('Register a new Enterprise'), :controller => 'enterprise_registration') %> | |
| 41 | + <%= button(:edit, _('Manage my organizations'), :controller => 'memberships') %> | |
| 42 | + <% end %> | |
| 40 | 43 | |
| 41 | 44 | <% end %> | ... | ... |
public/images/icons-app/README
3.36 KB
public/images/icons-app/temp-home.png
2.43 KB
4.48 KB
public/stylesheets/blocks/profile-list-block.css