diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb index f4bd9a1eb..7bd290ecf 100644 --- a/app/views/bids/_homework.html.erb +++ b/app/views/bids/_homework.html.erb @@ -8,7 +8,7 @@ <%= submit_tag l(:button_create) %> <% end %> -<% 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) %> +<% 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 = ?', 10, 7)).size >0) %>
<%= toggle_link l(:label_commit_homework), 'put-bid-form' %> diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index ed023da9d..d32cee4b5 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -12,7 +12,7 @@ - <% elsif @bid.reward_type == 2%> + <% elsif @bid.reward_type == 2%> diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index 78445a034..244e6a36c 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -86,11 +86,34 @@ <%= link_to l(:label_x_bids_responses, :count => @bid.commit)+"("+@bid.commit.to_s+")", respond_path(@bid)%> +
+ + +
+
+ <%= l(:label_project_overview) %> +
+ +
+ <% if @bid.description.size>0 %> +
+ + <%= textilizable @bid.description %> +
+ <% else %> +
+ <%= l(:label_course_description_no) %> +
+ <% end %> +
+ <%= l(:label_create_time) %>：<%= format_time(@bid.created_on) %> +
+
+
+
-
- <%= l(:label_tag) %> -
+
<%= l(:label_homework_project) %>(<%= bidding_project.count%>) - <% 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) %> + <% 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 = ?', 10, 7)).size >0) %>
<%= toggle_link l(:label_commit_homework), 'put-bid-form' %> diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb index 88d21d3a0..22cc1dcd4 100644 --- a/app/views/bids/show.html.erb +++ b/app/views/bids/show.html.erb @@ -13,7 +13,7 @@ <%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %><%= @bid.budget%>
<%= l(:label_bids_reward_method) %> diff --git a/app/views/bids/show_project.html.erb b/app/views/bids/show_project.html.erb index 05e9771d0..7e015e712 100644 --- a/app/views/bids/show_project.html.erb +++ b/app/views/bids/show_project.html.erb @@ -92,11 +92,11 @@ <% end %>
- <%= submit_tag l(:button_add), :name => nil , :class => "btn_bid", + <%= submit_tag l(:button_add), :name => nil , :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -30px'"%> <%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", - :type => 'button', :class => "btn_bid", :onmouseout => "this.style.backgroundPosition = 'left top'", + :type => 'button', :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -30px'" %>
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 9a7e29f16..afbabae1a 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -147,7 +147,7 @@ <%= link_to l(:label_question_student), {:controller => 'bids', :action => 'show' },:class => link_class(:respond)%>
  • - <% 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) %> + <% 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 = ?', 10, 7)).size >0) %> <%= link_to l(:label_homework_commit), {:controller => 'bids', :action => 'show_project' },:class => link_class(:project)%> <% else %> <%= link_to l(:label_homework_info), {:controller => 'bids', :action => 'show_project' },:class => link_class(:project)%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 342a2e9d6..6a8857f11 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1361,7 +1361,7 @@ zh: label_my_respond: 问题交流请踩这里^-^ label_my_question: 请在此处留下您的意见或者问题~ # modified by bai label_respond_requirement: 对需求进行了反馈 - label_contest_requirement: 对竞赛进行了反馈 + label_respond_contest: 对竞赛进行了反馈 label_question_requirement: 对作业提出了问题！ label_deadline: 投资时限yyyy-mm-dd label_requirement_name: 在此输入需求名称 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 9642b4e1e..d6709d448 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -121,10 +121,7 @@ h4 {border-bottom: 1px dotted #bbb;} } -.enterprise{ - padding-left: 400px; - padding-top: 10px; -} + .project_avatar_name { position: relative; diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index c76e9a1b5..b8cfe6688 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1759,7 +1759,9 @@ div.project-search { float: right; margin-right: 28px; } -input.enterprise[type="submit"] { + +/*huang*/ +input.enterprise[type="button"] { padding-bottom: 5px; width: 55px; height: 25px; @@ -1770,6 +1772,19 @@ input.enterprise[type="submit"] { background: #15bccf; border: 1px solid #15bccf; } +input.enterprise[type="submit"] { + padding-bottom: 5px; + width: 55px; + height: 25px; + font-family: '微软雅黑',Arial,Helvetica,sans-serif; + font-size: 12px; + color: #fff; + padding: 0px; + background: #15bccf; + border: 1px solid #15bccf; + +} +/*end*/ input[type="submit"] { width: auto; font-family: '微软雅黑',Arial,Helvetica,sans-serif; @@ -1783,6 +1798,20 @@ input[type="submit"] { text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255); cursor: pointer; } + +input[type="button"] { + width: auto; + font-family: '微软雅黑',Arial,Helvetica,sans-serif; + font-size: 12px; + color: rgb(5, 5, 5); + padding: 0px; + background: -moz-linear-gradient(center top , rgb(255, 255, 255) 0%, rgb(235, 235, 235) 50%, rgb(219, 219, 219) 50%, rgb(181, 181, 181)) repeat scroll 0% 0% transparent; + border-radius: 4px; + border: 1px solid rgb(148, 148, 148); + box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset; + text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255); + cursor: pointer; +} /*by fanqiang*/ img.avatar3 { width: 50px;