diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index b0bcd70ea..499b5954c 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -55,7 +55,7 @@ <%= l(:field_mail_notification)%> -
+

<%= l(:label_preferences)%> -

+
<%= render :partial => 'users/preferences' %>
diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb index 169d9c3e6..50d4cf391 100644 --- a/app/views/users/user_projects.html.erb +++ b/app/views/users/user_projects.html.erb @@ -20,7 +20,7 @@

- <%= format_date(membership.created_on) %> + <%= format_time(membership.created_on) %> <%= h membership.roles.sort.collect(&:to_s).join(', ') %> diff --git a/app/views/users/watch_bids.html.erb b/app/views/users/watch_bids.html.erb index 6dc4ef24e..d142411ac 100644 --- a/app/views/users/watch_bids.html.erb +++ b/app/views/users/watch_bids.html.erb @@ -31,7 +31,7 @@ (<%= bid.watcher_users.count%>)<%= l(:label_followers) %> - <%= format_time bid.created_on %> + <%= format_time bid.created_on %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 495282031..4f7f95abb 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -186,24 +186,27 @@ software development and software crowdsourcing. <% else %>
- + + +
- + - + + -
<%= l(:label_welcome) %> <%=link_to User.current.lastname< <%= l(:label_join) %><%= l(:label_welcome) %> <%=link_to User.current.lastname< <%= l(:label_join) %>
<%=link_to image_tag(url_to_avatar(User.current), :class => 'avatar'), user_path(User.current) %><%=link_to image_tag(url_to_avatar(User.current), :class => 'avatar'), user_path(User.current) %> <%= link_to l(:label_user_watcher)+"("+User.watched_by(User.current).count.to_s+")", user_path(User.current) %>  <%=link_to l(:label_user_fans)+"("+User.current.watcher_users(User.current.id).count.to_s+")", user_path(User.current) %>
<% unless User.current.memberships.empty? %> - <%= l(:label_welcome_participate) %> (<%= link_to User.current.memberships.count, {:controller => 'users', :action => 'user_projects', :id => User.current} %>) <%= l(:label_welcome_participate_project)%> + <% unless User.current.memberships.empty? %> + <%= l(:label_welcome_participate) %> <%= link_to User.current.memberships.count, {:controller => 'users', :action => 'user_projects', :id => User.current} %> <%= l(:label_welcome_participate_project)%> <% end %>
- +
<% end %> <% end %> diff --git a/app/views/words/_new.html.erb b/app/views/words/_new.html.erb index 0553059ea..80a32097b 100644 --- a/app/views/words/_new.html.erb +++ b/app/views/words/_new.html.erb @@ -2,12 +2,12 @@