From 3966e0bc0b632edf9f1523e0347f9a9781a8c5e9 Mon Sep 17 00:00:00 2001 From: nieguanghui Date: Fri, 8 Nov 2013 08:57:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_homework_list.html.erb | 3 --- app/views/projects/_course.html.erb | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index cc4672ea6..0a40e3d0e 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -5,9 +5,6 @@ - - - + + + + + +
<%= l(:label_task_plural)%>
<%= text_field_tag 'student_id', params[:student_id], :size => 30 %> diff --git a/app/views/projects/_course.html.erb b/app/views/projects/_course.html.erb index c3a1b9d78..614710556 100644 --- a/app/views/projects/_course.html.erb +++ b/app/views/projects/_course.html.erb @@ -14,13 +14,13 @@

<%= content_tag('span', "#{l(:label_institution_name)}:", :class => "course-font")%> + <% @admin = @project.project_infos%> <%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%> <%= @admin.first.user.user_extensions.occupation %> <% end %>

<%= content_tag('div', "#{l(:field_teacher_name)}:", :class => "info course-font teacher") %> - <% @admin = @project.project_infos%> <% if @admin.size > 0 %> <%= content_tag('a', @admin.collect{|u| link_to(u.user.lastname+u.user.firstname, user_path(u.user_id))}.join(", ").html_safe) %> <% end %> From a52944811b0fba88e5097bf6d679b1ea78ac307c Mon Sep 17 00:00:00 2001 From: baiyu Date: Fri, 8 Nov 2013 09:02:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E9=87=8C=E2=80=9C=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E4=BA=86xx=E4=B8=AA=E9=A1=B9=E7=9B=AE=E2=80=9D=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E2=80=9C=E5=8F=82=E4=B8=8E=E4=BA=86XX=E4=B8=AA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E2=80=9D=E5=92=8C=E2=80=9C=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E4=BA=86XX=E4=B8=AA=E8=AF=BE=E7=A8=8B=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/index.html.erb | 19 ++++++++++++++++--- config/locales/zh.yml | 7 ++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 8488881e8..4088fec27 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -116,12 +116,25 @@

<% unless user.memberships.empty? %> - <%= l(:label_x_contribute_to, :count => user.memberships.count) %> - <% for member in user.memberships %> + <% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %> + <% memberships = user.memberships.all(:conditions => cond) %> + <%= l(:label_x_contribute_to, :count => memberships.count) %> + <% for member in memberships %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <% end %> <% end %> - <%= user.changesets.count == 0 ? '' : ",#{l(:label_x_total_commit, :count => user.changesets.count)}" %> + +

<% unless user.memberships.empty? %> + <% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %> + <% memberships = user.memberships.all(:conditions => cond) %> + <%= l(:label_x_course_contribute_to, :count => memberships.count) %> + <% for member in memberships %> + <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> + <% end %> + <% end %> +

+ + <%= user.changesets.count == 0 ? '' : "#{l(:label_x_total_commit, :count => user.changesets.count)}" %>
<% end -%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index bed8f4ecf..305303f53 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1571,7 +1571,12 @@ zh: label_endup_time: 结课时间 label_class_period: 整体课时 label_class_hour: 学时 - + + label_course_contribute_to: 参与了 %{project_count} 个项目： + label_x_course_contribute_to: + zero: "参与了 %{count} 个课程：" + one: "参与了 %{count} 个课程：" + other: "参与了 %{count} 个课程：" #end From 165c392f31c3ee0908c6abbde8de50f8011dba72 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Fri, 8 Nov 2013 10:29:29 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=90=84=E4=B8=AA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BD=93=E5=89=8D=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/contest.html.erb | 60 ++++++++-------- app/views/bids/index.html.erb | 96 ++++++++++++------------- app/views/layouts/base_bids.html.erb | 2 +- app/views/layouts/base_courses.html.erb | 2 +- public/stylesheets/application.css | 9 ++- 5 files changed, 83 insertions(+), 86 deletions(-) diff --git a/app/views/bids/contest.html.erb b/app/views/bids/contest.html.erb index 34f3e71eb..501cefbb5 100644 --- a/app/views/bids/contest.html.erb +++ b/app/views/bids/contest.html.erb @@ -1,37 +1,37 @@ -<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> -
- + +
+ <%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> +
- - + + - - + -
- <%= l(:label_contest_list) %> - <% if User.current.logged? %> - - - <% if User.current.user_extensions.identity == 0 %> + <%= l(:label_contest_innovate) %>当前位置 : + <% if User.current.logged? %> + <% unless User.current.user_extensions.identity == 1 %> <%= link_to(l(:label_newtype_contest), {:controller => 'bids', :action => 'new_contest'}, :class => 'icon icon-add') %> - <% end %> - - - <% end %> -
- <%= text_field_tag 'name', params[:name], :size => 30 %> - <%= hidden_field_tag 'project_type', params[:project_type] %> - <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> + <% end %> + <% end %> +
+
+
+ <%= text_field_tag 'name', params[:name], :size => 30 %> + <%= hidden_field_tag 'project_type', params[:project_type] %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> -
-
-<%end%> - -<% if User.current.logged? %> - -<% end %> + + +
<%= link_to "forge.trustie.net/contest", :controller => 'bids', :action => 'index' %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %>
+ <% end %> + + <%= sort_contest(@s_state)%> diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb index 52ee990ca..5b7897c3f 100644 --- a/app/views/bids/index.html.erb +++ b/app/views/bids/index.html.erb @@ -1,61 +1,53 @@ -<%= form_tag(calls_path, :method => :get) do %> -
- + +
+ <%= form_tag(calls_path, :method => :get) do %> +
- - + + - - + + + + + + +
- <% if @project_type == '1' %> - <%= l(:label_bids_task_list) %> - <% else %> - <%= l(:label_call_list)%> - <% end %><% if User.current.logged? %> - - - <% unless @project_type == '1' %> + <%= l(:label_requirement_enterprise ) %>当前位置 : + <% if User.current.logged? %> <%= link_to(l(:label_new_call), {:controller => 'bids', :action => 'new_bid'}, :class => 'icon icon-add') %> - <% end %> - - - <% end %> -
- <%= text_field_tag 'name', params[:name], :size => 30 %> + <% end %> +
+
+ <%= text_field_tag 'name', params[:name], :size => 28 %> + <%= hidden_field_tag 'reward_type', params[:reward_type] %> + <%= hidden_field_tag 'project_type', params[:project_type] %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> +
+
<%= link_to "forge.trustie.net/calls", :controller => 'bids', :action => 'index' %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_requirement_enterprise), :controller => 'bids', :action => 'index' %>
+ <% end %> +
+ + - <%= hidden_field_tag 'reward_type', params[:reward_type] %> - <%= hidden_field_tag 'project_type', params[:project_type] %> - - <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> - - - - -<%end%> -<% if User.current.logged? %> - -<% end %> + <%= sort_bid(@s_state, @project_type)%> -<%= sort_bid(@s_state, @project_type)%> + - +
  • + <%= link_to l(:label_sort_by_active), calls_path(:bid_sort_type => '1') %> +
    • + + -
    - <%= render :partial => 'bid_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %> -
    +
    + <%= render :partial => 'bid_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %> +
    diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index 1b1f22eb2..2cd973009 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -28,7 +28,7 @@ <%=render :partial => 'layouts/base_header'%> <% end %> -
    +
    diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 679910e14..64afdc8b2 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -46,7 +46,7 @@
    - +