From a04528116c664893ef54cfaa5e5ac3865ad49cc5 Mon Sep 17 00:00:00 2001 From: baiyu Date: Wed, 28 Aug 2013 21:15:54 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=9B=9E=E5=A4=8D=E6=A1=86=202?= =?UTF-8?q?=E3=80=81=E4=B8=BB=E9=A1=B5=E5=AD=97=E4=BD=93=E5=8F=8A=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/my/account.html.erb | 4 +-- app/views/users/user_projects.html.erb | 2 +- app/views/users/watch_bids.html.erb | 2 +- app/views/welcome/index.html.erb | 15 ++++++---- app/views/words/_new.html.erb | 16 +++++----- config/locales/zh.yml | 2 +- public/stylesheets/application.css | 29 ++++++++++++++----- .../stylesheets/application.css | 10 ++++--- 8 files changed, 49 insertions(+), 31 deletions(-) diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index b0bcd70e..499b5954 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 169d9c3e..50d4cf39 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 6dc4ef24..d142411a 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 49528203..4f7f95ab 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 0553059e..80a32097 100644 --- a/app/views/words/_new.html.erb +++ b/app/views/words/_new.html.erb @@ -2,12 +2,12 @@