diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 6272e9763..738b0ef01 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -139,9 +139,9 @@ software development and software crowdsourcing.
- +
- +
<%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %><%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %>
- + @@ -197,7 +197,8 @@ software development and software crowdsourcing. diff --git a/config/locales/en.yml b/config/locales/en.yml index be2f155d7..c6467876d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1091,7 +1091,7 @@ en: #modify by mkz #by young label_requirement: Calls - label_requirement_focus: Requirement focus + label_requirement_focus: Call focus label_developer: Users label_investor: Investor： label_theme: Theme @@ -1319,12 +1319,14 @@ en: label_welcome_trustie: Trustie forge label_welcome_trustie_description: a socialized collaboration platform for project management, collaborative research, software development and software crowdsourcing for creative university students and entrepreneurs. label_user_project: Projects - label_bid_respond_quote: Quote + label_bid_respond_quote: Respond label_bid_respond_delete: Delete label_newfeedback_message: messages - label_newfeedback_quote: Quote + label_newfeedback_quote: Respond label_newfeedback_delete: Delete label_user_all_activity: All activities label_user_activity_myself: About me label_user_all_respond: All respondes - label_layouts_feedback: Messages \ No newline at end of file + label_layouts_feedback: Messages + label_welcome_participate: participated in + label_welcome_participate_project: projects！ diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 668211e1a..f649df4b2 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1338,12 +1338,14 @@ zh: label_welcome_trustie: Trustie label_welcome_trustie_description: 面向有创意和激情的高校大学生与创业者，提供社交化的项目管理、协同研究、软件开发和众包平台。 label_user_project: 项目 - label_bid_respond_quote: 引用 + label_bid_respond_quote: 回复 label_bid_respond_delete: 删除 label_newfeedback_message: 留言 - label_newfeedback_quote: 引用 + label_newfeedback_quote: 回复 label_newfeedback_delete: 删除 label_user_all_activity: 所有动态 label_user_activity_myself: 只看自己 label_user_all_respond: 所有反馈 label_layouts_feedback: 留言 + label_welcome_participate: 参与了 + label_welcome_participate_project: 个项目！ \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index c8594e27c..1a3da63ac 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -80,7 +80,7 @@ RedmineApp::Application.routes.draw do #added by young resources :users do member do - match 'user_projects', :to => 'users#user_projects', :via => :get, :as => "user_projects" + match 'user_projects', :to => 'users#user_projects', :via => :get, :as => "projects" match 'user_activities', :to => 'users#show', :via => :get, :as => "user_activities" match 'user_newfeedback', :to => 'users#user_newfeedback', :via => :get, :as => "user_newfeedback" match 'watch_calls', :controller => 'users', :action => 'watch_bids', :via => [:get , :post] @@ -89,7 +89,8 @@ RedmineApp::Application.routes.draw do match 'user_fanslist', :to => 'users#user_fanslist', :via => :get, :as => "user_fanslist" #add by huang end end - match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback', :via => :get, :as => "feedback" + match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback', :via => :get, :as => "feedback" + match 'users/:id/user_projects', :controller => 'users', :action => 'user_projects', :via => :get, :as => "projects" #end match 'my/account', :controller => 'my', :action => 'account', :via => [:get, :post] match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post] diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index f375a1b34..a79646c3a 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -166,11 +166,17 @@ ul.tool li{list-style-type:none; .font_welcome_trustie{ font-family:Impact; font-weight: regular; - font-size: 28px; + font-size: 29px; color:#15bccf; } .font_welcome_Cdescription{ + font-family: 微软雅黑; + font-size: 16px; + color: #5c5c5c; +} + +.font_welcome_tdescription{ font-family: 微软雅黑; font-size: 20px; color: #5c5c5c; @@ -624,7 +630,13 @@ ul.newprojects2 li{ white-space:nowrap; } #top-menu a {color: #fff; margin-right: 8px; font-weight: bold;} -#top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; } +#top-menu #loggedas + { + float: right; + + margin-right: 0.5em; + color: #fff; + } #account {float:right;} diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 8487254ec..17e4293ae 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -367,7 +367,7 @@ ul.projects li.root { background-color:#fff; /*顶层导航颜色*/ color: #fff; - font-size:13px; + font-size:16px; font-family: 微软雅黑; position:relative; padding:0; @@ -389,6 +389,7 @@ ul.projects li.root /*by young*/ padding-top: 10px; color:#fff; + font-weight: bold; line-height:21px; margin-right:1px }
<%= 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) %>
<% unless User.current.memberships.empty? %> - <%= l(:label_welcome_page_to, :project_count => "#{User.current.memberships.count}") %> <% end %>