Conflicts: app/controllers/news_controller.rb app/views/users/_user_message_userfeedaback.html.erbhjq_new_course
commit
5681d329d6
@ -1,185 +1,185 @@
|
|||||||
# Redmine - project management software
|
# Redmine - project management software
|
||||||
# Copyright (C) 2006-2013 Jean-Philippe Lang
|
# Copyright (C) 2006-2013 Jean-Philippe Lang
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or
|
# This program is free software; you can redistribute it and/or
|
||||||
# modify it under the terms of the GNU General Public License
|
# modify it under the terms of the GNU General Public License
|
||||||
# as published by the Free Software Foundation; either version 2
|
# as published by the Free Software Foundation; either version 2
|
||||||
# of the License, or (at your option) any later version.
|
# of the License, or (at your option) any later version.
|
||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful,
|
# This program is distributed in the hope that it will be useful,
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
class Member < ActiveRecord::Base
|
class Member < ActiveRecord::Base
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
belongs_to :principal, :foreign_key => 'user_id'
|
belongs_to :principal, :foreign_key => 'user_id'
|
||||||
has_many :member_roles, :dependent => :destroy
|
has_many :member_roles, :dependent => :destroy
|
||||||
has_many :roles, :through => :member_roles
|
has_many :roles, :through => :member_roles
|
||||||
|
|
||||||
belongs_to :project
|
belongs_to :project
|
||||||
belongs_to :course
|
belongs_to :course
|
||||||
|
|
||||||
belongs_to :course_group
|
belongs_to :course_group
|
||||||
validates_presence_of :principal
|
validates_presence_of :principal
|
||||||
validates_uniqueness_of :user_id, :scope => [:project_id,:course_id]
|
validates_uniqueness_of :user_id, :scope => [:project_id,:course_id]
|
||||||
validate :validate_role
|
validate :validate_role
|
||||||
|
|
||||||
before_destroy :set_issue_category_nil
|
before_destroy :set_issue_category_nil
|
||||||
# 删除项目成员一并删除该成员的邀请记录
|
# 删除项目成员一并删除该成员的邀请记录
|
||||||
after_destroy :delete_ivite_list
|
after_destroy :delete_ivite_list
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def role
|
def role
|
||||||
end
|
end
|
||||||
|
|
||||||
def role=
|
def role=
|
||||||
end
|
end
|
||||||
|
|
||||||
def name
|
def name
|
||||||
self.user.name
|
self.user.name
|
||||||
end
|
end
|
||||||
|
|
||||||
alias :base_role_ids= :role_ids=
|
alias :base_role_ids= :role_ids=
|
||||||
def role_ids=(arg)
|
def role_ids=(arg)
|
||||||
ids = (arg || []).collect(&:to_i) - [0]
|
ids = (arg || []).collect(&:to_i) - [0]
|
||||||
# Keep inherited roles
|
# Keep inherited roles
|
||||||
ids += member_roles.select {|mr| !mr.inherited_from.nil?}.collect(&:role_id)
|
ids += member_roles.select {|mr| !mr.inherited_from.nil?}.collect(&:role_id)
|
||||||
|
|
||||||
new_role_ids = ids - role_ids
|
new_role_ids = ids - role_ids
|
||||||
# Add new roles
|
# Add new roles
|
||||||
new_role_ids.each {|id| member_roles << MemberRole.new(:role_id => id) }
|
new_role_ids.each {|id| member_roles << MemberRole.new(:role_id => id) }
|
||||||
# Remove roles (Rails' #role_ids= will not trigger MemberRole#on_destroy)
|
# Remove roles (Rails' #role_ids= will not trigger MemberRole#on_destroy)
|
||||||
member_roles_to_destroy = member_roles.select {|mr| !ids.include?(mr.role_id)}
|
member_roles_to_destroy = member_roles.select {|mr| !ids.include?(mr.role_id)}
|
||||||
if member_roles_to_destroy.any?
|
if member_roles_to_destroy.any?
|
||||||
member_roles_to_destroy.each(&:destroy)
|
member_roles_to_destroy.each(&:destroy)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def <=>(member)
|
def <=>(member)
|
||||||
a, b = roles.sort.first, member.roles.sort.first
|
a, b = roles.sort.first, member.roles.sort.first
|
||||||
if a == b
|
if a == b
|
||||||
if principal
|
if principal
|
||||||
principal <=> member.principal
|
principal <=> member.principal
|
||||||
else
|
else
|
||||||
1
|
1
|
||||||
end
|
end
|
||||||
elsif a
|
elsif a
|
||||||
a <=> b
|
a <=> b
|
||||||
else
|
else
|
||||||
1
|
1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def deletable?
|
def deletable?
|
||||||
member_roles.detect {|mr| mr.inherited_from}.nil?
|
member_roles.detect {|mr| mr.inherited_from}.nil?
|
||||||
end
|
end
|
||||||
|
|
||||||
def include?(user)
|
def include?(user)
|
||||||
if principal.is_a?(Group)
|
if principal.is_a?(Group)
|
||||||
!user.nil? && user.groups.include?(principal)
|
!user.nil? && user.groups.include?(principal)
|
||||||
else
|
else
|
||||||
self.user == user
|
self.user == user
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_issue_category_nil
|
def set_issue_category_nil
|
||||||
if user
|
if user
|
||||||
# remove category based auto assignments for this member
|
# remove category based auto assignments for this member
|
||||||
#modify by nwb
|
#modify by nwb
|
||||||
if project
|
if project
|
||||||
IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
|
IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
|
||||||
elsif course
|
elsif course
|
||||||
#IssueCategory.update_all "assigned_to_id = NULL", ["course_id = ? AND assigned_to_id = ?", course.id, user.id]
|
#IssueCategory.update_all "assigned_to_id = NULL", ["course_id = ? AND assigned_to_id = ?", course.id, user.id]
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# 删除成员一并删除该成员的邀请信息
|
# 删除成员一并删除该成员的邀请信息
|
||||||
def delete_ivite_list
|
def delete_ivite_list
|
||||||
member_invite_lists = InviteList.where("user_id =? and project_id =?", self.user_id, self.project_id)
|
member_invite_lists = InviteList.where("user_id =? and project_id =?", self.user_id, self.project_id)
|
||||||
unless member_invite_lists.nil?
|
unless member_invite_lists.nil?
|
||||||
member_invite_lists.each do |member_invite_list|
|
member_invite_lists.each do |member_invite_list|
|
||||||
member_invite_list.destroy
|
member_invite_list.destroy
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Find or initilize a Member with an id, attributes, and for a Principal
|
# Find or initilize a Member with an id, attributes, and for a Principal
|
||||||
def self.edit_membership(id, new_attributes, principal=nil)
|
def self.edit_membership(id, new_attributes, principal=nil)
|
||||||
@membership = id.present? ? Member.find(id) : Member.new(:principal => principal)
|
@membership = id.present? ? Member.find(id) : Member.new(:principal => principal)
|
||||||
@membership.attributes = new_attributes
|
@membership.attributes = new_attributes
|
||||||
@membership
|
@membership
|
||||||
end
|
end
|
||||||
|
|
||||||
# Finds or initilizes a Member for the given project and principal
|
# Finds or initilizes a Member for the given project and principal
|
||||||
def self.find_or_new(project, principal)
|
def self.find_or_new(project, principal)
|
||||||
project_id = project.is_a?(Project) ? project.id : project
|
project_id = project.is_a?(Project) ? project.id : project
|
||||||
principal_id = principal.is_a?(Principal) ? principal.id : principal
|
principal_id = principal.is_a?(Principal) ? principal.id : principal
|
||||||
|
|
||||||
member = Member.find_by_project_id_and_user_id(project_id, principal_id)
|
member = Member.find_by_project_id_and_user_id(project_id, principal_id)
|
||||||
member ||= Member.new(:project_id => project_id, :user_id => principal_id)
|
member ||= Member.new(:project_id => project_id, :user_id => principal_id)
|
||||||
member
|
member
|
||||||
end
|
end
|
||||||
|
|
||||||
# 查找每个学生每个作业的评分
|
# 查找每个学生每个作业的评分
|
||||||
def student_homework_score
|
def student_homework_score
|
||||||
homework_score = StudentWork.find_by_sql("SELECT homework_commons.name,student_works.final_score as score
|
homework_score = StudentWork.find_by_sql("SELECT homework_commons.name,student_works.final_score as score
|
||||||
FROM student_works,homework_commons
|
FROM student_works,homework_commons
|
||||||
WHERE student_works.homework_common_id = homework_commons.id
|
WHERE student_works.homework_common_id = homework_commons.id
|
||||||
AND homework_commons.course_id = #{self.course_id}
|
AND homework_commons.course_id = #{self.course_id}
|
||||||
AND student_works.user_id = #{self.user_id}")
|
AND student_works.user_id = #{self.user_id}")
|
||||||
score_count = StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}").average(:final_score).try(:round, 2).to_f
|
score_count = StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}").average(:final_score).try(:round, 2).to_f
|
||||||
[homework_score, format("%0.2f", score_count)]
|
[homework_score, format("%0.2f", score_count)]
|
||||||
end
|
end
|
||||||
|
|
||||||
def student_work_score
|
def student_work_score
|
||||||
StudentWork.select("homework_commons.name, student_works.final_score").joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}")
|
StudentWork.select("homework_commons.name, student_works.final_score").joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}")
|
||||||
end
|
end
|
||||||
|
|
||||||
#当前课程的作业列表
|
#当前课程的作业列表
|
||||||
def homework_common_list
|
def homework_common_list
|
||||||
HomeworkCommon.where(:course_id => self.course_id)
|
HomeworkCommon.where(:course_id => self.course_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
#当前学生在指定作业内的得分
|
#当前学生在指定作业内的得分
|
||||||
def homework_common_score homework_common
|
def homework_common_score homework_common
|
||||||
StudentWork.select("IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
|
StudentWork.select("IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def student_work_score_avg
|
def student_work_score_avg
|
||||||
StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}").average(:final_score).try(:round, 2).to_f
|
StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}").average(:final_score).try(:round, 2).to_f
|
||||||
end
|
end
|
||||||
|
|
||||||
def student_work_score_sum
|
def student_work_score_sum
|
||||||
sql_select = "SELECT (SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))) as score
|
sql_select = "SELECT (SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))) as score
|
||||||
FROM student_works,homework_commons
|
FROM student_works,homework_commons
|
||||||
WHERE student_works.homework_common_id = homework_commons.id
|
WHERE student_works.homework_common_id = homework_commons.id
|
||||||
AND homework_commons.course_id = #{self.course_id}
|
AND homework_commons.course_id = #{self.course_id}
|
||||||
AND student_works.user_id = #{self.user_id}"
|
AND student_works.user_id = #{self.user_id}"
|
||||||
score = StudentWork.find_by_sql(sql_select)
|
score = StudentWork.find_by_sql(sql_select)
|
||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def validate_role
|
def validate_role
|
||||||
errors.add_on_empty :role if member_roles.empty? && roles.empty?
|
errors.add_on_empty :role if member_roles.empty? && roles.empty?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def searchTeacherAndAssistant project
|
def searchTeacherAndAssistant project
|
||||||
#searchPeopleByRoles(project, TeacherRoles)
|
#searchPeopleByRoles(project, TeacherRoles)
|
||||||
members = []
|
members = []
|
||||||
project.members.each do |m|
|
project.members.each do |m|
|
||||||
members << m if m && m.user && m.user.allowed_to?(:as_teacher,project)
|
members << m if m && m.user && m.user.allowed_to?(:as_teacher,project)
|
||||||
end
|
end
|
||||||
members
|
members
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -0,0 +1,64 @@
|
|||||||
|
<h3><%=l(:label_course_resource_list)%></h3>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="autoscroll">
|
||||||
|
<table class="list" style="width: 100%;table-layout: fixed">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
|
||||||
|
<th style="width: 60px;">
|
||||||
|
资源名称
|
||||||
|
</th>
|
||||||
|
<th style="width: 30px;">
|
||||||
|
资源大小
|
||||||
|
</th>
|
||||||
|
<th style="width: 25px;">
|
||||||
|
资源类型
|
||||||
|
</th>
|
||||||
|
<th style="width: 23px;">
|
||||||
|
上传时间
|
||||||
|
</th>
|
||||||
|
<th style="width: 15px;">
|
||||||
|
下载次数
|
||||||
|
</th>
|
||||||
|
<th style="width: 20px;">
|
||||||
|
上传者
|
||||||
|
</th>
|
||||||
|
<th style="width: 35px;">
|
||||||
|
所属课程
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<% @resource.each do |resource| %>
|
||||||
|
<tr class="<%= cycle("odd", "even") %>">
|
||||||
|
<td style="text-align: left;">
|
||||||
|
<%= link_to truncate(resource.filename, :length => 18), download_named_attachment_path(resource.id, resource.filename ), :title => resource.filename,:class=>'resourcesBlack'%>
|
||||||
|
</td>
|
||||||
|
<td style=" text-align: center;">
|
||||||
|
<%= number_to_human_size(resource.filesize)%>
|
||||||
|
</td>
|
||||||
|
<td style=" text-align: center;">
|
||||||
|
课程资源
|
||||||
|
</td>
|
||||||
|
<td style=" text-align: center;">
|
||||||
|
<%= format_date(resource.created_on)%>
|
||||||
|
</td>
|
||||||
|
<td style=" text-align: center;">
|
||||||
|
<%= resource.downloads %>
|
||||||
|
</td>
|
||||||
|
<td style=" text-align: center;">
|
||||||
|
<%= link_to(User.find(resource.author_id).realname, user_path(User.find(resource.author_id)) ) %>
|
||||||
|
</td>
|
||||||
|
<td style=" text-align: center;">
|
||||||
|
<%=link_to truncate(Course.find(resource.container_id).name, :length => 10), course_path(Course.find(resource.container_id)), :title => Course.find(resource.container_id).name, :class => "hidden fl w170" %>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<% end %>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="pagination">
|
||||||
|
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,75 @@
|
|||||||
|
<h3>
|
||||||
|
<%=l(:label_excellent_courses_list)%>
|
||||||
|
</h3>
|
||||||
|
|
||||||
|
<div class="autoscroll">
|
||||||
|
<table class="list" style="width: 100%;table-layout: fixed">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th style="width: 25px;">
|
||||||
|
序号
|
||||||
|
</th>
|
||||||
|
<th style="width: 120px;">
|
||||||
|
课程名
|
||||||
|
</th>
|
||||||
|
<th style="width: 50px;">
|
||||||
|
主讲老师
|
||||||
|
</th>
|
||||||
|
<th style="width: 30px;">
|
||||||
|
学生数
|
||||||
|
</th>
|
||||||
|
<th style="width: 25px;">
|
||||||
|
作业数
|
||||||
|
</th>
|
||||||
|
<th style="width: 25px;">
|
||||||
|
作品数
|
||||||
|
</th>
|
||||||
|
<th style="width: 25px;">
|
||||||
|
资源数
|
||||||
|
</th>
|
||||||
|
<th style="width: 70px;">
|
||||||
|
帖子数
|
||||||
|
</th>
|
||||||
|
<th style="width: 70px;">
|
||||||
|
动态数
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<% @courses.each do |course| %>
|
||||||
|
<tr class="<%= cycle("odd", "even") %>">
|
||||||
|
<td style="text-align: center;">
|
||||||
|
<%= course.id %>
|
||||||
|
</td>
|
||||||
|
<td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=course.name%>'>
|
||||||
|
<span>
|
||||||
|
<%= link_to(course.name, course_path(course.id)) %>
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td align="center">
|
||||||
|
<%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
|
||||||
|
</td>
|
||||||
|
<td align="center">
|
||||||
|
<%= studentCount(course) %>
|
||||||
|
</td>
|
||||||
|
<td class="center">
|
||||||
|
<%= course.homework_commons.count%>
|
||||||
|
</td>
|
||||||
|
<td class="center">
|
||||||
|
<%= student_works_num(course) %>
|
||||||
|
</td>
|
||||||
|
<td class="center">
|
||||||
|
<%= visable_attachemnts_incourse(course).count%>
|
||||||
|
</td>
|
||||||
|
<td class="center">
|
||||||
|
<%= course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", course.boards.first.id, nil).count %>
|
||||||
|
|
||||||
|
</td>
|
||||||
|
<td class="center">
|
||||||
|
<%= course.course_activities.count%>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<% end %>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,64 @@
|
|||||||
|
<h3><%=l(:label_project_resource_list)%></h3>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="autoscroll">
|
||||||
|
<table class="list" style="width: 100%;table-layout: fixed">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
|
||||||
|
<th style="width: 60px;">
|
||||||
|
资源名称
|
||||||
|
</th>
|
||||||
|
<th style="width: 30px;">
|
||||||
|
资源大小
|
||||||
|
</th>
|
||||||
|
<th style="width: 25px;">
|
||||||
|
资源类型
|
||||||
|
</th>
|
||||||
|
<th style="width: 23px;">
|
||||||
|
上传时间
|
||||||
|
</th>
|
||||||
|
<th style="width: 15px;">
|
||||||
|
下载次数
|
||||||
|
</th>
|
||||||
|
<th style="width: 20px;">
|
||||||
|
上传者
|
||||||
|
</th>
|
||||||
|
<th style="width: 35px;">
|
||||||
|
所属项目
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<% @pro_resource.each do |pro_resource| %>
|
||||||
|
<tr class="<%= cycle("odd", "even") %>">
|
||||||
|
<td style="text-align: left;">
|
||||||
|
<%= link_to truncate(pro_resource.filename, :length => 18), download_named_attachment_path(pro_resource.id, pro_resource.filename ), :title => pro_resource.filename,:class=>'resourcesBlack'%>
|
||||||
|
</td>
|
||||||
|
<td style=" text-align: center;">
|
||||||
|
<%= number_to_human_size(pro_resource.filesize)%>
|
||||||
|
</td>
|
||||||
|
<td style=" text-align: center;">
|
||||||
|
项目资源
|
||||||
|
</td>
|
||||||
|
<td style=" text-align: center;">
|
||||||
|
<%= format_date(pro_resource.created_on)%>
|
||||||
|
</td>
|
||||||
|
<td style=" text-align: center;">
|
||||||
|
<%= pro_resource.downloads %>
|
||||||
|
</td>
|
||||||
|
<td style=" text-align: center;">
|
||||||
|
<%= link_to(User.find(pro_resource.author_id).realname, user_path(User.find(pro_resource.author_id)) ) %>
|
||||||
|
</td>
|
||||||
|
<td style=" text-align: center;">
|
||||||
|
<%=link_to truncate(Project.find(pro_resource.container_id).name, :length => 10), project_path(Project.find(pro_resource.container_id)), :title => Project.find(pro_resource.container_id).name, :class => "hidden fl w170" %>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<% end %>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="pagination">
|
||||||
|
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
|
||||||
|
</div>
|
||||||
@ -1,21 +1,21 @@
|
|||||||
<div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
|
<div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
|
||||||
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
|
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
|
||||||
<div class="ReplyToMessageInputContainer mb10">
|
<div class="ReplyToMessageInputContainer mb10">
|
||||||
<div nhname='new_message_<%= reply.id%>'>
|
<div nhname='new_message_<%= reply.id%>'>
|
||||||
<%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
|
<%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
|
||||||
<input type="hidden" name="quote[quote]" id="quote_quote">
|
<input type="hidden" name="quote[quote]" id="quote_quote">
|
||||||
<% if course_id%>
|
<% if course_id%>
|
||||||
<input type="hidden" name="course_id" id="" value="<%= course_id%>">
|
<input type="hidden" name="course_id" id="" value="<%= course_id%>">
|
||||||
<% end %>
|
<% end %>
|
||||||
<input type="hidden" name="blog_comment[title]" id="reply_subject">
|
<input type="hidden" name="blog_comment[title]" id="reply_subject">
|
||||||
<div nhname='toolbar_container_<%= reply.id%>'></div>
|
<div nhname='toolbar_container_<%= reply.id%>'></div>
|
||||||
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
|
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
|
||||||
<a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
|
<a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<p nhname='contentmsg_<%= reply.id%>'></p>
|
<p nhname='contentmsg_<%= reply.id%>'></p>
|
||||||
<% end%>
|
<% end%>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
@ -0,0 +1 @@
|
|||||||
|
$("#st_groups").html("<%=escape_javascript(render :partial => 'new_groups_name', :locals => {:course_groups => @course_groups}) %>");
|
||||||
@ -1,86 +1,86 @@
|
|||||||
<ul>
|
<ul>
|
||||||
<% issue.journals.reorder("created_on desc").each do |reply| %>
|
<% issue.journals.reorder("created_on desc").each do |reply| %>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(function(){
|
$(function(){
|
||||||
showNormalImage('reply_content_<%= reply.id %>');
|
showNormalImage('reply_content_<%= reply.id %>');
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<% replies_all_i=replies_all_i + 1 %>
|
<% replies_all_i=replies_all_i + 1 %>
|
||||||
<li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();" >
|
<li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();" >
|
||||||
<div class="homepagePostReplyPortrait" >
|
<div class="homepagePostReplyPortrait" >
|
||||||
<%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
|
<%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
|
||||||
</div>
|
</div>
|
||||||
<div class="homepagePostReplyDes">
|
<div class="homepagePostReplyDes">
|
||||||
<div class="homepagePostReplyPublisher mt-4">
|
<div class="homepagePostReplyPublisher mt-4">
|
||||||
<% if reply.try(:user).try(:realname) == ' ' %>
|
<% if reply.try(:user).try(:realname) == ' ' %>
|
||||||
<%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
|
<%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
|
<%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%#= format_time(reply.created_on) %>
|
<%#= format_time(reply.created_on) %>
|
||||||
</div>
|
</div>
|
||||||
<div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
|
<div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
|
||||||
<% if reply.details.any? %>
|
<% if reply.details.any? %>
|
||||||
<% details_to_strings(reply.details).each do |string| %>
|
<% details_to_strings(reply.details).each do |string| %>
|
||||||
<p><%= string %></p>
|
<p><%= string %></p>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<P><%= reply.notes.html_safe %></P>
|
<P><%= reply.notes.html_safe %></P>
|
||||||
</div>
|
</div>
|
||||||
<div style="margin-top: 7px">
|
<div style="margin-top: 7px">
|
||||||
<%= format_time(reply.created_on) %>
|
<%= format_time(reply.created_on) %>
|
||||||
<div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
|
<div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
|
||||||
<%= link_to(
|
<%= link_to(
|
||||||
l(:button_reply),
|
l(:button_reply),
|
||||||
{:controller => 'issues', :action => 'reply', :user_id => reply.user_id, :id => issue.id, :journal_id => reply.id},
|
{:controller => 'issues', :action => 'reply', :user_id => reply.user_id, :id => issue.id, :journal_id => reply.id},
|
||||||
:remote => true,
|
:remote => true,
|
||||||
:method => 'get',
|
:method => 'get',
|
||||||
:class => 'fr newsBlue',
|
:class => 'fr newsBlue',
|
||||||
:title => l(:button_reply)) if User.current.logged? %>
|
:title => l(:button_reply)) if User.current.logged? %>
|
||||||
<%= link_to(
|
<%= link_to(
|
||||||
l(:button_delete),
|
l(:button_delete),
|
||||||
{:controller => 'issues',:action => 'delete_journal', :id => issue.id,:journal_id=>reply.id},
|
{:controller => 'issues',:action => 'delete_journal', :id => issue.id,:journal_id=>reply.id},
|
||||||
:method => :get,
|
:method => :get,
|
||||||
:remote=>true,
|
:remote=>true,
|
||||||
:class => 'fr newsGrey mr10',
|
:class => 'fr newsGrey mr10',
|
||||||
:data => {:confirm => l(:text_are_you_sure)},
|
:data => {:confirm => l(:text_are_you_sure)},
|
||||||
:title => l(:button_delete)
|
:title => l(:button_delete)
|
||||||
) if reply.user_id == User.current.id %>
|
) if reply.user_id == User.current.id %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p id="reply_message_<%= reply.id%>"></p>
|
<p id="reply_message_<%= reply.id%>"></p>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="homepagePostReplyContainer borderBottomNone minHeight48">
|
<div class="homepagePostReplyContainer borderBottomNone minHeight48">
|
||||||
|
|
||||||
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
|
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
|
||||||
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
|
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="homepagePostReplyInputContainer mb10">
|
<div class="homepagePostReplyInputContainer mb10">
|
||||||
<div nhname='new_message_<%= @issue.id %>' style="display:none;">
|
<div nhname='new_message_<%= @issue.id %>' style="display:none;">
|
||||||
<%= form_for('new_form',:url => add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %>
|
<%= form_for('new_form',:url => add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %>
|
||||||
<%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
|
<%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
|
||||||
<!--<div class="cl"></div>-->
|
<!--<div class="cl"></div>-->
|
||||||
<input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
|
<input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
|
||||||
<div nhname='toolbar_container_<%= @issue.id %>' ></div>
|
<div nhname='toolbar_container_<%= @issue.id %>' ></div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
|
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<div class="mt5 fl">
|
<div class="mt5 fl">
|
||||||
<%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
|
<%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
|
||||||
</div>
|
</div>
|
||||||
<span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
|
<span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
|
||||||
<a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" class="blue_n_btn fr mt5" style="display:none;">发送</a>
|
<a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr mt5" style="display:none;">发送</a>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
|
<!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
@ -1,27 +1,27 @@
|
|||||||
<div class="ReplyToMessageContainer borderBottomNone " id="reply_to_message_<%= @issue.id%>">
|
<div class="ReplyToMessageContainer borderBottomNone " id="reply_to_message_<%= @issue.id%>">
|
||||||
|
|
||||||
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
|
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
|
||||||
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
|
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="ReplyToMessageInputContainer mb10">
|
<div class="ReplyToMessageInputContainer mb10">
|
||||||
<div nhname='new_message_<%= @issue.id%>' style="display:none;">
|
<div nhname='new_message_<%= @issue.id%>' style="display:none;">
|
||||||
<%= form_for('new_form',:url => add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
|
<%= form_for('new_form',:url => add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
|
||||||
<%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
|
<%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
|
||||||
<!--<div class="cl"></div>-->
|
<!--<div class="cl"></div>-->
|
||||||
<input type="hidden" name="quote" value=""/>
|
<input type="hidden" name="quote" value=""/>
|
||||||
<input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
|
<input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
|
||||||
<div nhname='toolbar_container_<%= @issue.id%>' ></div>
|
<div nhname='toolbar_container_<%= @issue.id%>' ></div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
|
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
|
<span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
|
||||||
<a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
|
<a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
|
<!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -1,19 +1,19 @@
|
|||||||
|
|
||||||
<div class="ReplyToMessageContainer borderBottomNone" id="reply_to_message_<%= reply.id%>">
|
<div class="ReplyToMessageContainer borderBottomNone" id="reply_to_message_<%= reply.id%>">
|
||||||
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
|
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
|
||||||
<div class="ReplyToMessageInputContainer mb10">
|
<div class="ReplyToMessageInputContainer mb10">
|
||||||
<div nhname='new_message_<%= reply.id%>'>
|
<div nhname='new_message_<%= reply.id%>'>
|
||||||
<%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
|
<%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
|
||||||
<input type="hidden" name="quote[quote]" id="quote_quote">
|
<input type="hidden" name="quote[quote]" id="quote_quote">
|
||||||
<input type="hidden" name="reply[subject]" id="reply_subject">
|
<input type="hidden" name="reply[subject]" id="reply_subject">
|
||||||
<div nhname='toolbar_container_<%= reply.id%>'></div>
|
<div nhname='toolbar_container_<%= reply.id%>'></div>
|
||||||
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply[content]"></textarea>
|
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply[content]"></textarea>
|
||||||
<a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
|
<a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<p nhname='contentmsg_<%= reply.id%>'></p>
|
<p nhname='contentmsg_<%= reply.id%>'></p>
|
||||||
<% end%>
|
<% end%>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
@ -1,18 +1,18 @@
|
|||||||
<div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
|
<div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
|
||||||
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
|
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
|
||||||
<div class="ReplyToMessageInputContainer mb10">
|
<div class="ReplyToMessageInputContainer mb10">
|
||||||
<div nhname='new_message_<%= reply.id%>'>
|
<div nhname='new_message_<%= reply.id%>'>
|
||||||
<%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %>
|
<%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %>
|
||||||
<input type="hidden" name="quote[quote]" id="quote_quote">
|
<input type="hidden" name="quote[quote]" id="quote_quote">
|
||||||
<input type="hidden" name="org_document_comment[title]" id="reply_subject">
|
<input type="hidden" name="org_document_comment[title]" id="reply_subject">
|
||||||
<div nhname='toolbar_container_<%= reply.id%>'></div>
|
<div nhname='toolbar_container_<%= reply.id%>'></div>
|
||||||
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="org_document_comment[content]"></textarea>
|
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="org_document_comment[content]"></textarea>
|
||||||
<a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
|
<a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<p nhname='contentmsg_<%= reply.id%>'></p>
|
<p nhname='contentmsg_<%= reply.id%>'></p>
|
||||||
<% end%>
|
<% end%>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
@ -1,102 +1,102 @@
|
|||||||
<!-- 匿评作品列表，显示某一个作品的信息 -->
|
<!-- 匿评作品列表，显示某一个作品的信息 -->
|
||||||
<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
|
<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
|
||||||
<li class="hworkList340 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
|
<li class="hworkList340 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
|
||||||
<ul>
|
<ul>
|
||||||
<li class="hworkPortrait mt15 mr10">
|
<li class="hworkPortrait mt15 mr10">
|
||||||
<%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %>
|
<%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %>
|
||||||
</li>
|
</li>
|
||||||
<div onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
|
<div onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
|
||||||
<li class="hworkName mt15 mr15 <%= @homework.homework_type == 2 ? '' : 'width165'%>">
|
<li class="hworkName mt15 mr15 <%= @homework.homework_type == 2 ? '' : 'width165'%>">
|
||||||
<% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
|
<% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
|
||||||
<div>
|
<div>
|
||||||
<%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
|
<%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<% if @homework.homework_type != 3 %>
|
<% if @homework.homework_type != 3 %>
|
||||||
<ul class="mt10 fl">
|
<ul class="mt10 fl">
|
||||||
<li class="hworkStName mr10 mt16" title="<%= student_work.user.show_name%>">
|
<li class="hworkStName mr10 mt16" title="<%= student_work.user.show_name%>">
|
||||||
<%= student_work.user.show_name%>
|
<%= student_work.user.show_name%>
|
||||||
</li>
|
</li>
|
||||||
<li class="hworkStID mt16" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>">
|
<li class="hworkStID mt16" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>">
|
||||||
<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
|
<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
|
<% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
|
||||||
<ul class="mt10 fl">
|
<ul class="mt10 fl">
|
||||||
<li class="hworkPrName mr10 mt12" title="项目名称">
|
<li class="hworkPrName mr10 mt12" title="项目名称">
|
||||||
<%= student_work.project.name %>
|
<%= student_work.project.name %>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</li>
|
||||||
</div>
|
</div>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li class="hworkList130 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
|
<li class="hworkList130 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
|
||||||
<% if student_work.created_at && @homework.end_time%>
|
<% if student_work.created_at && @homework.end_time%>
|
||||||
<%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>
|
<%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>
|
||||||
<% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
|
<% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
|
||||||
<span class="c_red">[迟交]</span>
|
<span class="c_red">[迟交]</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</li>
|
||||||
<li class="hworkList50 <%= score_color student_work.teacher_score%>">
|
<li class="hworkList50 <%= score_color student_work.teacher_score%>">
|
||||||
<%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
|
<%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
|
||||||
</li>
|
</li>
|
||||||
<li class="hworkList50 <%= score_color student_work.teaching_asistant_score%>">
|
<li class="hworkList50 <%= score_color student_work.teaching_asistant_score%>">
|
||||||
<%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
|
<%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<% if @homework.homework_type == 2%>
|
<% if @homework.homework_type == 2%>
|
||||||
<!-- 系统评分 -->
|
<!-- 系统评分 -->
|
||||||
<li class="hworkList50 <%= score_color student_work.system_score%>">
|
<li class="hworkList50 <%= score_color student_work.system_score%>">
|
||||||
<%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
|
<%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
|
||||||
</li>
|
</li>
|
||||||
<% end%>
|
<% end%>
|
||||||
|
|
||||||
<% if @homework.anonymous_comment == 0%>
|
<% if @homework.anonymous_comment == 0%>
|
||||||
<li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
|
<li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
|
||||||
<%= student_work.student_score.nil? ? "未参与" : format("%.1f",student_work.student_score)%>
|
<%= student_work.student_score.nil? ? "未参与" : format("%.1f",student_work.student_score)%>
|
||||||
<% unless student_work.student_score.nil?%>
|
<% unless student_work.student_score.nil?%>
|
||||||
<span class="linkBlue">
|
<span class="linkBlue">
|
||||||
(<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
|
(<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
|
||||||
</span>
|
</span>
|
||||||
<div class="infoNi none">
|
<div class="infoNi none">
|
||||||
现共有
|
现共有
|
||||||
<span class="c_red"> <%= student_work.student_works_scores.where(:reviewer_role => 3).count%> </span>
|
<span class="c_red"> <%= student_work.student_works_scores.where(:reviewer_role => 3).count%> </span>
|
||||||
名学生进行了匿评，平均分为
|
名学生进行了匿评，平均分为
|
||||||
<span class="c_red"> <%= format("%.1f",student_work.student_score)%> </span>分。
|
<span class="c_red"> <%= format("%.1f",student_work.student_score)%> </span>分。
|
||||||
</div>
|
</div>
|
||||||
<% end%>
|
<% end%>
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
<!-- 成绩 -->
|
<!-- 成绩 -->
|
||||||
<% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
|
<% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
|
||||||
<li class="hworkList50 <%= score_color score%> student_final_scor_info">
|
<li class="hworkList50 <%= score_color score%> student_final_scor_info">
|
||||||
<%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
|
<%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
|
||||||
<% unless score.nil?%>
|
<% unless score.nil?%>
|
||||||
<div class="infoNi none width180">
|
<div class="infoNi none width180">
|
||||||
作品最终评分为
|
作品最终评分为
|
||||||
<span class="c_red"> <%= student_work.final_score%> </span>分。
|
<span class="c_red"> <%= student_work.final_score%> </span>分。
|
||||||
迟交扣分
|
迟交扣分
|
||||||
<span class="c_red"> <%= student_work.late_penalty%> </span>分，
|
<span class="c_red"> <%= student_work.late_penalty%> </span>分，
|
||||||
缺评扣分
|
缺评扣分
|
||||||
<span class="c_red"> <%= student_work.absence_penalty%> </span>分，
|
<span class="c_red"> <%= student_work.absence_penalty%> </span>分，
|
||||||
最终成绩为
|
最终成绩为
|
||||||
<span class="c_red"> <%= format("%.1f",score<0 ? 0 : score)%> </span>分。
|
<span class="c_red"> <%= format("%.1f",score<0 ? 0 : score)%> </span>分。
|
||||||
</div>
|
</div>
|
||||||
<% end%>
|
<% end%>
|
||||||
</li>
|
</li>
|
||||||
<li class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
|
<li class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
|
||||||
</ul>
|
</ul>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(".student_work_<%= student_work.id%>").mouseenter(function(){
|
$(".student_work_<%= student_work.id%>").mouseenter(function(){
|
||||||
if($("#about_hwork_<%= student_work.id%>").html().trim() == "") {
|
if($("#about_hwork_<%= student_work.id%>").html().trim() == "") {
|
||||||
$("#work_click_<%= student_work.id%>").show();
|
$("#work_click_<%= student_work.id%>").show();
|
||||||
}
|
}
|
||||||
}).mouseleave(function(){
|
}).mouseleave(function(){
|
||||||
$("#work_click_<%= student_work.id%>").hide();
|
$("#work_click_<%= student_work.id%>").hide();
|
||||||
}).mouse;
|
}).mouse;
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@ -1,36 +1,36 @@
|
|||||||
if($("#about_hwork_<%= @work.id%>").children().length > 0){
|
if($("#about_hwork_<%= @work.id%>").children().length > 0){
|
||||||
$("#about_hwork_<%= @work.id%>").html("");
|
$("#about_hwork_<%= @work.id%>").html("");
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
<% if @homework.homework_type == 2%>
|
<% if @homework.homework_type == 2%>
|
||||||
$("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
|
$("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
|
||||||
|
|
||||||
var program_name = "text/x-csrc";
|
var program_name = "text/x-csrc";
|
||||||
var language = <%= @homework.language %>;
|
var language = <%= @homework.language %>;
|
||||||
if (language == 1) {
|
if (language == 1) {
|
||||||
program_name = 'text/x-csrc';
|
program_name = 'text/x-csrc';
|
||||||
} else if(language==2){
|
} else if(language==2){
|
||||||
program_name = 'text/x-c++src';
|
program_name = 'text/x-c++src';
|
||||||
}else if(language==3){
|
}else if(language==3){
|
||||||
program_name = 'text/x-cython';
|
program_name = 'text/x-cython';
|
||||||
} else if(language==4){
|
} else if(language==4){
|
||||||
program_name = 'text/x-java';
|
program_name = 'text/x-java';
|
||||||
}
|
}
|
||||||
|
|
||||||
var editor = CodeMirror(document.getElementById("work-code_<%= @work.id%>"), {
|
var editor = CodeMirror(document.getElementById("work-code_<%= @work.id%>"), {
|
||||||
mode: {name: program_name,
|
mode: {name: program_name,
|
||||||
version: 2,
|
version: 2,
|
||||||
singleLineStringErrors: false},
|
singleLineStringErrors: false},
|
||||||
lineNumbers: true,
|
lineNumbers: true,
|
||||||
indentUnit: 2,
|
indentUnit: 2,
|
||||||
matchBrackets: true,
|
matchBrackets: true,
|
||||||
readOnly: true,
|
readOnly: true,
|
||||||
value: $("#work-src").text()
|
value: $("#work-src").text()
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
<% else%>
|
<% else%>
|
||||||
$("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
|
$("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
|
||||||
<% end%>
|
<% end%>
|
||||||
$('#score_<%= @work.id%>').peSlider({range: 'min'});
|
$('#score_<%= @work.id%>').peSlider({range: 'min'});
|
||||||
}
|
}
|
||||||
@ -0,0 +1,21 @@
|
|||||||
|
<ul class="subject-list-banner">
|
||||||
|
<li class="subject-list-name fl hidden"><span style="padding-left:15px;">作业名称</span></li>
|
||||||
|
<li class="subject-list-from fl">来源</li>
|
||||||
|
<li class="subject-list-type fl">类别</li>
|
||||||
|
<li class="subject-list-publisher fl">贡献者</li>
|
||||||
|
<li class="subject-list-count fl">
|
||||||
|
<%= link_to "引用数",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort),:class => "fl",:remote => true%>
|
||||||
|
<% if @order == "quotes"%>
|
||||||
|
<%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12" ,:remote => true%>
|
||||||
|
<% end%>
|
||||||
|
</li>
|
||||||
|
<li class="fl subject-list-date">
|
||||||
|
<%= link_to "发布时间",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "created_at", :sort => @r_sort),:class => "fl",:remote => true%>
|
||||||
|
<% if @order == "created_at"%>
|
||||||
|
<%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "created_at", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12" ,:remote => true%>
|
||||||
|
<% end%>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<div id="homework_repository">
|
||||||
|
<%=render :partial => 'homework_repository', :locals => {:homeworks => homeworks} %>
|
||||||
|
</div>
|
||||||
@ -1,33 +1,33 @@
|
|||||||
<% if AtMessage === ma && ma.at_valid? %>
|
<% if AtMessage === ma && ma.at_valid? %>
|
||||||
<ul class="homepageNewsList fl">
|
<ul class="homepageNewsList fl">
|
||||||
<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"),user_path(ma.author) %></a></li>
|
<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"),user_path(ma.author) %></a></li>
|
||||||
<li class="homepageNewsPubType fl">
|
<li class="homepageNewsPubType fl">
|
||||||
<span class="newsBlue homepageNewsPublisher"><%= ma.author.login %></span><span class="homepageNewsType fl">提到了你：</span>
|
<span class="newsBlue homepageNewsPublisher"><%= ma.author.login %></span><span class="homepageNewsType fl">提到了你：</span>
|
||||||
</li>
|
</li>
|
||||||
<li class="homepageNewsContent fl">
|
<li class="homepageNewsContent fl">
|
||||||
<% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
|
<% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
|
||||||
<%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,
|
<%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,
|
||||||
:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
|
:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
|
||||||
:class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
|
:class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
|
||||||
:onmouseover =>"message_titile_show($(this),event)",
|
:onmouseover =>"message_titile_show($(this),event)",
|
||||||
:onmouseout => "message_titile_hide($(this))" %>
|
:onmouseout => "message_titile_hide($(this))" %>
|
||||||
<% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
|
<% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
|
||||||
<%= link_to ma.subject.html_safe, project_boards_path(ma.at_message.project,
|
<%= link_to ma.subject.html_safe, project_boards_path(ma.at_message.project,
|
||||||
:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
|
:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
|
||||||
:class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
|
:class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
|
||||||
:onmouseover =>"message_titile_show($(this),event)",
|
:onmouseover =>"message_titile_show($(this),event)",
|
||||||
:onmouseout => "message_titile_hide($(this))" %>
|
:onmouseout => "message_titile_hide($(this))" %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= link_to ma.subject.html_safe, ma.url, :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
|
<%= link_to ma.subject.html_safe, ma.url, :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</li>
|
||||||
<div style="display: none" class="message_title_red system_message_style">
|
<div style="display: none" class="message_title_red system_message_style">
|
||||||
<p><strong>标题：</strong><%= ma.subject %></p>
|
<p><strong>标题：</strong><%= ma.subject %></p>
|
||||||
<% unless ma.description.nil? %>
|
<% unless ma.description.nil? %>
|
||||||
<div class="fl"><strong>内容：</strong></div>
|
<div class="fl"><strong>内容：</strong></div>
|
||||||
<div class="ml36"><%= ma.description.html_safe %></div>
|
<div class="ml36"><%= ma.description.html_safe %></div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||||
</ul>
|
</ul>
|
||||||
<% end %>
|
<% end %>
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,33 @@
|
|||||||
|
<ul class="resource-list-tab mt10" id="resource_tip_list">
|
||||||
|
<li class="resource-list-checkbox fl"> </li>
|
||||||
|
<li class="resource-list-name fl">资源名称</li>
|
||||||
|
<li class="resource-list-time fr">
|
||||||
|
<%= link_to "上传时间", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %>
|
||||||
|
<% if @order == "created_on" %>
|
||||||
|
<%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
|
||||||
|
<% end %>
|
||||||
|
</li>
|
||||||
|
<li class="resource-list-quote fr">
|
||||||
|
<%= link_to "引用数", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "quotes"), :class => "fl", :remote => true %>
|
||||||
|
<% if @order == "quotes" %>
|
||||||
|
<%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "quotes"), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
|
||||||
|
<% end %>
|
||||||
|
</li>
|
||||||
|
<li class="resource-list-download fr">
|
||||||
|
<%= link_to "下载数", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "downloads"), :class => "fl", :remote => true %>
|
||||||
|
<% if @order == "downloads" %>
|
||||||
|
<%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "downloads"), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
|
||||||
|
<% end %>
|
||||||
|
</li>
|
||||||
|
<li class="resource-list-size fr">
|
||||||
|
<div style="margin: 0 auto; width: 40px">
|
||||||
|
<%= link_to "大小", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "filesize"), :class => "fl", :remote => true %>
|
||||||
|
<% if @order == "filesize" %>
|
||||||
|
<%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "filesize"), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
<li class="resource-list-uploader fr">上传者</li>
|
||||||
|
<li class="resource-list-type fr">类别</li>
|
||||||
|
<li class="resource-list-from fr">来源</li>
|
||||||
|
</ul>
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
<ul class="resourcesSelect">
|
||||||
|
<li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
|
||||||
|
<ul class="resourcesType">
|
||||||
|
<li>
|
||||||
|
<a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 1)%>" id="resource_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部 </a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 2) %>" id="resource_type_course" class="homepagePostTypeAssignment postTypeGrey'" data-method="get" data-remote="true">课程资源 </a>
|
||||||
|
<%#= link_to '课程资源' ,user_resource_user_path(:id => @user.id, :type => 2), id="resource_type_course", :remote => true, :method => 'get', :class=> 'homepagePostTypeAssignment postTypeGrey' %>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 3) %>" id="resource_type_project" class="homepagePostTypeQuiz postTypeGrey" data-method="get" data-remote="true">项目资源 </a>
|
||||||
|
<%#= link_to '项目资源' ,user_resource_user_path(:id => @user.id, :type => 3), id="resource_type_project", :remote => true, :method => 'get', :class => 'homepagePostTypeQuiz postTypeGrey' %>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 5) %>" id="resource_type_user" class="resourcesTypeUser resourcesGrey" data-method="get" data-remote="true">用户资源 </a>
|
||||||
|
<%#= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5), id="resource_type_user", :remote=>true,:method => 'get', :class=>'resourcesTypeUser resourcesGrey' %>
|
||||||
|
</li>
|
||||||
|
<div id="my_files_resource">
|
||||||
|
<% if @type != "6" %>
|
||||||
|
<li>
|
||||||
|
<a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 4) %>" id="resource_type_file" class="resourcesTypeAtt resourcesGrey" data-method="get" data-remote="true">附件 </a>
|
||||||
|
<%#= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4), id="resource_type_file", :remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
@ -1,5 +1,14 @@
|
|||||||
$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
|
$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
|
||||||
|
$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
|
||||||
$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
|
$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
|
||||||
$("#res_all_count").html(<%= @atta_count%>);
|
$("#res_all_count").html(<%= @atta_count%>);
|
||||||
$("#res_count").html(0);
|
$("#res_count").html(0);
|
||||||
$("#checkboxAll").attr('checked',false);
|
$("#checkboxAll").attr('checked',false);
|
||||||
|
//更新状态
|
||||||
|
$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6', :status => @status) %>');
|
||||||
|
$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1', :status => @status) %>');
|
||||||
|
$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1) %>');
|
||||||
|
$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2) %>');
|
||||||
|
$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3) %>');
|
||||||
|
$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5) %>');
|
||||||
|
$("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4) %>');
|
||||||
@ -1,3 +1,4 @@
|
|||||||
$("#homework_repository").html('<%= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');
|
/*$("#homework_repository").html('<%#= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');*/
|
||||||
|
$("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => 0,:property => @property,:search=>''})%>');
|
||||||
$("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
|
$("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
|
||||||
$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
|
$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
|
||||||
|
|||||||
@ -1,18 +1,18 @@
|
|||||||
class UpdateHomeworkCommonUpdatedAt < ActiveRecord::Migration
|
class UpdateHomeworkCommonUpdatedAt < ActiveRecord::Migration
|
||||||
def up
|
def up
|
||||||
count = HomeworkCommon.all.count / 30 + 2
|
count = HomeworkCommon.all.count / 30 + 2
|
||||||
transaction do
|
transaction do
|
||||||
for i in 1 ... count do i
|
for i in 1 ... count do i
|
||||||
HomeworkCommon.page(i).per(30).each do |hw|
|
HomeworkCommon.page(i).per(30).each do |hw|
|
||||||
ca = CourseActivity.where("course_act_type = 'HomeworkCommon' and course_act_id = #{hw.id}").first
|
ca = CourseActivity.where("course_act_type = 'HomeworkCommon' and course_act_id = #{hw.id}").first
|
||||||
unless ca.nil?
|
unless ca.nil?
|
||||||
hw.update_attributes(:updated_at => ca.updated_at)
|
hw.update_attributes(:updated_at => ca.updated_at)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def down
|
def down
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,50 +1,50 @@
|
|||||||
class UpdateContributorAfterDelete < ActiveRecord::Migration
|
class UpdateContributorAfterDelete < ActiveRecord::Migration
|
||||||
def up
|
def up
|
||||||
Course.all.each do |course|
|
Course.all.each do |course|
|
||||||
if course.course_activities.count > 1
|
if course.course_activities.count > 1
|
||||||
course.members.each do |s|
|
course.members.each do |s|
|
||||||
puts course.id
|
puts course.id
|
||||||
puts course.name
|
puts course.name
|
||||||
puts s.user_id
|
puts s.user_id
|
||||||
# board_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?",s.student_id, course.id, "Message").count * 2
|
# board_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?",s.student_id, course.id, "Message").count * 2
|
||||||
# 发帖数
|
# 发帖数
|
||||||
board_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.user_id} and me.parent_id is null;").count
|
board_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.user_id} and me.parent_id is null;").count
|
||||||
# 回帖数
|
# 回帖数
|
||||||
message_reply_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.user_id} and me.parent_id is not null").count * 1
|
message_reply_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.user_id} and me.parent_id is not null").count * 1
|
||||||
# 新闻回复
|
# 新闻回复
|
||||||
common_reply_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.user_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1
|
common_reply_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.user_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1
|
||||||
# 通知
|
# 通知
|
||||||
common_count = News.find_by_sql("select n.* from news n where n.author_id = #{s.user_id} and n.course_id = #{course.id} ").count * 1
|
common_count = News.find_by_sql("select n.* from news n where n.author_id = #{s.user_id} and n.course_id = #{course.id} ").count * 1
|
||||||
# attachment_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "Attachment").count * 5
|
# attachment_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "Attachment").count * 5
|
||||||
# 附件数
|
# 附件数
|
||||||
attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and author_id = #{s.user_id} and container_type ='Course'").count
|
attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and author_id = #{s.user_id} and container_type ='Course'").count
|
||||||
# 课程留言数
|
# 课程留言数
|
||||||
journal_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? ", s.user_id, course.id, "Course").count * 1
|
journal_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? ", s.user_id, course.id, "Course").count * 1
|
||||||
# 作业留言
|
# 作业留言
|
||||||
journal_homework_count = JournalsForMessage.find_by_sql("SELECT jfm.* FROM `journals_for_messages` jfm, homework_commons hc where hc.id = jfm.jour_id and hc.course_id =#{course.id} and jfm.user_id =#{s.user_id} and jfm.jour_type ='HomeworkCommon';").count * 1
|
journal_homework_count = JournalsForMessage.find_by_sql("SELECT jfm.* FROM `journals_for_messages` jfm, homework_commons hc where hc.id = jfm.jour_id and hc.course_id =#{course.id} and jfm.user_id =#{s.user_id} and jfm.jour_type ='HomeworkCommon';").count * 1
|
||||||
# journal_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "JournalsForMessage").count * 1
|
# journal_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "JournalsForMessage").count * 1
|
||||||
# journal_reply_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? and status =?", s.student_id, course.id, "Course",1).count * 1
|
# journal_reply_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? and status =?", s.student_id, course.id, "Course",1).count * 1
|
||||||
total = board_count + message_reply_count + common_reply_count + attachment_count + journal_count
|
total = board_count + message_reply_count + common_reply_count + attachment_count + journal_count
|
||||||
course_contributor = CourseContributorScore.where("course_id =? and user_id =?", course.id, s.user_id).first
|
course_contributor = CourseContributorScore.where("course_id =? and user_id =?", course.id, s.user_id).first
|
||||||
if course_contributor.nil?
|
if course_contributor.nil?
|
||||||
CourseContributorScore.create(:course_id => course.id, :user_id => s.user_id, :message_num => board_count, :message_reply_num => message_reply_count,
|
CourseContributorScore.create(:course_id => course.id, :user_id => s.user_id, :message_num => board_count, :message_reply_num => message_reply_count,
|
||||||
:news_reply_num => common_reply_count, :news_num => common_count, :resource_num => attachment_count, :journal_num => journal_count,
|
:news_reply_num => common_reply_count, :news_num => common_count, :resource_num => attachment_count, :journal_num => journal_count,
|
||||||
:homework_journal_num => journal_homework_count, :journal_reply_num => 0, :total_score => total)
|
:homework_journal_num => journal_homework_count, :journal_reply_num => 0, :total_score => total)
|
||||||
else
|
else
|
||||||
course_contributor.message_num = board_count
|
course_contributor.message_num = board_count
|
||||||
course_contributor.message_reply_num = message_reply_count
|
course_contributor.message_reply_num = message_reply_count
|
||||||
course_contributor.news_reply_num = common_reply_count
|
course_contributor.news_reply_num = common_reply_count
|
||||||
course_contributor.news_num = common_count
|
course_contributor.news_num = common_count
|
||||||
course_contributor.resource_num = attachment_count
|
course_contributor.resource_num = attachment_count
|
||||||
course_contributor.journal_num = journal_count
|
course_contributor.journal_num = journal_count
|
||||||
course_contributor.homework_journal_num = journal_homework_count
|
course_contributor.homework_journal_num = journal_homework_count
|
||||||
course_contributor.save
|
course_contributor.save
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def down
|
def down
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
class DeleteStudentWorkData < ActiveRecord::Migration
|
class DeleteStudentWorkData < ActiveRecord::Migration
|
||||||
def up
|
def up
|
||||||
StudentWork.where("homework_common_id = 2604 AND user_id = 10763 AND final_score = 0").destroy_all
|
StudentWork.where("homework_common_id = 2604 AND user_id = 10763 AND final_score = 0").destroy_all
|
||||||
end
|
end
|
||||||
|
|
||||||
def down
|
def down
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -0,0 +1,5 @@
|
|||||||
|
class AddVisitsToUser < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :users, :visits, :integer, :default => 0
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
class AddVisitsToProject < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :projects, :visits, :integer, :default => 0
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
class AddVisitsToCourse < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :courses, :visits, :integer, :default => 0
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
class AddVisitsToOrganization < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :organizations, :visits, :integer, :default => 0
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -1,78 +1,78 @@
|
|||||||
#coding=utf-8
|
#coding=utf-8
|
||||||
|
|
||||||
module Trustie
|
module Trustie
|
||||||
module Gitlab
|
module Gitlab
|
||||||
module Helper
|
module Helper
|
||||||
GUEST = 10
|
GUEST = 10
|
||||||
REPORTER = 20
|
REPORTER = 20
|
||||||
DEVELOPER = 30
|
DEVELOPER = 30
|
||||||
MASTER = 40
|
MASTER = 40
|
||||||
OWNER = 50
|
OWNER = 50
|
||||||
# 项目公开和私有
|
# 项目公开和私有
|
||||||
PUBLIC = 20
|
PUBLIC = 20
|
||||||
PRIVATE = 0
|
PRIVATE = 0
|
||||||
|
|
||||||
def change_password(uid, en_pwd, salt)
|
def change_password(uid, en_pwd, salt)
|
||||||
return unless uid
|
return unless uid
|
||||||
options = {:encrypted_password=>en_pwd, :password_salt=>salt}
|
options = {:encrypted_password=>en_pwd, :password_salt=>salt}
|
||||||
self.g.put("/users/ext/#{uid}", :body => options)
|
self.g.put("/users/ext/#{uid}", :body => options)
|
||||||
# g.edit_user(uid, :encrypted_password=>en_pwd, :password_salt=>salt)
|
# g.edit_user(uid, :encrypted_password=>en_pwd, :password_salt=>salt)
|
||||||
end
|
end
|
||||||
|
|
||||||
def find_user(user)
|
def find_user(user)
|
||||||
us = self.g.get("/users?search=#{user.mail}")
|
us = self.g.get("/users?search=#{user.mail}")
|
||||||
if Array === us
|
if Array === us
|
||||||
us.each do |u|
|
us.each do |u|
|
||||||
return u if u.email == user.mail
|
return u if u.email == user.mail
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def add_user(user)
|
def add_user(user)
|
||||||
u = nil
|
u = nil
|
||||||
begin
|
begin
|
||||||
u = find_user(user)
|
u = find_user(user)
|
||||||
unless u
|
unless u
|
||||||
u = self.g.create_user(user.mail,
|
u = self.g.create_user(user.mail,
|
||||||
user.hashed_password,
|
user.hashed_password,
|
||||||
name: user.show_name,
|
name: user.show_name,
|
||||||
username: user.login,
|
username: user.login,
|
||||||
confirm: "true")
|
confirm: "true")
|
||||||
user.gid = u.id
|
user.gid = u.id
|
||||||
user.save
|
user.save
|
||||||
end
|
end
|
||||||
if user.gid.nil?
|
if user.gid.nil?
|
||||||
user.gid = u.id
|
user.gid = u.id
|
||||||
user.save
|
user.save
|
||||||
end
|
end
|
||||||
change_password(u.id, user.hashed_password, user.salt)
|
change_password(u.id, user.hashed_password, user.salt)
|
||||||
rescue => e
|
rescue => e
|
||||||
puts e
|
puts e
|
||||||
end
|
end
|
||||||
return u
|
return u
|
||||||
end
|
end
|
||||||
|
|
||||||
def del_user(user)
|
def del_user(user)
|
||||||
return unless user.gid
|
return unless user.gid
|
||||||
self.g.delete_user(user.gid)
|
self.g.delete_user(user.gid)
|
||||||
end
|
end
|
||||||
|
|
||||||
def get_gitlab_role m
|
def get_gitlab_role m
|
||||||
case m.roles.first.position
|
case m.roles.first.position
|
||||||
when 1,2
|
when 1,2
|
||||||
GUEST
|
GUEST
|
||||||
when 5
|
when 5
|
||||||
REPORTER
|
REPORTER
|
||||||
when 4
|
when 4
|
||||||
DEVELOPER
|
DEVELOPER
|
||||||
when 3
|
when 3
|
||||||
MASTER
|
MASTER
|
||||||
else
|
else
|
||||||
GUEST
|
GUEST
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,49 +1,51 @@
|
|||||||
.ke-content {
|
.ke-content {
|
||||||
font-size: 10pt;
|
font-size: 12px;
|
||||||
}
|
font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ΢ÈíÑźÚ, ËÎÌå;
|
||||||
.ke-content pre {
|
font-family:Tahoma;
|
||||||
font-size:9pt;
|
}
|
||||||
font-family:Courier New,Arial;
|
.ke-content pre {
|
||||||
border:1px solid #ddd;
|
font-size:9pt;
|
||||||
border-left:5px solid #6CE26C;
|
font-family:Courier New,Arial;
|
||||||
background:#f6f6f6;
|
border:1px solid #ddd;
|
||||||
padding:5px;
|
border-left:5px solid #6CE26C;
|
||||||
}
|
background:#f6f6f6;
|
||||||
|
padding:5px;
|
||||||
.ke-content code {
|
}
|
||||||
margin: 0 2px;
|
|
||||||
padding: 0 5px;
|
.ke-content code {
|
||||||
white-space: nowrap;
|
margin: 0 2px;
|
||||||
border: 1px solid #DDD;
|
padding: 0 5px;
|
||||||
background-color: #F6F6F6;
|
white-space: nowrap;
|
||||||
border-radius: 3px;
|
border: 1px solid #DDD;
|
||||||
}
|
background-color: #F6F6F6;
|
||||||
|
border-radius: 3px;
|
||||||
.ke-content pre>code {
|
}
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
.ke-content pre>code {
|
||||||
white-space: pre;
|
margin: 0;
|
||||||
border: none;
|
padding: 0;
|
||||||
background: transparent;
|
white-space: pre;
|
||||||
}
|
border: none;
|
||||||
|
background: transparent;
|
||||||
.ke-content pre code {
|
}
|
||||||
background-color: transparent;
|
|
||||||
border: none;
|
.ke-content pre code {
|
||||||
}
|
background-color: transparent;
|
||||||
|
border: none;
|
||||||
.ke-content p {
|
}
|
||||||
/*margin: 0 0 15px 0;*/
|
|
||||||
/*margin-bottom:15pt;*/
|
.ke-content p {
|
||||||
line-height:1.5;
|
/*margin: 0 0 15px 0;*/
|
||||||
/*letter-spacing: 1px;*/
|
/*margin-bottom:15pt;*/
|
||||||
}
|
line-height:1.5;
|
||||||
|
/*letter-spacing: 1px;*/
|
||||||
.ke-content div.ref {border:1px solid #ddd;margin:0 0 10px 0;padding:2px;font-size:9pt;background:#ffe;}
|
}
|
||||||
.ke-content div.ref h4 {margin:0;padding:1px 3px;background:#CC9966;color:#fff;font-size:9pt;font-weight:normal;}
|
|
||||||
.ke-content div.ref .ref_body {margin:0;padding:2px;line-height:20px;color:#666;font-size:9pt;}
|
.ke-content div.ref {border:1px solid #ddd;margin:0 0 10px 0;padding:2px;font-size:9pt;background:#ffe;}
|
||||||
|
.ke-content div.ref h4 {margin:0;padding:1px 3px;background:#CC9966;color:#fff;font-size:9pt;font-weight:normal;}
|
||||||
|
.ke-content div.ref .ref_body {margin:0;padding:2px;line-height:20px;color:#666;font-size:9pt;}
|
||||||
.ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;}
|
|
||||||
span.at {color:#269ac9;}
|
|
||||||
|
.ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;}
|
||||||
|
span.at {color:#269ac9;}
|
||||||
span.at a{color:#269ac9;text-decoration: none;}
|
span.at a{color:#269ac9;text-decoration: none;}
|
||||||
@ -1,38 +1,40 @@
|
|||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* KindEditor - WYSIWYG HTML Editor for Internet
|
* KindEditor - WYSIWYG HTML Editor for Internet
|
||||||
* Copyright (C) 2006-2011 kindsoft.net
|
* Copyright (C) 2006-2011 kindsoft.net
|
||||||
*
|
*
|
||||||
* @author Roddy <luolonghao@gmail.com>
|
* @author Roddy <luolonghao@gmail.com>
|
||||||
* @site http://www.kindsoft.net/
|
* @site http://www.kindsoft.net/
|
||||||
* @licence http://www.kindsoft.net/license.php
|
* @licence http://www.kindsoft.net/license.php
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
|
|
||||||
KindEditor.plugin('lineheight', function(K) {
|
KindEditor.plugin('lineheight', function(K) {
|
||||||
var self = this, name = 'lineheight', lang = self.lang(name + '.');
|
var self = this, name = 'lineheight', lang = self.lang(name + '.');
|
||||||
self.clickToolbar(name, function() {
|
self.clickToolbar(name, function() {
|
||||||
var curVal = '', commonNode = self.cmd.commonNode({'*' : '.line-height'});
|
var curVal = '', commonNode = self.cmd.commonNode({'*' : '.line-height'});
|
||||||
if (commonNode) {
|
if (commonNode) {
|
||||||
curVal = commonNode.css('line-height');
|
curVal = commonNode.css('line-height');
|
||||||
}
|
}
|
||||||
var menu = self.createMenu({
|
var menu = self.createMenu({
|
||||||
name : name,
|
name : name,
|
||||||
width : 150
|
width : 150
|
||||||
});
|
});
|
||||||
K.each(lang.lineHeight, function(i, row) {
|
K.each(lang.lineHeight, function(i, row) {
|
||||||
K.each(row, function(key, val) {
|
K.each(row, function(key, val) {
|
||||||
menu.addItem({
|
menu.addItem({
|
||||||
title : val,
|
title : val,
|
||||||
checked : curVal === key,
|
checked : curVal === key,
|
||||||
click : function() {
|
click : function() {
|
||||||
self.cmd.toggle('<span style="line-height:' + key + ';"></span>', {
|
self.cmd.toggle('<span style="line-height:' + key + ';"></span>', {
|
||||||
span : '.line-height=' + key
|
span : '.line-height=' + key
|
||||||
});
|
});
|
||||||
self.updateState();
|
self.updateState();
|
||||||
self.addBookmark();
|
self.addBookmark();
|
||||||
self.hideMenu();
|
//curVal = key;
|
||||||
}
|
//self.cmd.doc.body.style.lineHeight = key;
|
||||||
});
|
self.hideMenu();
|
||||||
});
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 8.4 KiB |
File diff suppressed because it is too large
Load Diff
@ -1,177 +1,183 @@
|
|||||||
//需求：表情栏可以隐藏显示，高度只要一点高
|
//需求：表情栏可以隐藏显示，高度只要一点高
|
||||||
function sd_create_editor(params){
|
function sd_create_editor(params){
|
||||||
// var minHeight; //最小高度
|
// var minHeight; //最小高度
|
||||||
var paramsHeight = params.height; //设定的高度
|
var paramsHeight = params.height; //设定的高度
|
||||||
var id = arguments[1] ? arguments[1] : undefined;
|
var id = arguments[1] ? arguments[1] : undefined;
|
||||||
var type = arguments[2] ? arguments[2] : '';
|
var type = arguments[2] ? arguments[2] : '';
|
||||||
var paramsWidth = params.width == undefined ? "100%" : params.width;
|
var paramsWidth = params.width == undefined ? "100%" : params.width;
|
||||||
|
|
||||||
var editor = params.kindutil.create(params.textarea, {
|
var editor = params.kindutil.create(params.textarea, {
|
||||||
resizeType : 1,minWidth:"1px",width:"94%",
|
resizeType : 1,minWidth:"1px",width:"94%",
|
||||||
height:"33px",// == undefined ? "30px":paramsHeight+"px",
|
height:"33px",// == undefined ? "30px":paramsHeight+"px",
|
||||||
minHeight:"33px",// == undefined ? "30px":paramsHeight+"px",
|
minHeight:"33px",// == undefined ? "30px":paramsHeight+"px",
|
||||||
width:params.width,
|
width:params.width,
|
||||||
items:['emoticons','fontname',
|
/*
|
||||||
'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
|
items:['emoticons','fontname',
|
||||||
'formatblock', 'fontsize', '|','indent', 'outdent',
|
'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
|
||||||
'|','imagedirectupload','more'],
|
'formatblock', 'fontsize', '|','indent', 'outdent',
|
||||||
afterChange:function(){//按键事件
|
'|','imagedirectupload','more'],*/
|
||||||
var edit = this.edit;
|
items : ['code','emoticons','fontname',
|
||||||
var body = edit.doc.body;
|
'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
|
||||||
edit.iframe.height(paramsHeight);
|
'formatblock', 'fontsize', '|','indent', 'outdent',
|
||||||
this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight)) , paramsHeight));
|
'|','imagedirectupload','table', 'media', 'preview',"more"
|
||||||
},
|
],
|
||||||
afterBlur:function(){
|
afterChange:function(){//按键事件
|
||||||
//params.toolbar_container.hide();
|
var edit = this.edit;
|
||||||
sd_check_editor_form_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
|
var body = edit.doc.body;
|
||||||
if(this.isEmpty()) {
|
edit.iframe.height(paramsHeight);
|
||||||
this.edit.html("<span id='hint' style='color: #999999; font-size: 12px'>我要回复</span>");
|
this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight)) , paramsHeight));
|
||||||
}
|
},
|
||||||
//params.toolbar_container.hide();
|
afterBlur:function(){
|
||||||
$('#reply_image_' + id).addClass('imageFuzzy');
|
//params.toolbar_container.hide();
|
||||||
if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(this.edit.html())){
|
sd_check_editor_form_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
|
||||||
params.submit_btn.hide();
|
if(this.isEmpty()) {
|
||||||
params.toolbar_container.hide();
|
this.edit.html("<span id='hint' style='color: #999999; font-size: 12px'>我要回复</span>");
|
||||||
this.resize("100%", null);
|
}
|
||||||
}else if(this.edit.html().trim() != ""){
|
//params.toolbar_container.hide();
|
||||||
params.submit_btn.show();
|
$('#reply_image_' + id).addClass('imageFuzzy');
|
||||||
params.toolbar_container.show();
|
if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(this.edit.html())){
|
||||||
}
|
params.submit_btn.hide();
|
||||||
|
params.toolbar_container.hide();
|
||||||
//params.submit_btn.css("display","none");
|
this.resize("100%", null);
|
||||||
},
|
}else if(this.edit.html().trim() != ""){
|
||||||
afterFocus: function(){
|
params.submit_btn.show();
|
||||||
var edit = this.edit;
|
params.toolbar_container.show();
|
||||||
var body = edit.doc.body;
|
}
|
||||||
if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())){
|
|
||||||
edit.html('');
|
//params.submit_btn.css("display","none");
|
||||||
}
|
},
|
||||||
params.submit_btn.show();
|
afterFocus: function(){
|
||||||
params.contentmsg.hide();
|
var edit = this.edit;
|
||||||
params.toolbar_container.show();
|
var body = edit.doc.body;
|
||||||
// params.toolbar_container.show();
|
if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())){
|
||||||
$('#reply_image_' + id).removeClass('imageFuzzy');
|
edit.html('');
|
||||||
//edit.iframe.width(paramsWidth);
|
}
|
||||||
this.resize(paramsWidth, null);
|
params.submit_btn.show();
|
||||||
//params.submit_btn.show();
|
params.contentmsg.hide();
|
||||||
},
|
params.toolbar_container.show();
|
||||||
|
// params.toolbar_container.show();
|
||||||
afterCreate:function(){
|
$('#reply_image_' + id).removeClass('imageFuzzy');
|
||||||
//params.submit_btn.hide();
|
//edit.iframe.width(paramsWidth);
|
||||||
var toolbar = $("div[class='ke-toolbar']",params.div_form);
|
this.resize(paramsWidth, null);
|
||||||
toolbar.css('display','inline');
|
//params.submit_btn.show();
|
||||||
toolbar.css('padding',0);
|
},
|
||||||
$(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
|
|
||||||
params.toolbar_container.append(toolbar);
|
afterCreate:function(){
|
||||||
params.toolbar_container.hide();
|
//params.submit_btn.hide();
|
||||||
//init
|
var toolbar = $("div[class='ke-toolbar']",params.div_form);
|
||||||
var edit = this.edit;
|
toolbar.css('display','inline');
|
||||||
var body = edit.doc.body;
|
toolbar.css('padding',0);
|
||||||
edit.iframe[0].scroll = 'no';
|
$(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
|
||||||
body.style.overflowY = 'hidden';
|
params.toolbar_container.append(toolbar);
|
||||||
//reset height
|
params.toolbar_container.hide();
|
||||||
paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
|
//init
|
||||||
edit.iframe.height(paramsHeight);
|
var edit = this.edit;
|
||||||
edit.html("<span id='hint' style='color: #999999; font-size: 12px'>我要回复</span>");
|
var body = edit.doc.body;
|
||||||
this.resize(null,paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
|
edit.iframe[0].scroll = 'no';
|
||||||
// params.toolbar_container.hide();
|
body.style.overflowY = 'hidden';
|
||||||
if(typeof enableAt === 'function'){
|
//reset height
|
||||||
enableAt(this, id, type);
|
paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
|
||||||
}
|
edit.iframe.height(paramsHeight);
|
||||||
}
|
edit.html("<span id='hint' style='color: #999999; font-size: 12px'>我要回复</span>");
|
||||||
}).loadPlugin('paste');
|
this.resize(null,paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
|
||||||
return editor;
|
// params.toolbar_container.hide();
|
||||||
}
|
if(typeof enableAt === 'function'){
|
||||||
|
enableAt(this, id, type);
|
||||||
function sd_check_editor_form_field(params){
|
}
|
||||||
var result=true;
|
}
|
||||||
if(params.content!=undefined){
|
}).loadPlugin('paste');
|
||||||
if(params.content.isEmpty()){
|
return editor;
|
||||||
result=false;
|
}
|
||||||
}
|
|
||||||
if(params.content.html()!=params.textarea.html() || params.issubmit==true){
|
function sd_check_editor_form_field(params){
|
||||||
params.textarea.html(params.content.html());
|
var result=true;
|
||||||
params.content.sync();
|
if(params.content!=undefined){
|
||||||
if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
|
if(params.content.isEmpty()){
|
||||||
params.contentmsg.html('内容不能为空');
|
result=false;
|
||||||
params.contentmsg.css({color:'#ff0000'});
|
}
|
||||||
}else{
|
if(params.content.html()!=params.textarea.html() || params.issubmit==true){
|
||||||
params.contentmsg.html('填写正确');
|
params.textarea.html(params.content.html());
|
||||||
params.contentmsg.css({color:'#008000'});
|
params.content.sync();
|
||||||
}
|
if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
|
||||||
params.contentmsg.show();
|
params.contentmsg.html('内容不能为空');
|
||||||
}
|
params.contentmsg.css({color:'#ff0000'});
|
||||||
}
|
}else{
|
||||||
return result;
|
params.contentmsg.html('填写正确');
|
||||||
}
|
params.contentmsg.css({color:'#008000'});
|
||||||
function sd_create_form(params){
|
}
|
||||||
params.form.submit(function(){
|
params.contentmsg.show();
|
||||||
var flag = false;
|
}
|
||||||
if(params.form.attr('data-remote') != undefined ){
|
}
|
||||||
flag = true
|
return result;
|
||||||
}
|
}
|
||||||
var is_checked = sd_check_editor_form_field({
|
function sd_create_form(params){
|
||||||
issubmit:true,
|
params.form.submit(function(){
|
||||||
content:params.editor,
|
var flag = false;
|
||||||
contentmsg:params.contentmsg,
|
if(params.form.attr('data-remote') != undefined ){
|
||||||
textarea:params.textarea
|
flag = true
|
||||||
});
|
}
|
||||||
if(is_checked){
|
var is_checked = sd_check_editor_form_field({
|
||||||
if(flag){
|
issubmit:true,
|
||||||
return true;
|
content:params.editor,
|
||||||
}else{
|
contentmsg:params.contentmsg,
|
||||||
$(this)[0].submit();
|
textarea:params.textarea
|
||||||
return false;
|
});
|
||||||
}
|
if(is_checked){
|
||||||
}
|
if(flag){
|
||||||
return false;
|
return true;
|
||||||
});
|
}else{
|
||||||
}
|
$(this)[0].submit();
|
||||||
function sd_reset_editor_form(params){
|
return false;
|
||||||
params.form[0].reset();
|
}
|
||||||
params.textarea.empty();
|
}
|
||||||
if(params.editor != undefined){
|
return false;
|
||||||
params.editor.html(params.textarea.html());
|
});
|
||||||
}
|
}
|
||||||
params.contentmsg.hide();
|
function sd_reset_editor_form(params){
|
||||||
}
|
params.form[0].reset();
|
||||||
//第二个参数是高度，可以传，可以不传
|
params.textarea.empty();
|
||||||
function sd_create_editor_from_data(id){
|
if(params.editor != undefined){
|
||||||
var height = arguments[1] ? arguments[1] : undefined;
|
params.editor.html(params.textarea.html());
|
||||||
var width = arguments[2] ? arguments[2] : undefined;
|
}
|
||||||
var type = arguments[3] ? arguments[3] : undefined;
|
params.contentmsg.hide();
|
||||||
KindEditor.ready(function (K) {
|
}
|
||||||
$("div[nhname='new_message_" + id + "']").each(function () {
|
//第二个参数是高度，可以传，可以不传
|
||||||
var params = {};
|
function sd_create_editor_from_data(id){
|
||||||
params.kindutil = K;
|
var height = arguments[1] ? arguments[1] : undefined;
|
||||||
params.div_form = $(this);
|
var width = arguments[2] ? arguments[2] : undefined;
|
||||||
params.form = $("form", params.div_form);
|
var type = arguments[3] ? arguments[3] : undefined;
|
||||||
if (params.form == undefined || params.form.length == 0) {
|
KindEditor.ready(function (K) {
|
||||||
return;
|
$("div[nhname='new_message_" + id + "']").each(function () {
|
||||||
}
|
var params = {};
|
||||||
params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
|
params.kindutil = K;
|
||||||
params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
|
params.div_form = $(this);
|
||||||
params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
|
params.form = $("form", params.div_form);
|
||||||
params.cancel_btn = $("#new_message_cancel_btn_" + id);
|
if (params.form == undefined || params.form.length == 0) {
|
||||||
params.submit_btn = $("#new_message_submit_btn_" + id);
|
return;
|
||||||
params.height = height;
|
}
|
||||||
params.width = width;
|
params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
|
||||||
if (params.textarea.data('init') == undefined) {
|
params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
|
||||||
params.editor = sd_create_editor(params,id, type);
|
params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
|
||||||
sd_create_form(params);
|
params.cancel_btn = $("#new_message_cancel_btn_" + id);
|
||||||
params.cancel_btn.click(function () {
|
params.submit_btn = $("#new_message_submit_btn_" + id);
|
||||||
sd_reset_editor_form(params);
|
params.height = height;
|
||||||
});
|
params.width = width;
|
||||||
params.submit_btn.click(function () {
|
if (params.textarea.data('init') == undefined) {
|
||||||
params.form.submit();
|
params.editor = sd_create_editor(params,id, type);
|
||||||
});
|
sd_create_form(params);
|
||||||
params.textarea.data('init', 1);
|
params.cancel_btn.click(function () {
|
||||||
$(this).show();
|
sd_reset_editor_form(params);
|
||||||
}
|
});
|
||||||
});
|
params.submit_btn.click(function () {
|
||||||
});
|
params.form.submit();
|
||||||
|
});
|
||||||
div_form = $("div[nhname='new_message_" + id + "']");
|
params.textarea.data('init', 1);
|
||||||
$(".ke-edit", div_form).css("height","33px");
|
$(this).show();
|
||||||
$(".ke-edit-iframe",div_form).css("height","33px");
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
div_form = $("div[nhname='new_message_" + id + "']");
|
||||||
|
$(".ke-edit", div_form).css("height","33px");
|
||||||
|
$(".ke-edit-iframe",div_form).css("height","33px");
|
||||||
}
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue