commit
ee5efab7b8
@ -1,30 +1,30 @@
|
|||||||
*.swp
|
*.swp
|
||||||
/.project
|
/.project
|
||||||
/.idea
|
/.idea
|
||||||
/.bundle
|
/.bundle
|
||||||
*.swp
|
*.swp
|
||||||
/config/database.yml
|
/config/database.yml
|
||||||
/config/configuration.yml
|
/config/configuration.yml
|
||||||
/config/additional_environment.rb
|
/config/additional_environment.rb
|
||||||
/files/*
|
/files/*
|
||||||
/log/*
|
/log/*
|
||||||
/public/tmp/*
|
/public/tmp/*
|
||||||
/tmp/*
|
/tmp/*
|
||||||
/public/cache/*
|
/public/cache/*
|
||||||
.gitignore
|
.gitignore
|
||||||
/config/newrelic.yml
|
/config/newrelic.yml
|
||||||
/public/images/avatars/*
|
/public/images/avatars/*
|
||||||
/Gemfile
|
/Gemfile
|
||||||
/Gemfile.lock
|
/Gemfile.lock
|
||||||
/db/schema.rb
|
/db/schema.rb
|
||||||
/Gemfile.lock
|
/Gemfile.lock
|
||||||
/lib/plugins/acts_as_versioned/test/debug.log
|
/lib/plugins/acts_as_versioned/test/debug.log
|
||||||
.rbenv-gemsets
|
.rbenv-gemsets
|
||||||
.DS_Store
|
.DS_Store
|
||||||
public/api_doc/
|
public/api_doc/
|
||||||
/.metadata
|
/.metadata
|
||||||
vendor/cache
|
vendor/cache
|
||||||
/files
|
/files
|
||||||
/public/images/avatars
|
/public/images/avatars
|
||||||
/public/files
|
/public/files
|
||||||
/tags
|
/tags
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
--format documentation
|
|
||||||
--color
|
--color
|
||||||
|
--require spec_helper
|
||||||
|
|||||||
@ -0,0 +1,18 @@
|
|||||||
|
module Mobile
|
||||||
|
module Entities
|
||||||
|
class Homeworkscore < Grape::Entity
|
||||||
|
include Redmine::I18n
|
||||||
|
include ApplicationHelper
|
||||||
|
def self.homeworkscore_expose(field)
|
||||||
|
expose field do |f,opt|
|
||||||
|
if f.is_a?(Hash) && f.key?(field)
|
||||||
|
f[field]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
homeworkscore_expose :name
|
||||||
|
homeworkscore_expose :score
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,42 @@
|
|||||||
|
class DiscussDemosController < ApplicationController
|
||||||
|
def index
|
||||||
|
|
||||||
|
@discuss_demo_list = DiscussDemo.where("body is not null").order("created_at desc").page(params[:page] || 1).per(10)
|
||||||
|
end
|
||||||
|
|
||||||
|
def new
|
||||||
|
@discuss_demo = DiscussDemo.create
|
||||||
|
@discuss_demo.save!
|
||||||
|
@discuss_demo
|
||||||
|
end
|
||||||
|
|
||||||
|
def create
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
def update
|
||||||
|
@discuss_demo = DiscussDemo.find(params[:id])
|
||||||
|
@discuss_demo.update_attributes(:title => params[:discuss_demo][:title],:body => params[:discuss_demo][:body])
|
||||||
|
redirect_to :controller=> 'discuss_demos',:action => 'show',:id => params[:id]
|
||||||
|
end
|
||||||
|
|
||||||
|
def delete
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
def destroy
|
||||||
|
asset = Kindeditor::Asset.find_by_owner_id(params[:id])
|
||||||
|
if !asset.nil?
|
||||||
|
filepath = File.join(Rails.root,"public","files","uploads",
|
||||||
|
asset[:created_at].to_s.gsub("+0800","").to_datetime.strftime("%Y%m").to_s,
|
||||||
|
asset[:asset].to_s)
|
||||||
|
File.delete(filepath) if File.exist?filepath
|
||||||
|
end
|
||||||
|
DiscussDemo.destroy(params[:id])
|
||||||
|
redirect_to :controller=> 'discuss_demos',:action => 'index'
|
||||||
|
end
|
||||||
|
|
||||||
|
def show
|
||||||
|
@discuss_demo = DiscussDemo.find(params[:id])
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -1,86 +1,86 @@
|
|||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
=begin
|
=begin
|
||||||
identity字段含义
|
identity字段含义
|
||||||
0 教师教授
|
0 教师教授
|
||||||
1 学生
|
1 学生
|
||||||
2 企业
|
2 企业
|
||||||
3 开发者
|
3 开发者
|
||||||
=end
|
=end
|
||||||
class UserExtensions < ActiveRecord::Base
|
class UserExtensions < ActiveRecord::Base
|
||||||
validate :school, presence: true
|
validate :school, presence: true
|
||||||
|
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
belongs_to :school, :class_name => 'School', :foreign_key => :school_id
|
belongs_to :school, :class_name => 'School', :foreign_key => :school_id
|
||||||
attr_accessible :user_id,:birthday,:brief_introduction,:gender,:location,:occupation,:work_experience,:zip_code,:identity, :technical_title,:student_id
|
attr_accessible :user_id,:birthday,:brief_introduction,:gender,:location,:occupation,:work_experience,:zip_code,:identity, :technical_title,:student_id
|
||||||
TEACHER = 0
|
TEACHER = 0
|
||||||
STUDENT = 1
|
STUDENT = 1
|
||||||
ENTERPRISE = 2
|
ENTERPRISE = 2
|
||||||
DEVELOPER = 3
|
DEVELOPER = 3
|
||||||
#this method was used to update the table user_extensions
|
#this method was used to update the table user_extensions
|
||||||
def update_user_extensions(birthday=nil,brief_introduction=nil,
|
def update_user_extensions(birthday=nil,brief_introduction=nil,
|
||||||
gender=nil,location=nil,occupation=nil,work_experience=nil,zip_code=nil)
|
gender=nil,location=nil,occupation=nil,work_experience=nil,zip_code=nil)
|
||||||
self.birthday = birthday
|
self.birthday = birthday
|
||||||
self.brief_introduction = brief_introduction
|
self.brief_introduction = brief_introduction
|
||||||
self.gender = gender
|
self.gender = gender
|
||||||
self.location = location
|
self.location = location
|
||||||
self.occupation = occupation
|
self.occupation = occupation
|
||||||
self.work_experience = work_experience
|
self.work_experience = work_experience
|
||||||
self.zip_code = zip_code
|
self.zip_code = zip_code
|
||||||
self.save
|
self.save
|
||||||
end
|
end
|
||||||
|
|
||||||
def get_brief_introduction
|
def get_brief_introduction
|
||||||
return self.brief_introduction
|
return self.brief_introduction
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
# added by meng
|
# added by meng
|
||||||
def show_identity
|
def show_identity
|
||||||
if User.current.language == 'zh'||User.current.language == ''
|
if User.current.language == 'zh'||User.current.language == ''
|
||||||
case self.identity
|
case self.identity
|
||||||
when 0
|
when 0
|
||||||
user_identity = l(:label_account_identity_teacher)
|
user_identity = l(:label_account_identity_teacher)
|
||||||
when 1
|
when 1
|
||||||
user_identity = l(:label_account_identity_student)
|
user_identity = l(:label_account_identity_student)
|
||||||
when 2
|
when 2
|
||||||
user_identity = l(:label_account_identity_enterprise)
|
user_identity = l(:label_account_identity_enterprise)
|
||||||
when 3
|
when 3
|
||||||
user_identity = l(:label_account_identity_developer)
|
user_identity = l(:label_account_identity_developer)
|
||||||
else
|
else
|
||||||
user_identity = ''
|
user_identity = ''
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
case self.identity
|
case self.identity
|
||||||
when 0
|
when 0
|
||||||
user_identity = l(:label_account_identity_teacher)
|
user_identity = l(:label_account_identity_teacher)
|
||||||
when 1
|
when 1
|
||||||
user_identity = l(:label_account_identity_student)
|
user_identity = l(:label_account_identity_student)
|
||||||
when 2
|
when 2
|
||||||
user_identity = l(:label_account_identity_enterprise)
|
user_identity = l(:label_account_identity_enterprise)
|
||||||
when 3
|
when 3
|
||||||
user_identity = l(:label_account_identity_developer)
|
user_identity = l(:label_account_identity_developer)
|
||||||
else
|
else
|
||||||
user_identity = ''
|
user_identity = ''
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return user_identity
|
return user_identity
|
||||||
end
|
end
|
||||||
# end
|
# end
|
||||||
|
|
||||||
|
|
||||||
def self.introduction(user, message)
|
def self.introduction(user, message)
|
||||||
unless user.user_extensions.nil?
|
unless user.user_extensions.nil?
|
||||||
info = user.user_extensions
|
info = user.user_extensions
|
||||||
info.brief_introduction = message
|
info.brief_introduction = message
|
||||||
info.save
|
info.save
|
||||||
else
|
else
|
||||||
info = UserExtensions.new
|
info = UserExtensions.new
|
||||||
info.user_id = user.id
|
info.user_id = user.id
|
||||||
info.brief_introduction = message
|
info.brief_introduction = message
|
||||||
info.save
|
info.save
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,8 +1,26 @@
|
|||||||
$('#attachments_<%= j params[:attachment_id] %>').remove();
|
var attachment_html_obj = $('#attachments_<%= j params[:attachment_id] %>');
|
||||||
var count=$('#attachments_fields>span').length;
|
//modify by yutao 2015-5-14 当1个页面存在多个上传控件时此块代码存在bug 故改之 start
|
||||||
if(count<=0){
|
var containerid=$('.remove-upload',attachment_html_obj).data('containerid');
|
||||||
$("#upload_file_count").text(<%= l(:label_no_file_uploaded)%>);
|
if(containerid==undefined){
|
||||||
$(".remove_all").remove();
|
$('#attachments_<%= j params[:attachment_id] %>').remove();
|
||||||
}else{
|
var count=$('#attachments_fields>span').length;
|
||||||
$("#upload_file_count").html("已上传"+"<span id=\"count\">"+count+"</span>"+"个文件");
|
if(count<=0){
|
||||||
}
|
$("#upload_file_count").text('<%= l(:label_no_file_uploaded)%>');
|
||||||
|
$(".remove_all").remove();
|
||||||
|
}else{
|
||||||
|
$("#upload_file_count").html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
$('#attachments_<%= j params[:attachment_id] %>').remove();
|
||||||
|
var count=$('#attachments_fields'+containerid+'>span').length;
|
||||||
|
if(count<=0){
|
||||||
|
$('#upload_file_count'+containerid).text('<%= l(:label_no_file_uploaded)%>');
|
||||||
|
var remove_all_html_obj = $(".remove_all").filter(function(index){
|
||||||
|
return $(this).data('containerid')==containerid;
|
||||||
|
});
|
||||||
|
remove_all_html_obj.remove();
|
||||||
|
}else{
|
||||||
|
$('#upload_file_count'+containerid).html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//modify by yutao 2015-5-14 当1个页面存在多个上传控件时此块代码存在bug 故改之 end
|
||||||
@ -1,4 +1,4 @@
|
|||||||
var imgSpan = $('#avatar_image');
|
var imgSpan = jQuery('#avatar_image');
|
||||||
|
|
||||||
imgSpan.attr({"src":'<%= @urlfile.to_s << "?" << Time.now.to_s%>'});
|
imgSpan.attr({"src":'<%= "#{@urlfile.to_s}?#{Time.now.to_i}" %>'});
|
||||||
|
|
||||||
|
|||||||
@ -1,201 +1,201 @@
|
|||||||
<!--modified by huang-->
|
<!--modified by huang-->
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
function ShowCountDown(year,month,day,divname)
|
function ShowCountDown(year,month,day,divname)
|
||||||
{
|
{
|
||||||
var now = new Date();
|
var now = new Date();
|
||||||
var endDate = new Date(year, month-1, day);
|
var endDate = new Date(year, month-1, day);
|
||||||
var leftTime=endDate.getTime()-now.getTime();
|
var leftTime=endDate.getTime()-now.getTime();
|
||||||
var leftsecond = parseInt(leftTime/1000);
|
var leftsecond = parseInt(leftTime/1000);
|
||||||
var day1=Math.floor(leftsecond/(60*60*24));
|
var day1=Math.floor(leftsecond/(60*60*24));
|
||||||
var hour=Math.floor((leftsecond-day1*24*60*60)/3600);
|
var hour=Math.floor((leftsecond-day1*24*60*60)/3600);
|
||||||
var minute=Math.floor((leftsecond-day1*24*60*60-hour*3600)/60);
|
var minute=Math.floor((leftsecond-day1*24*60*60-hour*3600)/60);
|
||||||
var second=Math.floor(leftsecond-day1*24*60*60-hour*3600-minute*60);
|
var second=Math.floor(leftsecond-day1*24*60*60-hour*3600-minute*60);
|
||||||
$("#"+divname).html("<span style='color: #acaeb1;'>作品提交还剩 :</span> <span style='color: red;'>"
|
$("#"+divname).html("<span style='color: #acaeb1;'>作品提交还剩 :</span> <span style='color: red;'>"
|
||||||
+day1+" </span><span style='color: #acaeb1;'>天</span><span style='color: red;'> "
|
+day1+" </span><span style='color: #acaeb1;'>天</span><span style='color: red;'> "
|
||||||
+hour+" </span><span style='color: #acaeb1;'>时</span><span style='color: red;'> "
|
+hour+" </span><span style='color: #acaeb1;'>时</span><span style='color: red;'> "
|
||||||
+minute+" </span><span style='color: #acaeb1;'>分</span><span style='color: red;'> "
|
+minute+" </span><span style='color: #acaeb1;'>分</span><span style='color: red;'> "
|
||||||
+second+" </span><span style='color: #acaeb1;'>秒</span>");
|
+second+" </span><span style='color: #acaeb1;'>秒</span>");
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style>
|
<style>
|
||||||
.span_wping{}
|
.span_wping{}
|
||||||
.span_wping a{
|
.span_wping a{
|
||||||
margin-top: 18px;
|
margin-top: 18px;
|
||||||
margin-bottom: 3px;
|
margin-bottom: 3px;
|
||||||
width: 43px;
|
width: 43px;
|
||||||
height: 23px;
|
height: 23px;
|
||||||
background: #15bccf;
|
background: #15bccf;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 5px !important;
|
padding: 5px !important;
|
||||||
}
|
}
|
||||||
.span_wping a:hover{ background-color:#03a1b3;}
|
.span_wping a:hover{ background-color:#03a1b3;}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<% if bids.blank? %>
|
<% if bids.blank? %>
|
||||||
<%#= l(:label_uncommit_homework) %>
|
<%#= l(:label_uncommit_homework) %>
|
||||||
暂无作业！
|
暂无作业！
|
||||||
<% else %>
|
<% else %>
|
||||||
<% bids.each do |bid|%>
|
<% bids.each do |bid|%>
|
||||||
<table class="content-text-list">
|
<table class="content-text-list">
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" valign="top" width="50" >
|
<td colspan="2" valign="top" width="50" >
|
||||||
<%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %>
|
<%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<table width="580px" border="0">
|
<table width="580px" border="0">
|
||||||
<tr>
|
<tr>
|
||||||
<td valign="top">
|
<td valign="top">
|
||||||
<strong>
|
<strong>
|
||||||
<%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author)) %>
|
<%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author)) %>
|
||||||
</strong>
|
</strong>
|
||||||
<span class="font_lighter">
|
<span class="font_lighter">
|
||||||
<%= l(:label_user_create_project_homework) %>
|
<%= l(:label_user_create_project_homework) %>
|
||||||
</span>
|
</span>
|
||||||
<span>
|
<span>
|
||||||
<%= link_to(bid.name, course_for_bid_path(bid), :class => 'bid_path') %>
|
<%= link_to(bid.name, course_for_bid_path(bid), :class => 'bid_path') %>
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td style="width: 150px;">
|
<td style="width: 150px;">
|
||||||
<span style="float: right">
|
<span style="float: right">
|
||||||
<% if User.current.logged? && is_cur_course_student(@course) %>
|
<% if User.current.logged? && is_cur_course_student(@course) %>
|
||||||
<% cur_user_homework = cur_user_homework_for_bid(bid) %>
|
<% cur_user_homework = cur_user_homework_for_bid(bid) %>
|
||||||
<span class="span_wping">
|
<span class="span_wping">
|
||||||
<% if bid.open_anonymous_evaluation == 1 %>
|
<% if bid.open_anonymous_evaluation == 1 %>
|
||||||
<% case bid.comment_status %>
|
<% case bid.comment_status %>
|
||||||
<% when 0 %>
|
<% when 0 %>
|
||||||
<a>未开启匿评</a>
|
<a>未开启匿评</a>
|
||||||
<% when 1 %>
|
<% when 1 %>
|
||||||
<a> 匿评中.. </a>
|
<a> 匿评中.. </a>
|
||||||
<% when 2 %>
|
<% when 2 %>
|
||||||
<a> 匿评结束 </a>
|
<a> 匿评结束 </a>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end%>
|
<% end%>
|
||||||
</span>
|
</span>
|
||||||
<% if cur_user_homework && cur_user_homework.empty? %>
|
<% if cur_user_homework && cur_user_homework.empty? %>
|
||||||
<span class="span_wping">
|
<span class="span_wping">
|
||||||
<%= link_to l(:label_commit_homework),new_exercise_book_path(bid) %>
|
<%= link_to l(:label_commit_homework),new_exercise_book_path(bid) %>
|
||||||
</span>
|
</span>
|
||||||
<% else %>
|
<% else %>
|
||||||
<span class="span_wping">
|
<span class="span_wping">
|
||||||
<a>已 提 交</a>
|
<a>已 提 交</a>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% if (User.current.admin?||User.current.allowed_to?(:as_teacher,@course)) %>
|
<% if (User.current.admin?||User.current.allowed_to?(:as_teacher,@course)) %>
|
||||||
<% if bid.open_anonymous_evaluation == 1 && bid.homeworks.count >= 2%>
|
<% if bid.open_anonymous_evaluation == 1 && bid.homeworks.count >= 2%>
|
||||||
<span id="<%=bid.id %>_anonymous_comment" class="span_wping">
|
<span id="<%=bid.id %>_anonymous_comment" class="span_wping">
|
||||||
<% case bid.comment_status %>
|
<% case bid.comment_status %>
|
||||||
<% when 0 %>
|
<% when 0 %>
|
||||||
<%= link_to '启动匿评', alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_start_anonymous_comment", remote: true, disable_with: '加载中...' %>
|
<%= link_to '启动匿评', alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_start_anonymous_comment", remote: true, disable_with: '加载中...' %>
|
||||||
<% when 1 %>
|
<% when 1 %>
|
||||||
<%= link_to '关闭匿评', alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true %>
|
<%= link_to '关闭匿评', alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true %>
|
||||||
<% when 2 %>
|
<% when 2 %>
|
||||||
<a href="javascript:" style="background:#8e8e8e;">匿评结束</a>
|
<a href="javascript:" style="background:#8e8e8e;">匿评结束</a>
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
<%end%>
|
<%end%>
|
||||||
<span class="span_wping">
|
<span class="span_wping">
|
||||||
<%= link_to(
|
<%= link_to(
|
||||||
l(:button_edit),
|
l(:button_edit),
|
||||||
{:action => 'edit', :controller=>'bids', :course_id =>@course.id, :bid_id => bid.id}
|
{:action => 'edit', :controller=>'bids', :course_id =>@course.id, :bid_id => bid.id}
|
||||||
) %>
|
) %>
|
||||||
</span>
|
</span>
|
||||||
<%#= link_to(
|
<%#= link_to(
|
||||||
l(:button_delete),
|
l(:button_delete),
|
||||||
{:action => 'homework_destroy', :controller=>'bids', :course_id => bid.id},
|
{:action => 'homework_destroy', :controller=>'bids', :course_id => bid.id},
|
||||||
:method => :post,
|
:method => :post,
|
||||||
:data => {:confirm => l(:text_are_you_sure)},
|
:data => {:confirm => l(:text_are_you_sure)},
|
||||||
:class => 'icon icon-del'
|
:class => 'icon icon-del'
|
||||||
) %>
|
) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2">
|
<td colspan="2">
|
||||||
<span class="font_lighter">
|
<span class="font_lighter">
|
||||||
<% bidding_project = bid.biding_projects.all
|
<% bidding_project = bid.biding_projects.all
|
||||||
temp = []
|
temp = []
|
||||||
bidding_project.each do |pro|
|
bidding_project.each do |pro|
|
||||||
if pro.project && pro.project.project_status
|
if pro.project && pro.project.project_status
|
||||||
temp << pro
|
temp << pro
|
||||||
end
|
end
|
||||||
temp
|
temp
|
||||||
end
|
end
|
||||||
%>
|
%>
|
||||||
<% if bid.homework_type == 1%>
|
<% if bid.homework_type == 1%>
|
||||||
<%= l(:label_x_homework_project, :count => bid.homeworks.count) %>
|
<%= l(:label_x_homework_project, :count => bid.homeworks.count) %>
|
||||||
(
|
(
|
||||||
<strong>
|
<strong>
|
||||||
<%= link_to bid.homeworks.count, course_for_bid_path(bid.id) %>
|
<%= link_to bid.homeworks.count, course_for_bid_path(bid.id) %>
|
||||||
</strong>)
|
</strong>)
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= l(:label_x_homework_project, :count => temp.count) %>
|
<%= l(:label_x_homework_project, :count => temp.count) %>
|
||||||
(
|
(
|
||||||
<strong>
|
<strong>
|
||||||
<%= link_to temp.count, course_for_bid_path(bid.id) %>
|
<%= link_to temp.count, course_for_bid_path(bid.id) %>
|
||||||
</strong>)
|
</strong>)
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2">
|
<td colspan="2">
|
||||||
<% if bid.reward_type.nil? or bid.reward_type == 1 %>
|
<% if bid.reward_type.nil? or bid.reward_type == 1 %>
|
||||||
<strong>
|
<strong>
|
||||||
<%= l(:label_bids_reward_method) %>
|
<%= l(:label_bids_reward_method) %>
|
||||||
<span style="color: #ed8924;font-family: 14px; font-family: '微软雅黑'">
|
<span style="color: #ed8924;font-family: 14px; font-family: '微软雅黑'">
|
||||||
<%= l(:label_call_bonus) %>
|
<%= l(:label_call_bonus) %>
|
||||||
|
|
||||||
<%= l(:label_RMB_sign) %>
|
<%= l(:label_RMB_sign) %>
|
||||||
<%= bid.budget%>
|
<%= bid.budget%>
|
||||||
</span>
|
</span>
|
||||||
</strong>
|
</strong>
|
||||||
<% elsif bid.reward_type == 2 %>
|
<% elsif bid.reward_type == 2 %>
|
||||||
<strong>
|
<strong>
|
||||||
<%= l(:label_bids_reward_method) %>
|
<%= l(:label_bids_reward_method) %>
|
||||||
<span style="color: #15bccf;font-family: 14px; font-family:' 微软雅黑'">
|
<span style="color: #15bccf;font-family: 14px; font-family:' 微软雅黑'">
|
||||||
<%= bid.budget%>
|
<%= bid.budget%>
|
||||||
</span>
|
</span>
|
||||||
</strong>
|
</strong>
|
||||||
<% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%#= l(:label_price) %><%#= l(:label_RMB_sign) %><%#= bid.budget%></strong></td> -->
|
<% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%#= l(:label_price) %><%#= l(:label_RMB_sign) %><%#= bid.budget%></strong></td> -->
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" width="580px" >
|
<td colspan="2" width="580px" >
|
||||||
<span class="font_description">
|
<span class="font_description">
|
||||||
<%=h sanitize(bid.description.html_safe) %>
|
<%=h sanitize(bid.description.html_safe) %>
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="text-align: left" colspan="2">
|
<td style="text-align: left" colspan="2">
|
||||||
<span class="font_lighter">
|
<span class="font_lighter">
|
||||||
<%= l(:label_end_time) %>
|
<%= l(:label_end_time) %>
|
||||||
:
|
:
|
||||||
<%= bid.deadline %>
|
<%= bid.deadline %>
|
||||||
</span>
|
</span>
|
||||||
<span style="float: right">
|
<span style="float: right">
|
||||||
<% if betweentime(bid.deadline) < 0 %>
|
<% if betweentime(bid.deadline) < 0 %>
|
||||||
<span style="color: red; float: right">
|
<span style="color: red; float: right">
|
||||||
<%= l(:label_commit_limit)%>
|
<%= l(:label_commit_limit)%>
|
||||||
</span>
|
</span>
|
||||||
<% else %>
|
<% else %>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
window.setInterval(function(){ShowCountDown(<%= bid.deadline.year%>,<%= bid.deadline.month%>,<%= bid.deadline.day + 1%>,"show_deadtime_span_<%= bid.id%>");},1000)
|
window.setInterval(function(){ShowCountDown(<%= bid.deadline.year%>,<%= bid.deadline.month%>,<%= bid.deadline.day + 1%>,"show_deadtime_span_<%= bid.id%>");},1000)
|
||||||
</script>
|
</script>
|
||||||
<span id="show_deadtime_span_<%= bid.id%>" style="float: right">
|
<span id="show_deadtime_span_<%= bid.id%>" style="float: right">
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table></td>
|
</table></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<div class="pagination">
|
<div class="pagination">
|
||||||
<%= pagination_links_full bid_pages %>
|
<%= pagination_links_full bid_pages %>
|
||||||
</div>
|
</div>
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
<%= form_for @message, :url =>{:controller=>'messages',:action => 'new', :board_id => @board.id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
|
||||||
|
|
||||||
|
<%= render :partial => 'form_course', :locals => {:f => f, :topic => @message} %>
|
||||||
|
<li>
|
||||||
|
<a href="javascript:void(0)" onclick="show_newtalk();" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
|
||||||
|
<a href="#" onclick="submitProjectsBoard('<%= @message.id %>')" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
@ -0,0 +1,43 @@
|
|||||||
|
|
||||||
|
<% if topic.project %>
|
||||||
|
<%#= board_breadcrumb(@message) %>
|
||||||
|
<!--<h3><%#= avatar(@topic.author, :size => "24") %><span style = "width:100%;word-break:break-all;word-wrap: break-word;"><%#=h @topic.subject %></span></h3>-->
|
||||||
|
<div class="talk_new ml15">
|
||||||
|
<ul>
|
||||||
|
<%= form_for topic, { :as => :message,
|
||||||
|
:url => {:controller => 'messages',:action => 'edit', :is_board => 'true',:id => topic.id, :board_id => topic.board_id},
|
||||||
|
:html => {:multipart => true,
|
||||||
|
:id => 'message-form' + topic.id.to_s,
|
||||||
|
:method => :post}
|
||||||
|
} do |f| %>
|
||||||
|
<%= render :partial => 'form_project',
|
||||||
|
:locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
|
||||||
|
<a href="javascript:void(0)" onclick="submitProjectsBoard('<%= topic.id%>');" class="blue_btn fl c_white" ><%= l(:button_submit)%></a>
|
||||||
|
<a href="javascript:void(0)" onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" class="blue_btn grey_btn fl c_white"><%= l(:button_cancel) %></a>
|
||||||
|
<%#= link_to l(:button_cancel), board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "blue_btn grey_btn fl c_white" %>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
<% elsif topic.course %>
|
||||||
|
<%#= course_board_breadcrumb(@message) %>
|
||||||
|
<div class="talk_new ml15">
|
||||||
|
<ul>
|
||||||
|
<%= form_for topic, {
|
||||||
|
:as => :message,
|
||||||
|
:url => {:controller => 'messages',:action => 'edit', :is_board => 'true',:id => topic.id, :board_id => topic.board_id},
|
||||||
|
:html => {:multipart => true,
|
||||||
|
:id => 'message-form' + topic.id.to_s,
|
||||||
|
:method => :post}
|
||||||
|
} do |f| %>
|
||||||
|
<%= render :partial => 'form_course',
|
||||||
|
:locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
|
||||||
|
<a href="javascript:void(0)" onclick="submitProjectsBoard('<%= topic.id%>');"class="blue_btn fl c_white"><%= l(:button_submit)%></a>
|
||||||
|
<a href="javascript:void(0)" onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" class="blue_btn grey_btn fl c_white"><%= l(:button_cancel) %></a>
|
||||||
|
|
||||||
|
<% end %>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
|
||||||
|
<div id="preview" class="wiki"></div>
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
<%= form_for @message, :url =>{:controller=>'messages',:action => 'new', :board_id => @board.id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
|
||||||
|
|
||||||
|
<%= render :partial => 'form_project', :locals => {:f => f, :topic => @message} %>
|
||||||
|
<li>
|
||||||
|
<a href="javascript:void(0)" onclick="show_newtalk();" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
|
||||||
|
|
||||||
|
<a href="#" onclick="submitProjectsBoard('<%= @message.id %>')" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue