主页链接,国际化,显示

This commit is contained in:
kaizheng 2013-08-27 22:19:07 +08:00
parent d043a1fb9d
commit 1510a6466e
6 changed files with 34 additions and 15 deletions

View File

@ -139,9 +139,9 @@ software development and software crowdsourcing.</td></tr>
<!--add by huang-->
<div style="height:280px;">
<div class="welcone_left">
<table width="400px">
<table width="388px">
<tr>
<td><span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_Cdescription">, <%= l(:label_welcome_trustie_description) %></span></td>
<td><span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span></td>
</tr>
<!-- <tr>
<td class="font_welcome_Edescription">Trustie forge,a socialized collaboration platform for project management,software development and software crowdsourcing for creative university students and entrepreneurs.</td>
@ -188,7 +188,7 @@ software development and software crowdsourcing.</td></tr>
<!--info-->
<table width="200" border="0">
<tr>
<td colspan="2" class="font_welcome_Cdescription" style=" word-wrap: break-word; word-break: break-all"><%= l(:label_welcome) %> <strong class="font_small_watch"><%=link_to User.current.lastname<<User.current.firstname, user_path(User.current) %></strong> <%= l(:label_join) %></td>
<td colspan="2" class="font_welcome_Cdescription" ><%= l(:label_welcome) %> <strong class="font_small_watch" style=" word-wrap: break-word; word-break: break-all"><%=link_to User.current.lastname<<User.current.firstname, user_path(User.current) %></strong> <%= l(:label_join) %></td>
</tr>
<tr>
<td rowspan="2" align="left"><%=link_to image_tag(url_to_avatar(User.current), :class => 'avatar'), user_path(User.current) %></td>
@ -197,7 +197,8 @@ software development and software crowdsourcing.</td></tr>
</tr>
<tr>
<td><% unless User.current.memberships.empty? %>
<%= l(:label_welcome_page_to, :project_count => "#{User.current.memberships.count}") %> <!-- <% for member in User.current.memberships %>
<%= l(:label_welcome_participate) %> (<strong class="font_small_watch"><%= link_to User.current.memberships.count, {:controller => 'users', :action => 'user_projects', :id => User.current} %></strong>) <%= l(:label_welcome_participate_project)%>
<!-- <% for member in User.current.memberships %>
<%= link_to_project(member.project) %><%= (User.current.memberships.last == member) ? '' : '' %>
<% end %> --> <% end %></td>
</tr>

View File

@ -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
label_welcome_participate: participated in
label_welcome_participate_project: projects

View File

@ -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: 个项目!

View File

@ -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]
@ -90,6 +90,7 @@ RedmineApp::Application.routes.draw do
end
end
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]

View File

@ -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;}

View File

@ -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
}