ActionItem1044: better profile page

Antonio Terceiro
1 parent e8085d8d
Showing 6 changed files with 114 additions and 43 deletions Show diff stats
app/helpers/profile_helper.rb
app/helpers/tags_helper.rb
app/views/profile/_organization.rhtml
app/views/profile/_person.rhtml
app/views/profile/index.rhtml
public/stylesheets/common.css
 module ProfileHelper
+  def display_field(title, object, field)
+    value = object.send(field)
+    if !value.blank?
+      if block_given?
+        value = yield(value)
+      end
+      content_tag('tr', content_tag('td', title, :class => 'field-name') + content_tag('td', value))
+    else
+      ''
+    end
+  end
+
 end
@@ -30,10 +30,10 @@ module TagsHelper
   def tag_cloud(tags, tagname_option, url, options = {})
-    return _('No tags yet.') + '<br/>' +
-           '<a href="' + _('http://en.wikipedia.org/wiki/Tag_%28metadata%29') +
-           '" class="button with-text icon-help" target="wptags"><span>' +
-           _('What are tags?') + '</span></a>' if tags.empty?
+    return content_tag('em', _('No tags yet.')) +
+           ' <a href="' + _('http://en.wikipedia.org/wiki/Tag_%28metadata%29') +
+           '" target="wptags"><span>(' +
+           _('What are tags?') + ')</span></a>' if tags.empty?
     max_size = options[:max_size] || Cloud::MAX_SIZE
     min_size = options[:min_size] || Cloud::MIN_SIZE
@@ -0,0 +1,16 @@
+<tr>
+  <th colspan='2'><%= _('Basic information')%></th>
+</tr>
+<%= display_field(_('Name:'), profile, :name) { |name| link_to name, profile.url  } %>
+<tr>
+  <td colspan='2'>
+    <%= link_to _('Members'), :action => 'members' %></li>
+  </td>
+</tr>
+<% if profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises') %>
+  <tr>
+    <td colspan='2'>
+      <%= link_to _('Products/Services'), :controller => 'catalog', :action => 'index' %>
+    </td>
+  </tr>
+<% end %>
@@ -0,0 +1,38 @@
+<tr>
+  <th colspan='2'><%= _('Basic information')%></th>
+</tr>
+<%= display_field(_('Name:'), profile, :name) { |name| link_to name, profile.url  } %>
+<%= display_field(_('Gender:'), profile, :sex) { |gender| { 'male' => _('Male'), 'female' => _('Female') }[gender] } %>
+<%= display_field(_('Date of birth:'), profile, :birth_date) { |date| show_date(date)  }%>
+
+<tr>
+  <th colspan='2'><%= _('Contact')%></th>
+</tr>
+<% if profile == user || profile.friends.include?(user) %>
+  <%= display_field(_('Address:'), profile, :address) %>
+  <%= display_field(_('ZIP code:'), profile, :zip_code) %>
+  <%= display_field(_('Contact phone:'), profile, :contact_phone) %>
+  <%= display_field(_('e-Mail:'), profile, :email) { |email| link_to email, 'mailto:'+email } %>
+<% end %>
+<%= display_field(_('Location:'), profile, :location) %>
+
+<tr>
+  <th colspan='2'><%= _('Work')%></th>
+</tr>
+<%= display_field(_('Organization:'), profile, :organization) %>
+<%= display_field(_('Organization website:'), profile, :organization_website) { |url| link_to(url, url) }%>
+</tr>
+
+<tr>
+  <th colspan='2'><%= _('Network')%></th>
+</tr>
+<tr>
+  <td colspan='2'>
+    <%= link_to __('Friends'), :action => 'friends' %>
+    &mdash; <%= link_to __('Communities'), :action => 'communities' %>
+    <% if !environment.enabled?('disable_asset_enterprises') %>
+      &mdash; <%= link_to __('Enterprises'), :action => 'enterprises' %>
+    <% end %>
+  </td>
+</tr>
+
@@ -4,43 +4,29 @@
   </div>
 <% end %>
-<h2><%= _("%s's profile") % profile.identifier %></h2>
+<h1><%= _("%s's profile") % profile.identifier %></h1>
-<ul>
-  <li>
-    <strong><%= _('Name:') %></strong>
-    <%= profile.name %>
-  </li>
-  <li>
-    <strong><%= _('Homepage:') %></strong>
-    <%= link_to url_for(profile.url), profile.url %>
-  </li>
-
-  <%# FIXME %>
-  <% if profile.kind_of? Person %>
-    <% if profile.friends.include?(user) %>
-    <li>
-      <strong><%= _('e-Mail:') %></strong>
-      <%= content_tag 'a', profile.email, :href => 'mailto:'+profile.email %>
-    </li>
-    <% end %>
-    <li><%= link_to __('Friends'), :action => 'friends' %></li>
-    <li><%= link_to __('Communities'), :action => 'communities' %></li>
-    <li><%= link_to __('Enterprises'), :action => 'enterprises' %></li>
-  <% end %>
-  <% if profile.kind_of? Organization %>
-    <li><%= link_to _('Members'), :action => 'members' %></li>
-  <% end %>
-  <% if profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises') %>
-    <li><%= link_to _('Products/Services'), :controller => 'catalog', :action => 'index' %></li>
-  <% end %>
-
-  <li>
-  <%= link_to _('Site map'), :action => 'sitemap' %>
-  </li>
-
-  <li>
-    <%= _('Tags:') %>
-    <%= tag_cloud @tags, :id, { :action => 'tag' }, :max_size => 18, :min_size => 10%>
-  </li>
-</ul>
+<table class='profile'>
+  <%= render :partial => partial_for_class(profile.class) %>
+  <tr>
+    <th colspan='2'>
+      <%= _('Content') %>
+    </th>
+  </tr>
+  <tr>
+    <td>
+      <%= _('Content published:') %>
+    </td>
+    <td>
+      <%= link_to _('Site map'), :action => 'sitemap' %>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <%= _('Tags:') %>
+    </td>
+    <td>
+      <%= tag_cloud @tags, :id, { :action => 'tag' }, :max_size => 18, :min_size => 10%>
+    </td>
+  </tr>
+</table>
@@ -276,6 +276,25 @@ td .button {
   background-color: transparent;
 }
+td.field-name {
+  color: #888;
+  width: 150px;
+  text-align: left;
+}
+
+table.profile th {
+  border-bottom: 2px solid #eeeeec;
+  padding: 10px 0px 0px 0px;
+}
+table.profile td {
+  border: none;
+  padding-left: 0px;
+}
+table.profile tr:hover td {
+  background: none;
+}
+
+
 /* for fields with auto-completion */
 div.auto-complete {
   display: block;
1	module ProfileHelper	1	module ProfileHelper
2		2
		3	+ def display_field(title, object, field)
		4	+ value = object.send(field)
		5	+ if !value.blank?
		6	+ if block_given?
		7	+ value = yield(value)
		8	+ end
		9	+ content_tag('tr', content_tag('td', title, :class => 'field-name') + content_tag('td', value))
		10	+ else
		11	+ ''
		12	+ end
		13	+ end
		14	+
3	end	15	end
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+<tr>
	2	+ <th colspan='2'><%= _('Basic information')%></th>
	3	+</tr>
	4	+<%= display_field(_('Name:'), profile, :name) { \|name\| link_to name, profile.url } %>
	5	+<tr>
	6	+ <td colspan='2'>
	7	+ <%= link_to _('Members'), :action => 'members' %></li>
	8	+ </td>
	9	+</tr>
	10	+<% if profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises') %>
	11	+ <tr>
	12	+ <td colspan='2'>
	13	+ <%= link_to _('Products/Services'), :controller => 'catalog', :action => 'index' %>
	14	+ </td>
	15	+ </tr>
	16	+<% end %>
@@ -0,0 +1,38 @@		@@ -0,0 +1,38 @@
	1	+<tr>
	2	+ <th colspan='2'><%= _('Basic information')%></th>
	3	+</tr>
	4	+<%= display_field(_('Name:'), profile, :name) { \|name\| link_to name, profile.url } %>
	5	+<%= display_field(_('Gender:'), profile, :sex) { \|gender\| { 'male' => _('Male'), 'female' => _('Female') }[gender] } %>
	6	+<%= display_field(_('Date of birth:'), profile, :birth_date) { \|date\| show_date(date) }%>
	7	+
	8	+<tr>
	9	+ <th colspan='2'><%= _('Contact')%></th>
	10	+</tr>
	11	+<% if profile == user \|\| profile.friends.include?(user) %>
	12	+ <%= display_field(_('Address:'), profile, :address) %>
	13	+ <%= display_field(_('ZIP code:'), profile, :zip_code) %>
	14	+ <%= display_field(_('Contact phone:'), profile, :contact_phone) %>
	15	+ <%= display_field(_('e-Mail:'), profile, :email) { \|email\| link_to email, 'mailto:'+email } %>
	16	+<% end %>
	17	+<%= display_field(_('Location:'), profile, :location) %>
	18	+
	19	+<tr>
	20	+ <th colspan='2'><%= _('Work')%></th>
	21	+</tr>
	22	+<%= display_field(_('Organization:'), profile, :organization) %>
	23	+<%= display_field(_('Organization website:'), profile, :organization_website) { \|url\| link_to(url, url) }%>
	24	+</tr>
	25	+
	26	+<tr>
	27	+ <th colspan='2'><%= _('Network')%></th>
	28	+</tr>
	29	+<tr>
	30	+ <td colspan='2'>
	31	+ <%= link_to __('Friends'), :action => 'friends' %>
	32	+ — <%= link_to __('Communities'), :action => 'communities' %>
	33	+ <% if !environment.enabled?('disable_asset_enterprises') %>
	34	+ — <%= link_to __('Enterprises'), :action => 'enterprises' %>
	35	+ <% end %>
	36	+ </td>
	37	+</tr>
	38	+
	@@ -4,43 +4,29 @@		@@ -4,43 +4,29 @@
4	</div>	4	</div>
5	<% end %>	5	<% end %>
6		6
7	-<h2><%= _("%s's profile") % profile.identifier %></h2>	7	+<h1><%= _("%s's profile") % profile.identifier %></h1>
8		8
9	-<ul>
10	- <li>
11	- <strong><%= _('Name:') %></strong>
12	- <%= profile.name %>
13	- </li>
14	- <li>
15	- <strong><%= _('Homepage:') %></strong>
16	- <%= link_to url_for(profile.url), profile.url %>
17	- </li>
18	-
19	- <%# FIXME %>
20	- <% if profile.kind_of? Person %>
21	- <% if profile.friends.include?(user) %>
22	- <li>
23	- <strong><%= _('e-Mail:') %></strong>
24	- <%= content_tag 'a', profile.email, :href => 'mailto:'+profile.email %>
25	- </li>
26	- <% end %>
27	- <li><%= link_to __('Friends'), :action => 'friends' %></li>
28	- <li><%= link_to __('Communities'), :action => 'communities' %></li>
29	- <li><%= link_to __('Enterprises'), :action => 'enterprises' %></li>
30	- <% end %>
31	- <% if profile.kind_of? Organization %>
32	- <li><%= link_to _('Members'), :action => 'members' %></li>
33	- <% end %>
34	- <% if profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises') %>
35	- <li><%= link_to _('Products/Services'), :controller => 'catalog', :action => 'index' %></li>
36	- <% end %>
37	-
38	- <li>
39	- <%= link_to _('Site map'), :action => 'sitemap' %>
40	- </li>
41	-
42	- <li>
43	- <%= _('Tags:') %>
44	- <%= tag_cloud @tags, :id, { :action => 'tag' }, :max_size => 18, :min_size => 10%>
45	- </li>
46	-</ul>	9	+<table class='profile'>
		10	+ <%= render :partial => partial_for_class(profile.class) %>
		11	+ <tr>
		12	+ <th colspan='2'>
		13	+ <%= _('Content') %>
		14	+ </th>
		15	+ </tr>
		16	+ <tr>
		17	+ <td>
		18	+ <%= _('Content published:') %>
		19	+ </td>
		20	+ <td>
		21	+ <%= link_to _('Site map'), :action => 'sitemap' %>
		22	+ </td>
		23	+ </tr>
		24	+ <tr>
		25	+ <td>
		26	+ <%= _('Tags:') %>
		27	+ </td>
		28	+ <td>
		29	+ <%= tag_cloud @tags, :id, { :action => 'tag' }, :max_size => 18, :min_size => 10%>
		30	+ </td>
		31	+ </tr>
		32	+</table>
	@@ -276,6 +276,25 @@ td .button {		@@ -276,6 +276,25 @@ td .button {
276	background-color: transparent;	276	background-color: transparent;
277	}	277	}
278		278
		279	+td.field-name {
		280	+ color: #888;
		281	+ width: 150px;
		282	+ text-align: left;
		283	+}
		284	+
		285	+table.profile th {
		286	+ border-bottom: 2px solid #eeeeec;
		287	+ padding: 10px 0px 0px 0px;
		288	+}
		289	+table.profile td {
		290	+ border: none;
		291	+ padding-left: 0px;
		292	+}
		293	+table.profile tr:hover td {
		294	+ background: none;
		295	+}
		296	+
		297	+
279	/* for fields with auto-completion */	298	/* for fields with auto-completion */
280	div.auto-complete {	299	div.auto-complete {
281	display: block;	300	display: block;