Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
commit
78f30344b9
@ -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,96 +1,96 @@
|
|||||||
source 'http://ruby.taobao.org'
|
source 'http://ruby.taobao.org'
|
||||||
#source 'http://ruby.sdutlinux.org/'
|
#source 'http://ruby.sdutlinux.org/'
|
||||||
|
|
||||||
unless RUBY_PLATFORM =~ /w32/
|
unless RUBY_PLATFORM =~ /w32/
|
||||||
# unix-like only
|
# unix-like only
|
||||||
gem 'iconv'
|
gem 'iconv'
|
||||||
end
|
end
|
||||||
|
|
||||||
gem "mysql2", "= 0.3.18"
|
gem "mysql2", "= 0.3.18"
|
||||||
gem 'redis-rails'
|
gem 'redis-rails'
|
||||||
gem 'rubyzip'
|
gem 'rubyzip'
|
||||||
gem 'delayed_job_active_record'#, :group => :production
|
gem 'delayed_job_active_record'#, :group => :production
|
||||||
gem 'daemons'
|
gem 'daemons'
|
||||||
gem 'grape', '~> 0.9.0'
|
gem 'grape', '~> 0.9.0'
|
||||||
gem 'grape-entity'
|
gem 'grape-entity'
|
||||||
gem 'seems_rateable', '~> 1.0.13'
|
gem 'seems_rateable', '~> 1.0.13'
|
||||||
gem "rails", "3.2.13"
|
gem "rails", "3.2.13"
|
||||||
gem "jquery-rails", "~> 2.0.2"
|
gem "jquery-rails", "~> 2.0.2"
|
||||||
gem "i18n", "~> 0.6.0"
|
gem "i18n", "~> 0.6.0"
|
||||||
gem 'coderay', '~> 1.1.0'
|
gem 'coderay', '~> 1.1.0'
|
||||||
gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
|
gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
|
||||||
gem "builder", "3.0.0"
|
gem "builder", "3.0.0"
|
||||||
gem 'acts-as-taggable-on', '2.4.1'
|
gem 'acts-as-taggable-on', '2.4.1'
|
||||||
gem 'spreadsheet'
|
gem 'spreadsheet'
|
||||||
gem 'ruby-ole'
|
gem 'ruby-ole'
|
||||||
gem 'rails_kindeditor',path:'lib/rails_kindeditor'
|
gem 'rails_kindeditor',path:'lib/rails_kindeditor'
|
||||||
group :development do
|
group :development do
|
||||||
gem 'grape-swagger'
|
gem 'grape-swagger'
|
||||||
#gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
|
#gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
|
||||||
gem 'puma' if RbConfig::CONFIG['host_os'] =~ /linux/
|
gem 'puma' if RbConfig::CONFIG['host_os'] =~ /linux/
|
||||||
gem 'pry-rails'
|
gem 'pry-rails'
|
||||||
if RUBY_VERSION >= '2.0.0'
|
if RUBY_VERSION >= '2.0.0'
|
||||||
gem 'pry-byebug'
|
gem 'pry-byebug'
|
||||||
else
|
else
|
||||||
# gem 'pry-debugger'
|
# gem 'pry-debugger'
|
||||||
end
|
end
|
||||||
gem 'pry-stack_explorer'
|
gem 'pry-stack_explorer'
|
||||||
gem 'better_errors', '~> 1.1.0'
|
gem 'better_errors', '~> 1.1.0'
|
||||||
gem 'rack-mini-profiler', '~> 0.9.3'
|
gem 'rack-mini-profiler', '~> 0.9.3'
|
||||||
end
|
end
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
gem "shoulda", "~> 3.5.0"
|
gem "shoulda", "~> 3.5.0"
|
||||||
gem "mocha", "~> 1.1.0"
|
gem "mocha", "~> 1.1.0"
|
||||||
gem 'capybara', '~> 2.4.1'
|
gem 'capybara', '~> 2.4.1'
|
||||||
gem 'nokogiri', '~> 1.6.3'
|
gem 'nokogiri', '~> 1.6.3'
|
||||||
gem 'factory_girl', '~> 4.4.0'
|
gem 'factory_girl', '~> 4.4.0'
|
||||||
gem 'selenium-webdriver', '~> 2.42.0'
|
gem 'selenium-webdriver', '~> 2.42.0'
|
||||||
|
|
||||||
gem "faker"
|
gem "faker"
|
||||||
# platforms :mri, :mingw do
|
# platforms :mri, :mingw do
|
||||||
# group :rmagick do
|
# group :rmagick do
|
||||||
# # RMagick 2 supports ruby 1.9
|
# # RMagick 2 supports ruby 1.9
|
||||||
# # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
|
# # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
|
||||||
# # different requirements for the same gem on different platforms
|
# # different requirements for the same gem on different platforms
|
||||||
# gem "rmagick", ">= 2.0.0"
|
# gem "rmagick", ">= 2.0.0"
|
||||||
# end
|
# end
|
||||||
#end
|
#end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Gems used only for assets and not required
|
# Gems used only for assets and not required
|
||||||
# in production environments by default.
|
# in production environments by default.
|
||||||
group :assets do
|
group :assets do
|
||||||
gem 'sass-rails', '~> 3.2.3'
|
gem 'sass-rails', '~> 3.2.3'
|
||||||
gem 'coffee-rails', '~> 3.2.1'
|
gem 'coffee-rails', '~> 3.2.1'
|
||||||
|
|
||||||
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
|
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
|
||||||
gem 'therubyracer', :platforms => :ruby
|
gem 'therubyracer', :platforms => :ruby
|
||||||
|
|
||||||
gem 'uglifier', '>= 1.0.3'
|
gem 'uglifier', '>= 1.0.3'
|
||||||
end
|
end
|
||||||
|
|
||||||
# Optional gem for LDAP authentication
|
# Optional gem for LDAP authentication
|
||||||
group :ldap do
|
group :ldap do
|
||||||
gem "net-ldap", "~> 0.3.1"
|
gem "net-ldap", "~> 0.3.1"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
# Optional gem for OpenID authentication
|
# Optional gem for OpenID authentication
|
||||||
group :openid do
|
group :openid do
|
||||||
gem "ruby-openid", "~> 2.1.4", :require => "openid"
|
gem "ruby-openid", "~> 2.1.4", :require => "openid"
|
||||||
gem "rack-openid"
|
gem "rack-openid"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
database_file = File.join(File.dirname(__FILE__), "config/database.yml")
|
database_file = File.join(File.dirname(__FILE__), "config/database.yml")
|
||||||
if File.exist?(database_file)
|
if File.exist?(database_file)
|
||||||
else
|
else
|
||||||
warn("Please configure your config/database.yml first")
|
warn("Please configure your config/database.yml first")
|
||||||
end
|
end
|
||||||
|
|
||||||
# Load plugins' Gemfiles
|
# Load plugins' Gemfiles
|
||||||
Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
|
Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
|
||||||
puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
|
puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
|
||||||
instance_eval File.read(file)
|
instance_eval File.read(file)
|
||||||
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,8 @@
|
|||||||
$('#attachments_<%= j params[:attachment_id] %>').remove();
|
$('#attachments_<%= j params[:attachment_id] %>').remove();
|
||||||
var count=$('#attachments_fields>span').length;
|
var count=$('#attachments_fields>span').length;
|
||||||
if(count<=0){
|
if(count<=0){
|
||||||
$("#upload_file_count").text(<%= l(:label_no_file_uploaded)%>);
|
$("#upload_file_count").text(<%= l(:label_no_file_uploaded)%>);
|
||||||
$(".remove_all").remove();
|
$(".remove_all").remove();
|
||||||
}else{
|
}else{
|
||||||
$("#upload_file_count").html("已上传"+"<span id=\"count\">"+count+"</span>"+"个文件");
|
$("#upload_file_count").html("已上传"+"<span id=\"count\">"+count+"</span>"+"个文件");
|
||||||
}
|
}
|
||||||
@ -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>
|
||||||
@ -1,10 +1,10 @@
|
|||||||
$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
|
$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
|
||||||
$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_memo_create_succ)}) %>");
|
$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_memo_create_succ)}) %>");
|
||||||
showModal('ajax-modal', '250px');
|
showModal('ajax-modal', '250px');
|
||||||
//$('#ajax-modal').css('height','111px');
|
//$('#ajax-modal').css('height','111px');
|
||||||
$('#ajax-modal').siblings().remove();
|
$('#ajax-modal').siblings().remove();
|
||||||
$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
|
$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
|
||||||
"<a href='javascript:' onclick='close_alert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
|
"<a href='javascript:' onclick='close_alert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
|
||||||
$('#ajax-modal').parent().removeClass("alert_praise");
|
$('#ajax-modal').parent().removeClass("alert_praise");
|
||||||
$('#ajax-modal').parent().css("top","").css("left","");
|
$('#ajax-modal').parent().css("top","").css("left","");
|
||||||
$('#ajax-modal').parent().addClass("poll_alert_form");
|
$('#ajax-modal').parent().addClass("poll_alert_form");
|
||||||
@ -1,10 +1,10 @@
|
|||||||
$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
|
$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
|
||||||
$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>");
|
$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>");
|
||||||
showModal('ajax-modal', '250px');
|
showModal('ajax-modal', '250px');
|
||||||
//$('#ajax-modal').css('height','80px');
|
//$('#ajax-modal').css('height','80px');
|
||||||
$('#ajax-modal').siblings().remove();
|
$('#ajax-modal').siblings().remove();
|
||||||
$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
|
$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
|
||||||
"<a href='javascript:' onclick='close_alert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
|
"<a href='javascript:' onclick='close_alert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
|
||||||
$('#ajax-modal').parent().removeClass("alert_praise");
|
$('#ajax-modal').parent().removeClass("alert_praise");
|
||||||
$('#ajax-modal').parent().css("top","").css("left","");
|
$('#ajax-modal').parent().css("top","").css("left","");
|
||||||
$('#ajax-modal').parent().addClass("poll_alert_form");
|
$('#ajax-modal').parent().addClass("poll_alert_form");
|
||||||
@ -1,110 +1,110 @@
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
// $(this).ready(function(){
|
// $(this).ready(function(){
|
||||||
// $('.tag_show').hover(function() {
|
// $('.tag_show').hover(function() {
|
||||||
// $(this).children("span").show();
|
// $(this).children("span").show();
|
||||||
// }, function() {
|
// }, function() {
|
||||||
// $(this).children("span").hide();
|
// $(this).children("span").hide();
|
||||||
// });
|
// });
|
||||||
// })
|
// })
|
||||||
</script>
|
</script>
|
||||||
<!-- 1代表是user类型 2代表是project类型 3代表是issue类型 4代表需求 7代表竞赛 9代表课程-->
|
<!-- 1代表是user类型 2代表是project类型 3代表是issue类型 4代表需求 7代表竞赛 9代表课程-->
|
||||||
<% @tags = obj.reload.tag_list %>
|
<% @tags = obj.reload.tag_list %>
|
||||||
<% if non_list_all and (@tags.size > 0) %>
|
<% if non_list_all and (@tags.size > 0) %>
|
||||||
<!-- 这里是显示的非主页的tag 所以当tag数量较多时 不必全部显示 用“更多”代替 -->
|
<!-- 这里是显示的非主页的tag 所以当tag数量较多时 不必全部显示 用“更多”代替 -->
|
||||||
<% if @tags.size > Setting.show_tags_length.to_i then %>
|
<% if @tags.size > Setting.show_tags_length.to_i then %>
|
||||||
<% i = 0 %>
|
<% i = 0 %>
|
||||||
<% until i>Setting.show_tags_length.to_i do %>
|
<% until i>Setting.show_tags_length.to_i do %>
|
||||||
<div id="tag">
|
<div id="tag">
|
||||||
<%= link_to @tags[i], :controller => "tags", :action => "index", :q => @tags[i], :object_flag => object_flag, :obj_id => obj.id %>
|
<%= link_to @tags[i], :controller => "tags", :action => "index", :q => @tags[i], :object_flag => object_flag, :obj_id => obj.id %>
|
||||||
</div>
|
</div>
|
||||||
<% i += 1 %>
|
<% i += 1 %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= more_tags(obj.id,object_flag)%>
|
<%= more_tags(obj.id,object_flag)%>
|
||||||
<% else %>
|
<% else %>
|
||||||
<% @tags.each do |tag| %>
|
<% @tags.each do |tag| %>
|
||||||
<div id="tag">
|
<div id="tag">
|
||||||
<%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
|
<%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<!-- 用来显示三大对象的主页中的tag 故是全部显示 -->
|
<!-- 用来显示三大对象的主页中的tag 故是全部显示 -->
|
||||||
<% if @tags.size > 0 %>
|
<% if @tags.size > 0 %>
|
||||||
<% @tags.each do |tag| %>
|
<% @tags.each do |tag| %>
|
||||||
<!--object_flag == '2'为项目 项目暂时单独出来，后面其它几个选项也需样式重构-->
|
<!--object_flag == '2'为项目 项目暂时单独出来，后面其它几个选项也需样式重构-->
|
||||||
<% if object_flag == '2' %>
|
<% if object_flag == '2' %>
|
||||||
<span class="re_tag f_l">
|
<span class="re_tag f_l">
|
||||||
<%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id, :class => 'pt5' %>
|
<%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id, :class => 'pt5' %>
|
||||||
<% if (ProjectInfo.find_by_project_id(obj.id)).try(:user_id) == User.current.id %>
|
<% if (ProjectInfo.find_by_project_id(obj.id)).try(:user_id) == User.current.id %>
|
||||||
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id, :taggable_type => object_flag %>
|
:taggable_id => obj.id, :taggable_type => object_flag %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
<% else %>
|
<% else %>
|
||||||
<div id="tag">
|
<div id="tag">
|
||||||
<span class="tag_show">
|
<span class="tag_show">
|
||||||
<%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
|
<%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
|
||||||
<!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
|
<!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
|
||||||
<% case object_flag %>
|
<% case object_flag %>
|
||||||
<% when '1' %>
|
<% when '1' %>
|
||||||
<% if User.current.eql?(obj) %>
|
<% if User.current.eql?(obj) %>
|
||||||
<span class='del'>
|
<span class='del'>
|
||||||
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id, :taggable_type => object_flag %>
|
:taggable_id => obj.id, :taggable_type => object_flag %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% when '3' %>
|
<% when '3' %>
|
||||||
<% if (ProjectInfo.find_by_project_id(obj.project_id)).try(:user_id) == User.current.id %>
|
<% if (ProjectInfo.find_by_project_id(obj.project_id)).try(:user_id) == User.current.id %>
|
||||||
<span class='del'>
|
<span class='del'>
|
||||||
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id, :taggable_type => object_flag %>
|
:taggable_id => obj.id, :taggable_type => object_flag %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% when '4' %>
|
<% when '4' %>
|
||||||
<% if obj.author_id == User.current.id %>
|
<% if obj.author_id == User.current.id %>
|
||||||
<span class='del'>
|
<span class='del'>
|
||||||
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id, :taggable_type => object_flag %>
|
:taggable_id => obj.id, :taggable_type => object_flag %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% when '5' %>
|
<% when '5' %>
|
||||||
<% test = Forum.find(obj.id) %>
|
<% test = Forum.find(obj.id) %>
|
||||||
<% if test && test.creator_id == User.current.id %>
|
<% if test && test.creator_id == User.current.id %>
|
||||||
<span class='del'>
|
<span class='del'>
|
||||||
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id, :taggable_type => object_flag %>
|
:taggable_id => obj.id, :taggable_type => object_flag %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% when '6' %>
|
<% when '6' %>
|
||||||
<%# if (User.current.logged? &&
|
<%# if (User.current.logged? &&
|
||||||
User.current.admin?
|
User.current.admin?
|
||||||
# && (@project && User.current.member_of?(@project))
|
# && (@project && User.current.member_of?(@project))
|
||||||
)
|
)
|
||||||
%>
|
%>
|
||||||
<% if obj.author_id == User.current.id || User.current.admin?%>
|
<% if obj.author_id == User.current.id || User.current.admin?%>
|
||||||
<span class='del'>
|
<span class='del'>
|
||||||
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id, :taggable_type => object_flag %>
|
:taggable_id => obj.id, :taggable_type => object_flag %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% when '7' %>
|
<% when '7' %>
|
||||||
<% if obj.author_id == User.current.id %>
|
<% if obj.author_id == User.current.id %>
|
||||||
<span class='del'>
|
<span class='del'>
|
||||||
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id, :taggable_type => object_flag %>
|
:taggable_id => obj.id, :taggable_type => object_flag %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% when '9' %>
|
<% when '9' %>
|
||||||
<% if (CourseInfos.find_by_course_id(obj.id)).try(:user_id) == User.current.id %>
|
<% if (CourseInfos.find_by_course_id(obj.id)).try(:user_id) == User.current.id %>
|
||||||
<span class='del'>
|
<span class='del'>
|
||||||
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id, :taggable_type => object_flag %>
|
:taggable_id => obj.id, :taggable_type => object_flag %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -1,11 +1,11 @@
|
|||||||
<% selector = ".#{watcher_css(watched)}" %>
|
<% selector = ".#{watcher_css(watched)}" %>
|
||||||
<% id_selector = "#{watcher_css(watched)}" %>
|
<% id_selector = "#{watcher_css(watched)}" %>
|
||||||
if($("<%= selector %>").get(0) == undefined)
|
if($("<%= selector %>").get(0) == undefined)
|
||||||
{
|
{
|
||||||
$("#<%= id_selector %>").each(function(){$(this).replaceWith("<%= escape_javascript watcher_link_for_project(watched, user) %>")});
|
$("#<%= id_selector %>").each(function(){$(this).replaceWith("<%= escape_javascript watcher_link_for_project(watched, user) %>")});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript watcher_link(watched, user) %>")});
|
$("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript watcher_link(watched, user) %>")});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,25 +1,25 @@
|
|||||||
<li style="overflow:hidden;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'>
|
<li style="overflow:hidden;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'>
|
||||||
<div style="float: left;">
|
<div style="float: left;">
|
||||||
<%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
|
<%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
|
||||||
</div>
|
</div>
|
||||||
<!-- 上左下右 -->
|
<!-- 上左下右 -->
|
||||||
<div style="float: left; margin-left: 10px; width: 380px;">
|
<div style="float: left; margin-left: 10px; width: 380px;">
|
||||||
<% unless project.is_public %>
|
<% unless project.is_public %>
|
||||||
<span class="private_project">
|
<span class="private_project">
|
||||||
<%= l(:label_private) %>
|
<%= l(:label_private) %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
|
<%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
|
||||||
(<%= link_to l(:label_project_member_amount, :count => projectCount(project)), project_member_path(project) ,:course =>'0' %>)
|
(<%= link_to l(:label_project_member_amount, :count => projectCount(project)), project_member_path(project) ,:course =>'0' %>)
|
||||||
</div>
|
</div>
|
||||||
<div style=" float: left;margin:5px; margin-left: 10px; width: 380px;min-height: 42px;">
|
<div style=" float: left;margin:5px; margin-left: 10px; width: 380px;min-height: 42px;">
|
||||||
<span class='font_lighter' title ='<%= project.short_description%>'> <%=project.description.truncate(90, omission: '...')%> </span>
|
<span class='font_lighter' title ='<%= project.short_description%>'> <%=project.description.truncate(90, omission: '...')%> </span>
|
||||||
</div>
|
</div>
|
||||||
<div >
|
<div >
|
||||||
<%= content_tag "span", l(:label_project_score)+ ":" + red_project_scores(project).to_i.to_s,
|
<%= content_tag "span", l(:label_project_score)+ ":" + red_project_scores(project).to_i.to_s,
|
||||||
:style => "cursor: pointer; display: inline-block; float: right; color: #ec6300;",
|
:style => "cursor: pointer; display: inline-block; float: right; color: #ec6300;",
|
||||||
:title => l(:label_project_score_tips),
|
:title => l(:label_project_score_tips),
|
||||||
:class => "tooltip",
|
:class => "tooltip",
|
||||||
:id => "tooltip-#{project.id}" %>
|
:id => "tooltip-#{project.id}" %>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
|||||||
source 'http://ruby.taobao.org'
|
source 'http://ruby.taobao.org'
|
||||||
|
|
||||||
gem 'rich', '1.4.6'
|
gem 'rich', '1.4.6'
|
||||||
gem 'kaminari'
|
gem 'kaminari'
|
||||||
gem 'htmlentities'
|
gem 'htmlentities'
|
||||||
gem 'paperclip', '~> 3.5.4'
|
gem 'paperclip', '~> 3.5.4'
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue