diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 82f92c2d1..af501fdf9 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -41,6 +41,10 @@ class AccountController < ApplicationController render :layout => 'static_base' end + def about_us + render :layout => 'static_base' + end + # Log out current user and redirect to welcome page def logout if User.current.anonymous? diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c233ed6b..a6554075f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -563,7 +563,7 @@ class ApplicationController < ActionController::Base uri = URI.parse(back_url) # do not redirect user to another host or to the login or register page if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)}) - back_url = back_url.gsub(%r{\/users\/(\d+)},"/users/"+default.id.to_s) + back_url = back_url.gsub(%r{\/users\/(\d+)},"/users/"+default.id.to_s) if default.is_a?(:User) redirect_to(back_url) return end diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index c10f8bc84..ac25fbe9d 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -34,7 +34,7 @@ class CommentsController < ApplicationController ids = params[:asset_id].split(',') update_kindeditor_assets_owner ids,@comment.id,OwnerTypeHelper::COMMENT end - # 与我相关动态的记录add start + # 锟斤拷锟斤拷锟斤拷囟锟教拷募锟铰糰dd start if( @comment.id && @news.course ) if(@news.author_id != User.current.id) notify = ActivityNotify.new() @@ -47,11 +47,18 @@ class CommentsController < ApplicationController notify.save() end end - # 与我相关动态的记录add end + # 锟斤拷锟斤拷锟斤拷囟锟教拷募锟铰糰dd end flash[:notice] = l(:label_comment_added) end - redirect_to news_url(@news) + if params[:user_activity_id] + @user_activity_id = params[:user_activity_id] + respond_to do |format| + format.js + end + else + redirect_to news_url(@news) + end end def destroy diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 0995d1304..9f4b5f171 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -20,11 +20,11 @@ class IssuesController < ApplicationController default_search_scope :issues before_filter :authorize1, :only => [:show] - before_filter :find_issue, :only => [:show, :edit, :update] + before_filter :find_issue, :only => [:show, :edit, :update,:add_journal] before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy] before_filter :find_project, :only => [:new, :create, :update_form] #before_filter :authorize, :except => [:index, :show] - before_filter :authorize, :except => [:index] + before_filter :authorize, :except => [:index,:add_journal] before_filter :find_optional_project, :only => [:index] before_filter :check_for_default_issue_status, :only => [:new, :create] @@ -383,6 +383,18 @@ class IssuesController < ApplicationController end end + def add_journal + jour = Journal.new + jour.user_id = User.current.id + jour.notes = params[:notes] + jour.journalized = @issue + jour.save + @user_activity_id = params[:user_activity_id] + respond_to do |format| + format.js + end + end + private def find_project diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index a242587fb..965aacab0 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -177,6 +177,7 @@ class MessagesController < ApplicationController @reply.board = @board @reply.safe_attributes = params[:reply] @reply.content = @quote + @reply.content + @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject] @topic.children << @reply #@topic.update_attribute(:updated_on, Time.now) if !@reply.new_record? @@ -185,41 +186,18 @@ class MessagesController < ApplicationController update_kindeditor_assets_owner ids,@reply.id,OwnerTypeHelper::MESSAGE end - # 涓庢垜鐩稿叧鍔ㄦ佺殑璁板綍add start - if(@board && @board.course) #椤圭洰鐨勫厛涓嶇 - notifyto_arr = {} - notifyto_arr[@topic.author_id] = @topic.author_id - if( params[:parent_topic] != nil && params[:parent_topic] != '') - parent_topic = Message.find(params[:parent_topic]) - notifyto_arr[parent_topic.author_id] = parent_topic.author_id - end - notifyto_arr.each do |k,user_id| - if(user_id != User.current.id) - notify = ActivityNotify.new() - if(@board.course) - notify.activity_container_id = @board.course_id - notify.activity_container_type = 'Course' - else - notify.activity_container_id = @board.project_id - notify.activity_container_type = 'Project' - end - notify.activity_id = @reply.id - notify.activity_type = 'Message' - notify.notify_to = user_id - notify.is_read = 0 - notify.save() - end - end - end - # 涓庢垜鐩稿叧鍔ㄦ佺殑璁板綍add end - call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply}) attachments = Attachment.attach_files(@reply, params[:attachments]) render_attachment_warning_if_needed(@reply) else #render file: 'messages#show', layout: 'base_courses' end - if params[:is_board] + if params[:user_activity_id] + @user_activity_id = params[:user_activity_id] + respond_to do |format| + format.js + end + elsif params[:is_board] if @project redirect_to project_boards_path(@project) elsif @course diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 67b1d5d78..37214621f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -418,15 +418,108 @@ class UsersController < ApplicationController #鐢ㄦ埛浠庤祫婧愬簱瀵煎叆璧勬簮鍒颁綔涓 def user_import_resource - user_course_ids = User.current.courses.map { |c| c.id} #鎴戠殑璧勬簮搴撶殑璇濓紝閭ｄ箞搴旇鏄垜涓婁紶鐨勬墍鏈夎祫婧 鍔犱笂 鎴戝姞鍏ョ殑璇剧▼鐨勬墍鏈夎祫婧 + @user = User.current + user_course_ids = @user.courses.map { |c| c.id} #鎴戠殑璧勬簮搴撶殑璇濓紝閭ｄ箞搴旇鏄垜涓婁紶鐨勬墍鏈夎祫婧 鍔犱笂 鎴戝姞鍏ョ殑璇剧▼鐨勬墍鏈夎祫婧 @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc") + @type = params[:type] + @homework_id = params[:homework_id] + @limit = 7 + @is_remote = true + @atta_count = @attachments.count + @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1 + @offset ||= @atta_pages.offset + #@curse_attachments_all = @all_attachments[@offset, @limit] + @attachments = paginateHelper @attachments,7 + respond_to do |format| + format.js + end + end + + #寮曞叆璧勬簮鍒楄〃鏍规嵁绫诲瀷杩囨护 + def user_resource_type + if User.current.id.to_i != params[:id].to_i + render_403 + return + end + if(params[:type].blank? || params[:type] == "1") #鍏ㄩ儴 + user_course_ids = User.current.courses.map { |c| c.id} #鎴戠殑璧勬簮搴撶殑璇濓紝閭ｄ箞搴旇鏄垜涓婁紶鐨勬墍鏈夎祫婧 鍔犱笂 鎴戝姞鍏ョ殑璇剧▼鐨勬墍鏈夎祫婧 + @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ + "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc") + elsif params[:type] == "2" #璇剧▼璧勬簮 + user_course_ids = User.current.courses.map { |c| c.id} + @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) ").order("created_on desc") + elsif params[:type] == "3" #椤圭洰璧勬簮 + @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'").order("created_on desc") + elsif params[:type] == "4" #闄勪欢 + @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc") + elsif params[:type] == "5" #鐢ㄦ埛璧勬簮 + @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal'").order("created_on desc") + end + @type = params[:type] + @limit = 7 + @is_remote = true + @atta_count = @attachments.count + @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1 + @offset ||= @atta_pages.offset + #@curse_attachments_all = @all_attachments[@offset, @limit] + @attachments = paginateHelper @attachments,7 respond_to do |format| format.js end end + #寮曞叆璧勬簮鍒楄〃鏍规嵁鍏抽敭璇嶈繃婊 + def user_ref_resource_search + search = params[:search].to_s.strip.downcase + if(params[:type].blank? || params[:type] == "1") #鍏ㄩ儴 + user_course_ids = User.current.courses.map { |c| c.id} #鎴戠殑璧勬簮搴撶殑璇濓紝閭ｄ箞搴旇鏄垜涓婁紶鐨勬墍鏈夎祫婧 鍔犱笂 鎴戝姞鍏ョ殑璇剧▼鐨勬墍鏈夎祫婧 鍙栦氦闆嗗苟鏌ヨ + @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ + " or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like '%#{search}%') ").order("created_on desc") + elsif params[:type] == "2" #璇剧▼璧勬簮 + user_course_ids = User.current.courses.map { |c| c.id} + @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc") + elsif params[:type] == "3" #椤圭洰璧勬簮 + @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project' and (filename like '%#{search}%')").order("created_on desc") + elsif params[:type] == "4" #闄勪欢 + @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon') and (filename like '%#{search}%')").order("created_on desc") + elsif params[:type] == "5" #鐢ㄦ埛璧勬簮 + @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc") + end + @type = params[:type] + @limit = 7 + @is_remote = true + @atta_count = @attachments.count + @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1 + @offset ||= @atta_pages.offset + #@curse_attachments_all = @all_attachments[@offset, @limit] + @attachments = paginateHelper @attachments,7 + respond_to do |format| + format.js + end + end + + #灏嗚祫婧愭壒閲忓紩鍏 + def import_resources_to_homework + @attachments = [] + unless params[:checkbox1].nil? || params[:checkbox1].blank? + params[:checkbox1].each do |id| + atta = Attachment.find(id) + att_copy = atta.copy + att_copy.container_id = nil + att_copy.container_type = nil + att_copy.copy_from = atta.id + att_copy.save + @attachments << att_copy + end + end + respond_to do |format| + format.js + end + end + + include CoursesHelper def user_courses @@ -664,9 +757,7 @@ class UsersController < ApplicationController end def show - @page = params[:page] ? params[:page].to_i + 1 : 0 - user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")" user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")" course_types = "('Message','News','HomeworkCommon','poll')" @@ -1011,7 +1102,7 @@ class UsersController < ApplicationController #@user.save_attachments(params[:attachments],User.current) # Container_type涓篜rincipal Attachment.attach_filesex(@user, params[:attachments], params[:attachment_type]) - if(params[:type].nil? || params[:type] == "1") #鍏ㄩ儴 + if(params[:type].blank?|| params[:type] == "1") #鍏ㄩ儴 if User.current.id.to_i == params[:id].to_i user_course_ids = User.current.courses.map { |c| c.id} #鎴戠殑璧勬簮搴撶殑璇濓紝閭ｄ箞搴旇鏄垜涓婁紶鐨勬墍鏈夎祫婧 鍔犱笂 鎴戝姞鍏ョ殑璇剧▼鐨勬墍鏈夎祫婧 @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ @@ -1073,7 +1164,7 @@ class UsersController < ApplicationController end end - if(params[:type].nil? || params[:type] == "1") #鍏ㄩ儴 + if(params[:type].blank? || params[:type] == "1") #鍏ㄩ儴 if User.current.id.to_i == params[:id].to_i user_course_ids = User.current.courses.map { |c| c.id} #鎴戠殑璧勬簮搴撶殑璇濓紝閭ｄ箞搴旇鏄垜涓婁紶鐨勬墍鏈夎祫婧 鍔犱笂 鎴戝姞鍏ョ殑璇剧▼鐨勬墍鏈夎祫婧 @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ @@ -1212,6 +1303,18 @@ class UsersController < ApplicationController else @flag = false end + user_course_ids = User.current.courses.map { |c| c.id} #鎴戠殑璧勬簮搴撶殑璇濓紝閭ｄ箞搴旇鏄垜涓婁紶鐨勬墍鏈夎祫婧 鍔犱笂 鎴戝姞鍏ョ殑璇剧▼鐨勬墍鏈夎祫婧 + @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ + "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc") + @type = params[:type] + @limit = 25 + @user = User.current + @is_remote = true + @atta_count = @attachments.count + @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1 + @offset ||= @atta_pages.offset + #@curse_attachments_all = @all_attachments[@offset, @limit] + @attachments = paginateHelper @attachments,25 respond_to do |format| format.js end @@ -1268,7 +1371,18 @@ class UsersController < ApplicationController else @flag=true end - + user_course_ids = User.current.courses.map { |c| c.id} #鎴戠殑璧勬簮搴撶殑璇濓紝閭ｄ箞搴旇鏄垜涓婁紶鐨勬墍鏈夎祫婧 鍔犱笂 鎴戝姞鍏ョ殑璇剧▼鐨勬墍鏈夎祫婧 + @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ + "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc") + @type = params[:type] + @limit = 25 + @user = User.current + @is_remote = true + @atta_count = @attachments.count + @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1 + @offset ||= @atta_pages.offset + #@curse_attachments_all = @all_attachments[@offset, @limit] + @attachments = paginateHelper @attachments,25 respond_to do |format| format.js end @@ -1483,7 +1597,7 @@ class UsersController < ApplicationController render_403 return end - if(params[:type].nil? || params[:type] == "1") #鍏ㄩ儴 + if(params[:type].blank? || params[:type] == "1") #鍏ㄩ儴 if User.current.id.to_i == params[:id].to_i user_course_ids = User.current.courses.map { |c| c.id} #鎴戠殑璧勬簮搴撶殑璇濓紝閭ｄ箞搴旇鏄垜涓婁紶鐨勬墍鏈夎祫婧 鍔犱笂 鎴戝姞鍏ョ殑璇剧▼鐨勬墍鏈夎祫婧 @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7b83bb1c2..fcf28506a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2337,7 +2337,7 @@ module ApplicationHelper #鏍规嵁浼犲叆浣滀笟纭畾鏄剧ず涓虹紪杈戜綔鍝佽繕鏄柊寤轰綔鍝,鎴栬呮樉绀轰綔鍝佹暟閲 def user_for_homework_common homework,is_teacher if is_teacher #鑰佸笀鏄剧ず浣滃搧鏁伴噺 - link_to "鎻愪氦锛#{homework.student_works.count}锛",student_work_index_path(:homework => homework.id),:class => "c_blue" + link_to "鎻愪氦(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue" else #瀛︾敓鏄剧ず鎻愪氦浣滃搧銆佷慨鏀逛綔鍝佺瓑鎸夐挳 work = cur_user_works_for_homework homework if work.nil? diff --git a/app/views/account/about_us.html.erb b/app/views/account/about_us.html.erb new file mode 100644 index 000000000..2d21783ce --- /dev/null +++ b/app/views/account/about_us.html.erb @@ -0,0 +1,50 @@ +<%= stylesheet_link_tag 'new_user'%> +
+

