ActionItem154: using better default images

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1384 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem154: using better default images
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1384 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent b1ba3e6a
Showing 7 changed files with 19 additions and 11 deletions Show diff stats
app/helpers/application_helper.rb
app/views/profile_editor/index.rhtml
public/images/icons-app/README
public/images/icons-app/gnome-home.png
public/images/icons-app/temp-home.png
public/images/icons-app/users.png
public/stylesheets/blocks/profile-list-block.css
@@ -369,19 +369,24 @@ module ApplicationHelper
   #
   # If the profile has no image set yet, then a default image is used.
   def profile_image(profile)
+    image_tag(profile_icon(profile))
+  end
+
+  def profile_icon(profile)
     if profile.image
-      image_tag(profile.image.public_filename(:thumb))
+      profile.image.public_filename(:minor)
     else
       if profile.organization?
         if profile.kind_of?(Community)
-          image_tag('community-default.png')
+          'icons-app/users.png'
         else
-          image_tag('organization-default.png')
+          'icons-app/gnome-home.png'
         end
       else
-        image_tag('person-default.png')
+        'icons-app/user_icon.png'
       end
     end
+
   end
  
   # displays a link to the profile homepage with its image (as generated by
@@ -26,16 +26,19 @@
 <% end %>
  
 <% if @profile.person? %>
-  <h2><%= _('My organizations') %></h2>
+  <h2><%= _('My groups') %></h2>
  
   <% file_manager do %>
  
-    <% @profile.enterprise_memberships.each do |em| %>
-      <%= file_manager_button(em.name, em.image ? em.image.public_filename(:minor) : 'icons-app/organization.png', :profile => em.identifier, :controller => 'profile_editor' ) %>
+    <% @profile.memberships.each do |group| %>
+      <%= file_manager_button(group.name, profile_icon(group) , :profile => group.identifier, :controller => 'profile_editor' ) %>
     <% end %>
  
   <% end %>
  
-  <%= button(:add, _('Register a new Enterprise'), :controller => 'enterprise_registration') %>
+  <% button_bar do %>
+    <%= button(:add, _('Register a new Enterprise'), :controller => 'enterprise_registration') %>
+    <%= button(:edit, _('Manage my organizations'), :controller => 'memberships') %>
+  <% end %>
  
 <% end %>
@@ -23,8 +23,9 @@ password.png                   dlg-neu
 abiword_48.png                 dlg-neu
 gnome-other.png                Nuovo
 user_icon.png                  dlg-neu
-temp-home.png                  Nuovo
+gnome-home.png                 Nuovo
 gtk-yes.png                    dlg-neu
+users.png                      dlg-neu
  
 Icons rasterization
 ===================
@@ -3,11 +3,10 @@ div.profile-list-block div {
   float: left;
  
   width: 100px;
-  height: 140px;
+  height: 120px;
   overflow: hidden;
  
   font-size: smaller;
   text-align: center;
  
-
 }
...	...	@@ -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
...	...
...	...	@@ -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 %>
...	...
...	...	@@ -23,8 +23,9 @@ password.png dlg-neu
23	23	abiword_48.png dlg-neu
24	24	gnome-other.png Nuovo
25	25	user_icon.png dlg-neu
26		-temp-home.png Nuovo
	26	+gnome-home.png Nuovo
27	27	gtk-yes.png dlg-neu
	28	+users.png dlg-neu
28	29
29	30	Icons rasterization
30	31	===================
...	...
...	...	@@ -3,11 +3,10 @@ div.profile-list-block div {
3	3	float: left;
4	4
5	5	width: 100px;
6		- height: 140px;
	6	+ height: 120px;
7	7	overflow: hidden;
8	8
9	9	font-size: smaller;
10	10	text-align: center;
11	11
12		-
13	12	}
...	...