diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 9e615eaec..9fd826bf5 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -46,15 +46,16 @@
- + -
高校课程实践社区 + + 高校课程实践社区 + + <%= l(:label_user_location) %> :
- <%= link_to request.host()+"/courses", :controller => 'courses', :action => 'index' %> -

<%= link_to "主页", home_path %> > diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index ee490c653..b6620b141 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -30,8 +30,14 @@

- - + + - - +
软件项目托管社区<%= l(:label_user_location) %> : + + 软件项目托管社区 + + + <%= l(:label_user_location) %> : +
<%= form_tag(projects_search_path, :method => :get) do %> @@ -43,8 +49,12 @@
<%= link_to request.host()+"/projects", :controller => 'projects', :action => 'index', :project_type => 0 %>

<%=link_to l(:label_home),home_path %> > <%=link_to @project, project_path(@project) %>

 +

+ <%=link_to l(:label_home),home_path %> > + <%=link_to @project, project_path(@project) %> +

+
@@ -54,7 +64,9 @@ <% @project = Project.find_by_id(@project.id)%> - + - - - + + + - - - + + +
<%= image_tag(url_to_avatar(@project), :class => 'avatar2') %> + <%= image_tag(url_to_avatar(@project), :class => 'avatar2') %> +
<%= link_to @project.name, project_path(@project)%> @@ -86,15 +98,26 @@ <% @project.versions.each do |version| %> <% files_count += version.attachments.count %> <% end %> -
<%=link_to "#{@project.members.count}", project_member_path(@project) %><%=link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist", :id => @project %><%=link_to "#{@project.issues.count}", project_issues_path(@project) %> + <%=link_to "#{@project.members.count}", project_member_path(@project) %> + + <%=link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist", :id => @project %> + + <%=link_to "#{@project.issues.count}", project_issues_path(@project) %> +
<%= l(:label_member) %><%= l(:label_user_watchered) %> <%= l(:label_project_issues) %> + <%= l(:label_member) %> + + <%= l(:label_user_watchered) %> + + <%= l(:label_project_issues) %> +
@@ -109,7 +132,10 @@ <%= textilizable @project.description %>
- <%= l(:label_create_time) %>：<%= format_time(@project.created_on) %> + + <%= l(:label_create_time) %>： + + <%= format_time(@project.created_on) %>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index f3bbe0098..186166dc8 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -101,8 +101,12 @@
- - + + -
<%= l(:label_user_home) %><%= l(:label_user_location) %> : + <%= l(:label_user_home) %> + + <%= l(:label_user_location) %> : +
<%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %> @@ -113,12 +117,11 @@
- <%=link_to request.host()+"/users" ,:controller => 'users', :action => 'index' %> - <%=link_to "主页", home_path %> > - <%=link_to @user.name, user_path %> + + <%=link_to @user.name, user_path %> +
@@ -131,23 +134,28 @@
- + +
<%= image_tag(url_to_avatar(@user), :class => 'avatar2') %> + <%= image_tag(url_to_avatar(@user), :class => 'avatar2') %> + - + - + - - -
<%= link_to h (@user.name) %> - <%= image_tag(gender_avatar_uri(@user), weight:"25px", height:"25px") if (@user.user_extensions && (@user.user_extensions.identity != 2) )%> + <%= link_to h (@user.name) %> + <%= image_tag(gender_avatar_uri(@user), weight:"25px", height:"25px") if (@user.user_extensions && (@user.user_extensions.identity != 2) )%> +
<% unless User.current == @user %> - <%= watcher_link(@user, User.current) %> - <% else %> - <%= link_to(l(:label_user_edit), my_account_path(@user)) if User.current %> - <% end %> + <% unless User.current == @user %> + <%= watcher_link(@user, User.current) %> + <% else %> + <%= link_to(l(:label_user_edit), my_account_path(@user)) if User.current %> + <% end %> +
@@ -156,8 +164,8 @@
+
@@ -228,29 +236,42 @@ <% unless @user.user_extensions.nil? %> <% if @user.user_extensions.identity == 0 || @user.user_extensions.identity == 1 %> - <%= l(:field_occupation) %>： + + <%= l(:field_occupation) %>： + + <% unless @user.user_extensions.school.nil? %> <%= @user.user_extensions.school.name %> <% end %> - + <% elsif @user.user_extensions.identity == 3 %> - <%= l(:field_occupation) %>： + + <%= l(:field_occupation) %>： + <%= @user.user_extensions.occupation %> - + <% elsif @user.user_extensions.identity == 2 %> - <%= l(:label_company_name) %>： + + <%= l(:label_company_name) %>： + <%= @user.firstname %> <% end %> - <%= l(:label_location) %>：<%= @user.user_extensions.location %><%= @user.user_extensions.location_city %> + + <%= l(:label_location) %>： + + + <%= @user.user_extensions.location %> + <%= @user.user_extensions.location_city %> + <% if @user.user_extensions.identity == 0 %> @@ -307,7 +328,9 @@
- <%= l(:label_user_watcher) %> + + <%= l(:label_user_watcher) %> + <% if show_more_watchers?(@user) %>
<%= link_to l(:label_more), :controller => "users", :action => "user_watchlist"%> @@ -318,7 +341,9 @@
- +
<%= show_watcher_profile(@user) %> + <%= show_watcher_profile(@user) %> +
@@ -327,7 +352,9 @@
- <%= l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count) %> + + <%= l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count) %> + <% if show_more_fans?(@user) %>
<%= link_to l(:label_more), :controller => "users", :action => "user_fanslist"%> @@ -337,7 +364,9 @@
- +
<%= show_fans_picture(@user) %> + <%= show_fans_picture(@user) %> +