鍏充簬鎴戜滑

+
+

+ Trustie鏄竴涓潰鍚戦珮鏍″垱鏂板疄璺电殑鍦ㄧ嚎鍗忎綔绀惧尯锛屾槸鍦ㄤ腑鍥介珮鏍℃帹琛屽ぇ瑙勬ā寮鏀惧湪绾跨爺绌讹紙Massive Open Online Research, MOORE锛夌殑鏀拺骞冲彴锛屼篃绠绉癟rustie骞冲彴銆傝佸笀銆佸鐢熷拰绉戠爺浜哄憳鍙互鍦ㄦ寮灞曞悇绉嶅湪绾垮崗鍚屽涔犮佸崗鍚屼綔涓氥佸崗鍚屽紑鍙戠瓑娲诲姩銆 +

+

+ MOORE鏄浗闃茬瀛︽妧鏈ぇ瀛︽潹瀛﹀啗闄㈠＋鎻愬嚭鐨勪竴涓潰鍚戦珮鏍＄鐮旀暀瀛︽椿鍔ㄧ殑鏂板瀷鍒涙柊瀹炶返姒傚康锛屼负鍏ㄩ潰鏀寔楂樻牎浜烘墠鍩瑰吇鍜岀瀛︾爺绌舵彁渚涗簡涓绉嶆柊鎬濊矾銆侻OORE鏄澶ц妯″湪绾垮紑鏀捐绋嬶紙Massive Open Online Course, MOOC锛夌殑鎷撳睍锛屾槸璇惧爞鏁欏涓庡垱鏂板疄璺垫繁搴︾粨鍚堢殑鍏ㄦ柊妯″紡锛屽彲浠ョ湅浣淢OOC2.0銆 +

+

+ 2005骞村紑濮嬶紝Trustie鐮斿埗鍥㈤槦鍥寸粫缃戠粶鏃朵唬鐨勮蒋浠跺紑鍙戞晥鐜囧拰璐ㄩ噺杩欎竴鏍稿績闂灞曞紑鐮旂┒锛岀粡杩囧崄骞寸殑纾ㄧ牶涓庢敾鍏筹紝閫愭鎻ず鍑轰互澶т紬鍖栧崗鍚屽紑鍙戙佸紑鏀惧紡璧勬簮鍏变韩銆佹寔缁у彲淇¤瘎浼颁负鏍稿績鐨勪簰鑱旂綉澶ц妯″崗鍚屾満鐞嗭紝鎻愬嚭浜嗗叏鏂扮殑杞欢寮鍙戠兢浣撳寲鏂规硶銆2008骞磋捣锛岀爺鍒跺洟闃熷紑濮嬫帰绱㈠浣曞皢杩欑鍗忓悓鏈虹悊寮曞叆杞欢浜烘墠鍩瑰吇銆侻OORE姒傚康鐨勬彁鍑轰负鐮斿埗鍥㈤槦鐨勪汉鎵嶅煿鍏诲疄璺垫彁渚涗簡鏂扮殑鍙戝睍鏂瑰悜鍜屽簲鐢ㄦā寮忥紝浣縏rustie鎶鏈拰宸ュ叿鑳藉鏇寸洿鎺ャ佹洿鏈夋晥鍦颁笌楂樻牎浜烘墠鍩瑰吇瀵规帴锛屽舰鎴愪簡浠婂ぉ宸茶澶ч噺甯堢敓鎺ュ彈鐨勫湪绾夸汉鎵嶅煿鍏诲钩鍙般 +

+

+ 鐮斿埗鍥㈤槦璁や负MOORE鐨勫垱鏂颁汉鎵嶅煿鍏绘ā寮忥紙濡傚浘1宸﹀浘锛夋槸灏嗕簰鑱旂綉澶ц妯″崗鍚屾満鐞嗕笌楂樻牎鍒涙柊瀹炶返娲诲姩鐩哥粨鍚堢殑鍏ㄦ柊浜烘墠鍩瑰吇鏂规硶鍜屾ā寮忥紝鐮斿埗鍥㈤槦骞跺熀浜庢湰骞冲彴鐨勬灦鏋勫舰鎴愪簡瀵筂OORE鏍稿績鏈虹悊鐨勪笁鏂归潰璁よ瘑锛堝鍥1鍙冲浘锛夈 +

+
+ +

鍥1 鍩轰簬MOORE鐨勫垱鏂颁汉鎵嶅煿鍏绘ā寮忎笌鏍稿績鏈虹悊

+
+

+ 鐩墠锛孴rustie骞冲彴宸茬粡鍒濇灞曠幇鍑哄ぇ瑙勬ā寮鏀惧湪绾跨爺绌剁殑鐢熸佺郴缁熻摑鍥撅紝鍏舵牳蹇冩槸鍦ㄧ嚎鏁欏瀹炶返骞冲彴鍜屽湪绾垮崗鍚岀爺绌跺钩鍙帮紝濡傚浘2銆俆rustie鍦ㄧ嚎鏁欏瀹炶返骞冲彴鏄敮鎸佹暀甯堝拰瀛︾敓鍥寸粫璇惧爞瀛︿範寮灞曞疄璺电殑骞冲彴锛堝鍥2锛夛紝Trustie鍦ㄧ嚎鍗忓悓鐮旂┒骞冲彴鏄敮鎸佸紑鍙戝皬缁勫洿缁曞疄璺典换鍔℃垨鐮旂┒宸ヤ綔寮灞曞垎甯冨紡鍗忎綔鐨勫钩鍙帮紙濡傚浘2锛夈備袱涓牳蹇冨钩鍙颁负涓鍚"鏂版墜"澶у鐢熸垚闀夸负鍏锋湁涓瀹氬垱鏂拌兘鍔涚殑"鍒涘"鎻愪緵浜嗕粠瀛︿範鍒扮爺绌剁殑涓涓笎杩涘紡鎴愰暱鐜锛堝鍥2锛夈 +

+

+ 鐗瑰埆鏄紝鏍规嵁甯堢敓鐨勫疄闄呴渶瑕侊紝Trustie骞冲彴鎻愪緵浜嗙鏈夋ā寮忓拰鍏紑妯″紡锛屾敮鎸侀拡瀵规湭鍏紑鎴愭灉瀹炴柦鏈夋晥鐭ヨ瘑浜ф潈淇濇姢涓哄墠鎻愮殑浜ゆ祦鍒嗕韩锛堝鍥2锛夈傞殢鐫瓒婃潵瓒婂鐨勯珮鏍°佽绋嬪拰鐮旂┒灏忕粍鐨勫姞鍏ワ紝MOORE鍒涙柊瀹炶返妯″紡鐨勭敓鎬佹晥鐩婂皢涓嶆柇鏄剧幇鍑烘潵銆 +

+
+ +

鍥2 鍩轰簬MOORE鐨勬敮鎾戝钩鍙板拰鐢熸佺郴缁

+
+

+ 鐮斿埗鍥㈤槦鐗瑰埆鎰熻阿楂樻牎鑰佸笀鍜屽鐢熺殑绉瀬鍙嶉銆佹棤绉佸垱鎰忋傚钩鍙扮殑寰堝瀹炵敤渚挎嵎鐨勫姛鑳介兘鏄佸笀浠Н鏋佸弬涓庡拰璁捐鐨勭粨鏋滐紝姹囪仛浜嗗ぇ閲忓笀鐢熺殑瀹濊吹璐＄尞锛屾槸鐮斿埗鍥㈤槦鍜岀敤鎴风兢浣撳叡鍚屾垚闀跨殑缁撴灉銆 +

+

+ Trustie骞冲彴鐨勫熀鏈濊矾鏄皢寮婧愭ā寮忎笌涓浗楂樻牎浜烘墠鍩瑰吇娲诲姩鐩哥粨鍚堬紝浣嗗叾鏈川涓婃槸涓绉峅2O锛圤nline To Offline锛夌殑鍒涙柊浜烘墠鍩瑰吇妯″紡锛屽彧鏈夊湪浠ヤ笅涓や釜鏂归潰鍚屾鎺ㄨ繘锛屾墠鑳藉湪鎸佺画瑙ｅ喅瀹為檯闇姹傜殑杩囩▼涓揩閫熷彂灞曪細
+     锛1锛夋瀯寤哄疄璺靛钩鍙帮紝婵娲诲垱鏂拌兘鍔涳細鎴愪负鏀寔涓嶅悓瑙勬ā鐨勫洟闃熻繘琛屽崗鍚岀爺绌跺拰鍗忓悓寮鍙戠殑瀹炶返骞冲彴锛屾敮鎸佸悇绫诲彲鍏紑鐨勮绋嬪疄楠屼换鍔°佹暀鐮斿绉戠爺浠诲姟鐨勫湪绾垮崗鍚岋紝鑳藉鏈夋晥鎻愬崌鍜岃瘎浼板鐢熺殑鍒涙柊鑳藉姏銆佸崗浣滆兘鍔涘拰瀹炶返鑳藉姏銆
+     锛2锛夊紩鍏ュ紑婧愮悊蹇碉紝褰㈡垚鍒涘鏂囧寲锛氬皢浜掕仈缃戝紑婧愯蒋浠惰繍鍔ㄤ腑鐨勮嚜鐢便佸绛夈佸叡浜佸垱鏂扮殑鐞嗗康寮曞叆楂樻牎锛屼娇"鑷富鍒涙剰骞朵翰鑷姩鎵嬪疄鐜板垱鎰"鐨勫垱瀹㈢簿绁炴繁鍏ヤ汉鎵嶅煿鍏绘椿鍔紝鍦ㄥ鐢熺兢浣撲腑褰㈡垚澶ц儐鍒涙剰銆佸ぇ鑳嗗疄璺电殑鍒涙柊鏂囧寲銆 +

+

+ 鐮斿埗鍥㈤槦璁や负锛孴rustie骞冲彴鏄竴绉"浜掕仈缃+"鎬濈淮鍦ㄩ珮鏍℃暀鑲查鍩熺殑澶у瀷鎺㈢储鎬у疄璺点備綔涓轰竴绉嶄簰鑱旂綉搴旂敤锛孴rustie骞冲彴鑷韩鐨勫紑鍙戜篃閲囧彇浜嗕簰鑱旂綉妯″紡锛歍rustie鐮斿埗鍥㈤槦閲囩敤浜"缃戞瀯鍖栬蒋浠跺紑鍙戞ā寮"锛屽潥鎸"姣忓懆涓鏇"鐨勫揩閫熶笂绾裤佸揩閫熶綋楠屾ā寮忥紝浠ユ渶澶х▼搴︿笂璐磋繎鐢ㄦ埛瀹為檯闇姹傛彁鍗囥傛杩庨珮鏍″笀鐢熶竴鍚屾姇韬垱鏂板疄璺碉紝鍏卞悓瑙佽瘉MOORE鍒涙柊鐢熸佺殑鏃╂棩褰㈡垚銆 +

+
+ + + +
+ +
+ + diff --git a/app/views/account/lost_password.html.erb b/app/views/account/lost_password.html.erb index 0e4ddd1ff..9881dd186 100644 --- a/app/views/account/lost_password.html.erb +++ b/app/views/account/lost_password.html.erb @@ -1,6 +1,6 @@ <%= stylesheet_link_tag 'new_user'%> -
+

蹇樿瀵嗙爜

diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb new file mode 100644 index 000000000..d55b714ad --- /dev/null +++ b/app/views/comments/create.js.erb @@ -0,0 +1,3 @@ +$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); + +init_KindEditor_data(<%= @user_activity_id%>); diff --git a/app/views/courses/search.html.erb b/app/views/courses/search.html.erb index c19f9821a..e7f344df2 100644 --- a/app/views/courses/search.html.erb +++ b/app/views/courses/search.html.erb @@ -20,12 +20,12 @@ <% end %> <% end %> - + diff --git a/app/views/issues/add_journal.js.erb b/app/views/issues/add_journal.js.erb new file mode 100644 index 000000000..efa5750c2 --- /dev/null +++ b/app/views/issues/add_journal.js.erb @@ -0,0 +1,3 @@ +$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>"); + +init_KindEditor_data(<%= @user_activity_id%>); \ No newline at end of file diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 720ff3e8f..d6368b4a0 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,9 +1,9 @@ -