From 2a9cb28c4ea9fc0a86af00de54a0425f426bdc6f Mon Sep 17 00:00:00 2001 From: baiyu Date: Mon, 30 Sep 2013 11:02:04 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=86=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=202=E3=80=81=E5=A2=9E=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E2=80=9C=E5=B9=B4=E5=BA=A6=E2=80=9D=E2=80=9C?= =?UTF-8?q?=E5=AD=A6=E6=9C=9F=E2=80=9D=203=E3=80=81=E4=B8=BB=E8=AE=B2?= =?UTF-8?q?=E6=95=99=E5=B8=88=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 18 +- app/views/bids/_project_list.html.erb | 4 +- app/views/bids/show.html.erb | 34 ++- app/views/layouts/_base_header.html.erb | 2 +- app/views/layouts/base_courses.html.erb | 17 +- app/views/layouts/base_users.html.erb | 6 +- app/views/projects/_course_form.html.erb | 209 +++++++++++++++++- app/views/projects/show.html.erb | 2 +- config/locales/zh.yml | 9 +- ...13_add_location_city_to_user_extensions.rb | 5 + public/images/sidebar/female.png | Bin 0 -> 14621 bytes 11 files changed, 261 insertions(+), 45 deletions(-) create mode 100644 db/migrate/20130925031313_add_location_city_to_user_extensions.rb create mode 100644 public/images/sidebar/female.png diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 91966d290..467b56257 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -126,13 +126,7 @@ class ProjectsController < ApplicationController # @offset ||= @project_pages.offset # @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all @project_type = params[:project_type] - if @project_type == '1' - session[:enterprise_college] = 1 - elsif @project_type == '0' - session[:enterprise_college] = 2 - else - session[:enterprise_college] = 0 - end + @offset, @limit = api_offset_and_limit({:limit => 10}) @projects_status = ProjectStatus.visible.where("project_type <> ? or project_type is null", 1) @@ -253,7 +247,6 @@ class ProjectsController < ApplicationController # @project_pages = Paginator.new @project_count, @limit, params['page'] # @offset ||= @project_pages.offset # @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all - session[:enterprise_college] = 1 @project_type = params[:project_type] @offset, @limit = api_offset_and_limit({:limit => 10}) @@ -495,6 +488,10 @@ class ProjectsController < ApplicationController @course.extra='course' + DateTime.parse(Time.now.to_s).strftime('%Y-%m-%d_%H-%M-%S').to_s @course.safe_attributes = params[:project][:course] @course.tea_id = User.current.id + # added by bai + @course.term = params[:term] + @course.time = params[:time] + # end # @course.save # project = ProjectInfo.create(:user_id => User.current.id, :project_id => @project.id) # project_status = ProjectStatus.create(:project_id => @project.id) @@ -767,7 +764,10 @@ class ProjectsController < ApplicationController @course = Course.find_by_extra(@project.identifier) unless @course.nil? @course.password = params[:project][:course][:password] - @course.term = params[:project][:course][:term] + # added by bai + @course.term = params[:term] + @course.time = params[:time] + # end @course.save end @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index 4c0f64849..08ddee5de 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -6,12 +6,12 @@ <% if User.current.logged? %> - <% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %> +
<%= toggle_link l(:button_bidding_homework), 'put-bid-form' %>
- <% end %> + <% end %> diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb index 5a1e12a7f..977c35b67 100644 --- a/app/views/bids/show.html.erb +++ b/app/views/bids/show.html.erb @@ -4,16 +4,7 @@ <%= link_to image_tag(url_to_avatar(@bid.author), :class => "avatar"), user_path(@bid.author), :class => "avatar" %> - - - + <% if @bid.reward_type.nil? or @bid.reward_type == 1%> @@ -33,24 +24,25 @@ <%= l(:label_bids_credit) %> <%= @bid.budget%> <%= l(:label_bids_credit_number) %> <% end %> -

<%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= @bid.name %>

 - - - <%= render :partial => "/praise_tread/praise_tread", - :locals => {:obj => @bid,:show_flag => true,:user_id =>User.current.id}%> - - -

<%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= @bid.name %>
- - -
- - - - - - +
<%= @bid.description %> + +
<%= @bid.description %> <% if @bid.attachments.any?%> <% options = {:author => true} %> <%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %> <% end %>
+ + + + <%= render :partial => "/praise_tread/praise_tread", + :locals => {:obj => @bid,:show_flag => true,:user_id =>User.current.id}%> + + + -
+
<%= render :partial => 'history', :locals => { :bid => @bid, :journals => @jour, :state => false} %> diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 53acaed70..551ce4a6a 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -1,4 +1,4 @@ -
+
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index fd4cdd413..5bf5a595b 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -79,18 +79,25 @@ - 主讲老师：<%= @course.teacher.lastname+@course.teacher.firstname %> + <%= l(:label_main_teacher) %><%= @course.teacher.lastname+@course.teacher.firstname %> + - 课程学期：<%= @course.term %> + <%= l(:label_course_time) %><%= @course.time %> - <% unless @course.teacher.user_extensions.nil?%> + - 教师单位：<%= @course.teacher.user_extensions.occupation %> + <%= l(:label_main_term) %><%= @course.term %> + + + + <% unless @course.teacher.user_extensions.nil?%> + + <%= l(:label_teacher_work_unit) %><%= @course.teacher.user_extensions.occupation %> <% else %> - 教师单位：<%= l(:field_course_un) %> + <%= l(:label_teacher_work_unit) %><%= l(:field_course_un) %> <% end %> diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index fd99c9eae..f16eb7352 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -65,10 +65,12 @@ <%=link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@user.watcher_users(@user.id).count.to_s+")", :controller=>"users", :action=>"user_fanslist" %> + <% if @user.id == User.current.id %>

<%= toggle_link l(:label_brief_introduction), 'introduction', {:focus => 'new_form_user_introduction'} %>

- + <% end %> <% unless @user.user_extensions.nil? %> - <%= @user.user_extensions.brief_introduction %> +

+ <%= @user.user_extensions.brief_introduction %>

<% end %>