From 43a3ad1ce8612d75eb43688de5ac34d6186ff2ba Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sun, 18 Sep 2016 09:38:02 +0800 Subject: [PATCH 01/48] =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA?= =?UTF-8?q?=E4=BD=9C=E8=80=85=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E7=94=B1?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8D=E6=94=B9=E4=B8=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index e4557b787..45891ae72 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -85,7 +85,7 @@ {:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"w90 mr18"} ) %> - <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]), + <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [User.find(c.user_id).show_name, c.user_id]}.unshift(["作者",0]), { :include_blank => false,:selected=>@author_id ? @author_id : 0 }, {:onchange=>"remote_function();",:id=>"author_id",:name=>"author_id",:class=>"w90 mr18"} From 4504308403bfc9820c93492515841c6fa884b37f Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sun, 18 Sep 2016 15:16:31 +0800 Subject: [PATCH 02/48] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E7=95=8C=E9=9D=A2=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin_controller.rb | 7 ++++++- app/views/admin/projects.html.erb | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 3f49abb23..01f16bc46 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -31,6 +31,7 @@ class AdminController < ApplicationController @no_configuration_data = Redmine::DefaultData::Loader::no_data? end + # 管理员界面 项目列表 def projects =begin @status = params[:status] || 1 @@ -39,7 +40,11 @@ class AdminController < ApplicationController scope = scope.like(params[:name]) if params[:name].present? @projects = scope.where(project_type: Project::ProjectType_project).reorder("created_on desc").all =end - @projects = Project.like(@name).order('created_on desc') + # 搜索功能 + @name = params[:name] || "" + condition = "#{@name.strip}".gsub(" ","") + @projects = Project.like(condition).order('created_on desc') + # 分页 @projects = paginateHelper @projects,30 @page = (params['page'] || 1).to_i - 1 render :action => "projects", :layout => false if request.xhr? diff --git a/app/views/admin/projects.html.erb b/app/views/admin/projects.html.erb index 80cc40fb0..4457eef59 100644 --- a/app/views/admin/projects.html.erb +++ b/app/views/admin/projects.html.erb @@ -18,7 +18,7 @@ - <%= text_field_tag 'name', params[:name], :size => 30 %> + <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '输入项目名称进行搜索' %> <%= submit_tag l(:button_apply), :class => "small", :name => nil %> <%= link_to l(:button_clear), {:controller => 'admin', :action => 'projects'}, :class => 'icon icon-reload' %> From 984b540a63f61ed38e2466574c50ffceb14fc894 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 19 Sep 2016 10:01:22 +0800 Subject: [PATCH 03/48] =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E5=85=A5=E5=85=B7=E4=BD=93=E7=9A=84=E7=8F=AD?= =?UTF-8?q?=E7=BA=A7=E5=92=8C=E9=A1=B9=E7=9B=AE=E5=90=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E7=9A=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 4 +-- app/helpers/courses_helper.rb | 6 ++++- .../attachments/_project_file_links.html.erb | 14 +++++++--- app/views/files/_project_list.html.erb | 6 ++--- app/views/layouts/base_courses.html.erb | 6 ++--- app/views/users/_course_boardlist.html.erb | 26 +++++++++---------- app/views/users/_course_newslist.html.erb | 4 +-- app/views/users/_project_boardlist.html.erb | 4 +-- 8 files changed, 41 insertions(+), 29 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b5b6c5bd0..4352de732 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1360,7 +1360,7 @@ module ApplicationHelper :id => wiki_page_id, :version => nil, :anchor => anchor, :parent => parent) end end - link_to(title.present? ? title.html_safe : h(page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new'))) + link_to(title.present? ? title.html_safe : h(page), User.current.logged? ? url : signin_url_without_domain, :class => ('wiki-page' + (wiki_page ? '' : ' new'))) else # project or wiki doesn't exist all @@ -2881,7 +2881,7 @@ module ApplicationHelper def file_preview_eye(file, html_options={}) if %w(pdf pptx doc docx xls xlsx).any?{|x| file.filename.downcase.end_with?(x)} - link_to '', download_named_attachment_path(file.id, file.filename, preview: true),html_options + link_to '', User.current.logged? ? download_named_attachment_path(file.id, file.filename, preview: true) : signin_url_without_domain, html_options end end diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 8f0d10634..4308fd816 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -803,7 +803,11 @@ module CoursesHelper link = link_to(text, url, :remote => true, :method => method, :id => "#{course.id}", :class => "sy_btn_grey fl") end else - link = "#{l(:label_course_join_student)}" + if User.current.logged? + link = "#{l(:label_course_join_student)}" + else + link = link_to(l(:label_course_join_student), signin_url_without_domain, :class => "sy_btn_grey fl ml10") + end end link.html_safe end diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb index 4d261c5d1..82544544a 100644 --- a/app/views/attachments/_project_file_links.html.erb +++ b/app/views/attachments/_project_file_links.html.erb @@ -35,9 +35,17 @@ <% end%> <% if options[:length] %> - <%= link_to_short_attachment attachment, :class => ' link_file_board', :download => true,:length => options[:length] -%> + <% if User.current.logged? %> + <%= link_to_short_attachment attachment, :class => ' link_file_board', :download => true,:length => options[:length] -%> + <% else %> + <%= link_to(attachment.filename, signin_url_without_domain, :class => "link_file_board", :length => options[:length]) %> + <% end %> <% else %> - <%= link_to_short_attachment attachment, :length=> 58,:class => 'hidden link_file_a fl newsBlue mw400', :download => true -%> + <% if User.current.logged? %> + <%= link_to_short_attachment attachment, :length=> 58,:class => 'hidden link_file_a fl newsBlue mw400', :download => true -%> + <% else %> + <%= link_to(attachment.filename, signin_url_without_domain,:length=> 58, :class => "hidden link_file_a fl newsBlue mw400") %> + <% end %> <% end %> <%if is_float%> @@ -92,7 +100,7 @@ <% end %> <% if options[:author] %> - <%= link_to h(truncate(attachment.author.show_name, length: 10, omission: '...')),user_path(attachment.author),:class => "link-blue" %>, + <%= link_to h(truncate(attachment.author.show_name, length: 10, omission: '...')), User.current.logged? ? user_path(attachment.author) : signin_url_without_domain, :class => "link-blue" %>, <%= format_time(attachment.created_on) %> <% end %> diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb index faf254015..f03114d69 100644 --- a/app/views/files/_project_list.html.erb +++ b/app/views/files/_project_list.html.erb @@ -11,15 +11,15 @@ <%# 如果有历史版本则提供历史版本下载 %> <% if file.attachment_histories.count == 0 %> <%= link_to truncate(file.filename,length: 35, omission: '...'), - download_named_attachment_path(file.id, file.filename), + User.current.logged? ? download_named_attachment_path(file.id, file.filename) : signin_url_without_domain, :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14" %> <% else %> - <%= link_to truncate(file.filename,length: 35, omission: '...'), attachment_history_download_path(file.id), + <%= link_to truncate(file.filename,length: 35, omission: '...'), User.current.logged? ? attachment_history_download_path(file.id) : signin_url_without_domain, :title => file.filename+"\n"+file.description.to_s, :class => "linkGrey3 f_14", :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :remote=>true %> <% end %> - <%= file_preview_eye(file, class: 'preview') %> + <%= file_preview_eye(file, class: 'preview') %> <% if file.is_public? == false%> 私有 diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 84aa054e0..49788bc9f 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -68,7 +68,7 @@
  • <% count = @course.boards.first ? (@course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", @course.boards.first.id, nil).count) : 0 %> 讨论区<%=count %> - <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %> + <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") if is_teacher %>
    • <% end %> <% unless show_nav?(@course.homework_commons.count) %> @@ -94,7 +94,7 @@ <% unless show_nav?(course_feedback_count) %>
  • 留言<%=course_feedback_count %> - <%= link_to "", course_feedback_path(@course), :class => 'sy_class_add', :title =>"#{l(:label_course_feedback)}"%> + <%= link_to( "", course_feedback_path(@course), :class => 'sy_class_add', :title =>"#{l(:label_course_feedback)}") if is_teacher %>
    • <% end %> <% unless show_nav?(course_poll_count) %> @@ -106,7 +106,7 @@ <% count = User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count %> <% unless show_nav?(count) %>
  • - 在线测验<%=count %> + 在线测验<%=count %> <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %>
    • <% end %> diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb index 86b308778..b8a6be169 100644 --- a/app/views/users/_course_boardlist.html.erb +++ b/app/views/users/_course_boardlist.html.erb @@ -19,19 +19,19 @@ <% topics.each do |activity| %>
    - <% if activity.parent_id.nil? %> - <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %> - <% else %> - <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %> - <% end %> - <% if activity.sticky == 1 %> - 顶 - <% end%> - <% if activity.locked %> - 锁 - <% end %> - <% u = User.where("id=?",activity.author_id).first%> -
    + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class => "list-title fl" %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class => "list-title f1" %> + <% end %> + <% if activity.sticky == 1 %> + 顶 + <% end%> + <% if activity.locked %> + 锁 + <% end %> + <% u = User.where("id=?",activity.author_id).first%> +
    <% if activity.parent_id.nil? %> diff --git a/app/views/users/_course_newslist.html.erb b/app/views/users/_course_newslist.html.erb index 87dbe6b95..4eb013075 100644 --- a/app/views/users/_course_newslist.html.erb +++ b/app/views/users/_course_newslist.html.erb @@ -19,11 +19,11 @@ <% topics.each do |activity| %>
    - <%= link_to activity.title.to_s, news_path(activity), :class => "list-title fl" %> + <%= link_to activity.title.to_s, User.current.logged? ? news_path(activity) : signin_url_without_domain, :class => "list-title fl" %> <% if activity.sticky == 1 %> 顶 <% end%> - <% u = User.where("id=?",activity.author_id).first%> + <% u = User.where("id=?", activity.author_id).first %>
    diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb index 3ba0244d9..fdffc052d 100644 --- a/app/views/users/_project_boardlist.html.erb +++ b/app/views/users/_project_boardlist.html.erb @@ -20,9 +20,9 @@
    <% if activity.parent_id.nil? %> - <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %> + <%= link_to activity.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class=> "list-title fl" %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %> + <%= link_to activity.parent.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class=> "list-title f1" %> <% end %> <% if activity.sticky == 1 %> 顶 From 673b68f2a28148480139d3ae8af139a6d5ec0162 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 19 Sep 2016 13:37:18 +0800 Subject: [PATCH 04/48] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=9C=A8?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7=EF=BC=8C=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E8=B4=B4=E5=90=A7=E6=80=BB=E6=8F=90=E7=A4=BA=E2=80=9C=E6=8F=90?= =?UTF-8?q?=E6=8B=94=E5=90=8D=E7=A7=B0=E5=B7=B2=E5=AD=98=E5=9C=A8=E2=80=9D?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/forums_controller.rb | 10 +++++----- app/views/forums/index.html.erb | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb index 3332f1207..6ebe6b9eb 100644 --- a/app/controllers/forums_controller.rb +++ b/app/controllers/forums_controller.rb @@ -296,12 +296,12 @@ class ForumsController < ApplicationController #检查forum的名字 def check_forum_name - forum_name_exist = true - if params[:forum_id] - forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false - else + forum_name_exist = false + # if params[:forum_id] + # forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false + # else forum_name_exist = Forum.where("name = '#{params[:forum_name]}' ").count >= 1 ? true : false - end + # end render :text => forum_name_exist end diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index 376ca420a..9b18070a8 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -74,6 +74,7 @@ }); function check_and_submit(doc){ $("#error").html('').hide(); + check_forum_name(); if( $("textarea[name='forum[name]']").val().trim() == "" && $("textarea[name='forum[description]']").val().trim() != "" ){ $("#error").html("名称不能为空").show(); return; From 436fb3e96e19bdf74a4049e2299f310bddfaa799 Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 8 Oct 2016 15:26:47 +0800 Subject: [PATCH 05/48] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E7=9A=84=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E6=8D=A2=E6=88=90?= =?UTF-8?q?=E6=96=B0=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homework_common/_homework_index_list.html.erb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb index 063621399..6c8145e58 100644 --- a/app/views/homework_common/_homework_index_list.html.erb +++ b/app/views/homework_common/_homework_index_list.html.erb @@ -1,8 +1,10 @@ <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => homework_commons,:page => 0,:course_id => course_id} %> -
    -
      - <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> -
    -
    +
    +
    +
      + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true%> +
    +
    +
    \ No newline at end of file From f332f2a46930f00a59521632a879c4c4b3e6538c Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 8 Oct 2016 17:50:06 +0800 Subject: [PATCH 06/48] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E7=9A=84=E5=9B=9E=E5=A4=8D=E4=BD=9C=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org_document_comments_controller.rb | 7 ++ .../_document_show_replies.html.erb | 64 ++++++++++++++++++ app/views/org_document_comments/show.html.erb | 67 ++----------------- app/views/org_document_comments/show.js.erb | 1 + 4 files changed, 79 insertions(+), 60 deletions(-) create mode 100644 app/views/org_document_comments/_document_show_replies.html.erb create mode 100644 app/views/org_document_comments/show.js.erb diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index a8a294d4d..19e06fb70 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -40,7 +40,14 @@ class OrgDocumentCommentsController < ApplicationController @document = OrgDocumentComment.find(params[:id]) @org_subfield = OrgSubfield.where(:id => @document.org_subfield_id).first @subfield_content = @organization.org_subfields.order("priority") + all_comments = [] + @replies = get_all_children(all_comments, @document) + @reply_count = @replies.count + @page = params[:page] ? params[:page].to_i + 1 : 0 + @limit = 10 + @replies = @replies[@page * @limit..@page * @limit + 9] respond_to do |format| + format.js format.html {render :layout => (@organization.switch_type && @document && !@document.org_subfield_id.blank?) ? 'base_org_custom' : 'base_org'} end end diff --git a/app/views/org_document_comments/_document_show_replies.html.erb b/app/views/org_document_comments/_document_show_replies.html.erb new file mode 100644 index 000000000..9032edce6 --- /dev/null +++ b/app/views/org_document_comments/_document_show_replies.html.erb @@ -0,0 +1,64 @@ +
    + <% @replies.each do |comment| %> + +
  • +
    + <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %> +
    +
    + <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%> + + <% if !comment.content_detail.blank? %> +
    + <%= comment.content_detail.html_safe %> +
    +
    +
    + + + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> + + + <%= link_to( + l(:button_reply), + {:controller => 'org_document_comments',:action => 'quote',:user_id=>comment.creator_id, :id => comment.id}, + :remote => true, + :method => 'get', + :title => l(:button_reply)) %> + + + <% if comment.creator_user == User.current %> + <%= link_to( + l(:button_delete), + {:controller => 'org_document_comments',:action => 'delete_reply', :id => comment.id}, + :method => :delete, + :id => "delete_reply_#{comment.id}", + :class => 'fr mr20 undis', + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete)) %> + <% end %> + +
    +
    +
    +

    + <% end %> +
    +
    +
    • + <% end %> +
    +<% if @reply_count > @page * @limit + 10 %> +
    +
    + ↓ + + <%= link_to '点击展开更多回复', org_document_comment_path(@document, :organization_id =>@organization.id, :page => @page),:remote=>true %> +
    +
    +<% end %> \ No newline at end of file diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index 0fe72ad36..c12711c54 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -74,77 +74,24 @@ <% end %>
    - <% all_comments = []%> - <% all_replies = get_all_children(all_comments, @document) %> - <% count = all_replies.count %> + <%# all_comments = []%> + <%# all_replies = get_all_children(all_comments, @document) %> + <%# count = all_replies.count %>
    <%# if count > 0 %>
    回复 - <%= count>0 ? "（#{count}）" : "" %>▪ + <%= @reply_count>0 ? "（#{@reply_count}）" : "" %>▪ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@document, :user_activity_id=>@document.id,:type=>"activity"}%>
    - <% comments = all_replies %> -
    - <% comments.each do |comment| %> - -
  • -
    - <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %> -
    -
    - <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%> - - <% if !comment.content_detail.blank? %> -
    - <%= comment.content_detail.html_safe %> -
    -
    -
    - - - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - - - <%= link_to( - l(:button_reply), - {:controller => 'org_document_comments',:action => 'quote',:user_id=>comment.creator_id, :id => comment.id}, - :remote => true, - :method => 'get', - :title => l(:button_reply)) %> - - - <% if comment.creator_user == User.current %> - <%= link_to( - l(:button_delete), - {:controller => 'org_document_comments',:action => 'delete_reply', :id => comment.id}, - :method => :delete, - :id => "delete_reply_#{comment.id}", - :class => 'fr mr20 undis', - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete)) %> - <% end %> - -
    -
    -
    -

    - <% end %> -
    -
    -
    • - <% end %> - + <%# comments = all_replies %> +
    + <%= render :partial => "document_show_replies" %>
    <%# end %> diff --git a/app/views/org_document_comments/show.js.erb b/app/views/org_document_comments/show.js.erb new file mode 100644 index 000000000..f164d10ec --- /dev/null +++ b/app/views/org_document_comments/show.js.erb @@ -0,0 +1 @@ +$("#more_document_replies").replaceWith("<%= escape_javascript(render :partial => 'org_document_comments/document_show_replies')%>"); \ No newline at end of file From d407b5ab10956191c1329954b1a72630a4c42cb6 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sun, 9 Oct 2016 10:35:43 +0800 Subject: [PATCH 07/48] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 15 ++++--- app/models/syllabus.rb | 28 +++++++++++++ app/views/layouts/_logined_header.html.erb | 2 +- .../welcome/_search_syllabus_results.html.erb | 11 +++++ app/views/welcome/search.html.erb | 42 +++++++++++-------- 5 files changed, 75 insertions(+), 23 deletions(-) create mode 100644 app/views/welcome/_search_syllabus_results.html.erb diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 1508fc871..1d8f95779 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -161,7 +161,7 @@ class WelcomeController < ApplicationController query: @name, type:"most_fields", operator: "or", - fields: ['login', 'firstname','lastname','name','description^0.5','filename','subject','content^0.5'] + fields: ['login', 'firstname','lastname','title','name','description^0.5','filename','subject','content^0.5'] } }, highlight: { @@ -171,6 +171,7 @@ class WelcomeController < ApplicationController login: {}, firstname: {}, lastname: {}, + title:{}, name:{}, description:{}, filename:{}, @@ -181,6 +182,8 @@ class WelcomeController < ApplicationController },[User,Course,Attachment,Project,Memo] ).page(params[:page] || 1).per(20).results when 'user' @users = User.search(@name).page(params[:page] || 1).per(20) + when 'syllabus' + @syllabuses = Syllabus.search(@name).page(params[:page] || 1).per(20) when 'project' @projects = Project.search(@name).page(params[:page] || 1).per(20).results when 'course' @@ -196,7 +199,7 @@ class WelcomeController < ApplicationController query: @name, type:"most_fields", operator: "or", - fields: ['login', 'firstname','lastname','name','description^0.5','filename','subject','content^0.5'] + fields: ['login', 'firstname','lastname','title','name','description^0.5','filename','subject','content^0.5'] } }, highlight: { @@ -206,6 +209,7 @@ class WelcomeController < ApplicationController login: {}, firstname: {}, lastname: {}, + title:{}, name:{}, description:{}, filename:{}, @@ -213,12 +217,12 @@ class WelcomeController < ApplicationController content:{} } } - },[User,Course,Attachment,Project,Memo] ).page(params[:page] || 1).per(20).results + },[User,Syllabus,Course,Attachment,Project,Memo] ).page(params[:page] || 1).per(20).results end @users_count = User.search(@name).results.total - + @syllabus_count = Syllabus.search(@name).results.total @course_count = Course.search(@name).results.total @attach_count = Attachment.search(@name).results.total @project_count = Project.search(@name).results.total @@ -229,7 +233,7 @@ class WelcomeController < ApplicationController query: @name, type:"most_fields", operator: "or", - fields: ['login', 'firstname','lastname','name','description^0.5','filename','subject','content^0.5'] + fields: ['login', 'firstname','lastname','title','name','description^0.5','filename','subject','content^0.5'] } }, highlight: { @@ -239,6 +243,7 @@ class WelcomeController < ApplicationController login: {}, firstname: {}, lastname: {}, + title:{}, name:{}, description:{}, filename:{}, diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb index f72463503..2f69ce5c4 100644 --- a/app/models/syllabus.rb +++ b/app/models/syllabus.rb @@ -57,4 +57,32 @@ class Syllabus < ActiveRecord::Base jfm.save jfm end + + def self.search(query) + __elasticsearch__.search( + { + query: { + multi_match: { + query: query, + type:"most_fields", + operator: "or", + fields: ['title', 'description^0.5'] + } + }, + sort: { + _score:{order: "desc" }, + updated_at:{order:"desc"} + + }, + highlight: { + pre_tags: [''], + post_tags: [''], + fields: { + title: {}, + description: {} + } + } + } + ) + end end diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index cda8e8be5..5f350dd65 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -47,7 +47,7 @@ <% name = name%> <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %> - " id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的班级、项目、用户、资源以及帖子"/> + " id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的课程、班级、项目、用户、资源以及帖子"/> diff --git a/app/views/welcome/_search_syllabus_results.html.erb b/app/views/welcome/_search_syllabus_results.html.erb new file mode 100644 index 000000000..6dd9b382a --- /dev/null +++ b/app/views/welcome/_search_syllabus_results.html.erb @@ -0,0 +1,11 @@ +<% unless syllabuses.nil? || syllabuses.empty?%> + <% syllabuses.each do |syllabus|%> +
      +
    • <%= syllabus.title %>课程
      课程
      • +
    • 创建者：<%=syllabus.user.login+"("+syllabus.user.show_name+")"%>教师团队：<%=syllabus.syllabus_member.count%>班级：<%=syllabus.courses.count%>更新时间：<%=format(syllabus.updated_at)%>单位：<%=syllabus.user.user_extensions.occupation.present? ? syllabus.user.user_extensions.occupation:'' %>
      • +
    + <% end %> +
    + <%= paginate courses,:params => {:controller => 'welcome', :action => 'search',:search_type=>'course'}%> +
    +<% end %> \ No newline at end of file diff --git a/app/views/welcome/search.html.erb b/app/views/welcome/search.html.erb index 15491c1c0..d167920e9 100644 --- a/app/views/welcome/search.html.erb +++ b/app/views/welcome/search.html.erb @@ -3,7 +3,7 @@ function g(o){return document.getElementById(o);} function HoverLi(n){ //如果有N个标签,就将i<=N; - for(var i=1;i<=6;i++){ + for(var i=1;i<=7;i++){ g('searchBaner_'+i).className='searchBannerNormal'; g('searchContent_'+i).className='undis';g('searchNum_'+i).className="numRed"; g('searchType_'+i).className="fontGrey2 f14"; @@ -23,12 +23,14 @@ //$("#searchContent_2").html('<%#= escape_javascript(render :partial => 'search_user_results',:locals => {:users=>@users})%>'); search('user') }else if(n == 3){ - search('course') + search('syllabus') }else if(n == 4){ - search('attachment') + search('course') }else if(n == 5){ - search('project') + search('attachment') }else if(n == 6){ + search('project') + }else if(n == 7){ search('memo') } } @@ -49,19 +51,22 @@ }else if('<%= @search_type%>' == 'user'){ HoverLi(2) $("#searchContent_2").html('<%= escape_javascript(render :partial => 'search_user_results',:locals => {:users=>@users})%>'); - }else if('<%= @search_type%>' == 'course'){ + }else if('<%= @search_type%>' == 'syllabus'){ HoverLi(3) - $("#searchContent_3").html('<%= escape_javascript(render :partial => 'search_course_results',:locals => {:courses=>@courses})%>'); - }else if('<%= @search_type%>' == 'attachment'){ + $("#searchContent_3").html('<%= escape_javascript(render :partial => 'search_syllabus_results',:locals => {:syllabuses=>@syllabuses})%>'); + }else if('<%= @search_type%>' == 'course'){ HoverLi(4) - $("#searchContent_4").html('<%= escape_javascript(render :partial => 'search_attachment_results',:locals => {:attachments=>@attachments})%>'); - }else if('<%= @search_type%>' == 'project'){ + $("#searchContent_4").html('<%= escape_javascript(render :partial => 'search_course_results',:locals => {:courses=>@courses})%>'); + }else if('<%= @search_type%>' == 'attachment'){ HoverLi(5) - $("#searchContent_5").html('<%= escape_javascript(render :partial => 'search_project_results',:locals => {:projects=>@projects})%>'); + $("#searchContent_5").html('<%= escape_javascript(render :partial => 'search_attachment_results',:locals => {:attachments=>@attachments})%>'); + }else if('<%= @search_type%>' == 'project'){ + HoverLi(6) + $("#searchContent_6").html('<%= escape_javascript(render :partial => 'search_project_results',:locals => {:projects=>@projects})%>'); }else if('<%= @search_type%>' == 'memo') { - HoverLi(6) - $("#searchContent_6").html('<%= escape_javascript(render :partial => 'search_memo_results',:locals => {:memos=>@memos})%>'); + HoverLi(7) + $("#searchContent_7").html('<%= escape_javascript(render :partial => 'search_memo_results',:locals => {:memos=>@memos})%>'); } }) //如果要做成点击后再转到请将
  • 中的onmouseover 改成 onclick; @@ -79,10 +84,11 @@
    • From cd34388909b0b527efe095c69c931949b9a372ef Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sun, 9 Oct 2016 11:01:52 +0800 Subject: [PATCH 08/48] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/_search_syllabus_results.html.erb | 4 ++-- app/views/welcome/search.js.erb | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/welcome/_search_syllabus_results.html.erb b/app/views/welcome/_search_syllabus_results.html.erb index 6dd9b382a..8c95a1e84 100644 --- a/app/views/welcome/_search_syllabus_results.html.erb +++ b/app/views/welcome/_search_syllabus_results.html.erb @@ -2,10 +2,10 @@ <% syllabuses.each do |syllabus|%>
    • <%= syllabus.title %>课程
      课程
      • -
    • 创建者：<%=syllabus.user.login+"("+syllabus.user.show_name+")"%>教师团队：<%=syllabus.syllabus_member.count%>班级：<%=syllabus.courses.count%>更新时间：<%=format(syllabus.updated_at)%>单位：<%=syllabus.user.user_extensions.occupation.present? ? syllabus.user.user_extensions.occupation:'' %>
      • +
    • 创建者：<%=syllabus.user.login+"("+syllabus.user.show_name+")"%>教师团队：<%=syllabus.syllabus_members.count%>班级：<%=syllabus.courses.count%>更新时间：<%=format_date(syllabus.updated_at)%>单位：<%=syllabus.user.user_extensions.occupation.present? ? syllabus.user.user_extensions.occupation:'' %>
    <% end %>
    - <%= paginate courses,:params => {:controller => 'welcome', :action => 'search',:search_type=>'course'}%> + <%= paginate syllabuses,:params => {:controller => 'welcome', :action => 'search',:search_type=>'syllabus'}%>
    <% end %> \ No newline at end of file diff --git a/app/views/welcome/search.js.erb b/app/views/welcome/search.js.erb index 5cb446896..f6081c86b 100644 --- a/app/views/welcome/search.js.erb +++ b/app/views/welcome/search.js.erb @@ -3,13 +3,15 @@ $("#searchContent_1").html('<%= escape_javascript(render :partial => 'search_all_results',:locals => {:all_results=> @alls})%>'); <% when 'user'%> $("#searchContent_2").html('<%= escape_javascript(render :partial => 'search_user_results',:locals => {:users=>@users})%>'); +<% when 'syllabus'%> +$("#searchContent_3").html('<%= escape_javascript(render :partial => 'search_syllabus_results',:locals => {:syllabuses=>@syllabuses})%>'); <% when 'course'%> -$("#searchContent_3").html('<%= escape_javascript(render :partial => 'search_course_results',:locals => {:courses=>@courses})%>'); +$("#searchContent_4").html('<%= escape_javascript(render :partial => 'search_course_results',:locals => {:courses=>@courses})%>'); <% when 'project'%> -$("#searchContent_5").html('<%= escape_javascript(render :partial => 'search_project_results',:locals => {:projects=>@projects})%>'); +$("#searchContent_6").html('<%= escape_javascript(render :partial => 'search_project_results',:locals => {:projects=>@projects})%>'); <% when 'attachment'%> -$("#searchContent_4").html('<%= escape_javascript(render :partial => 'search_attachment_results',:locals => {:attachments=>@attachments})%>'); +$("#searchContent_5").html('<%= escape_javascript(render :partial => 'search_attachment_results',:locals => {:attachments=>@attachments})%>'); <% when 'memo'%> -$("#searchContent_6").html('<%= escape_javascript(render :partial => 'search_memo_results',:locals => {:memos=>@memos})%>'); +$("#searchContent_7").html('<%= escape_javascript(render :partial => 'search_memo_results',:locals => {:memos=>@memos})%>'); <%else%> <%end %> \ No newline at end of file From 3b44f05b2ba657d95e107096f995aa5fb58a0ed5 Mon Sep 17 00:00:00 2001 From: cxt Date: Sun, 9 Oct 2016 11:12:44 +0800 Subject: [PATCH 09/48] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E7=9A=84=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=9B=9E=E5=A4=8D=E5=88=86=E9=A1=B5=E3=80=81?= =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=88=97=E8=A1=A8=E7=9A=84=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E6=95=B0=E6=9C=AA=E7=BB=9F=E8=AE=A1=E4=BA=8C=E7=BA=A7=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/blog_comments_controller.rb | 7 ++ .../_blog_comment_show_replies.html.erb | 63 ++++++++++++++++++ app/views/blog_comments/show.html.erb | 66 ++----------------- app/views/blog_comments/show.js.erb | 1 + app/views/blogs/_article.html.erb | 13 ++-- app/views/blogs/_article_list.html.erb | 2 +- 6 files changed, 86 insertions(+), 66 deletions(-) create mode 100644 app/views/blog_comments/_blog_comment_show_replies.html.erb create mode 100644 app/views/blog_comments/show.js.erb diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb index dcd549d76..46c8f5c0c 100644 --- a/app/controllers/blog_comments_controller.rb +++ b/app/controllers/blog_comments_controller.rb @@ -40,7 +40,14 @@ class BlogCommentsController < ApplicationController end def show @article = BlogComment.find(params[:id]) + all_comments = [] + @replies = get_all_children(all_comments, @article) + @reply_count = @replies.count + @page = params[:page] ? params[:page].to_i + 1 : 0 + @limit = 10 + @replies = @replies[@page * @limit..@page * @limit + 9] respond_to do |format| + format.js format.html {render :layout=>'new_base_user'} end end diff --git a/app/views/blog_comments/_blog_comment_show_replies.html.erb b/app/views/blog_comments/_blog_comment_show_replies.html.erb new file mode 100644 index 000000000..ba33aaf5a --- /dev/null +++ b/app/views/blog_comments/_blog_comment_show_replies.html.erb @@ -0,0 +1,63 @@ +<% @replies.each do |comment| %> + +
  • +
    + <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %> +
    +
    + <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%> + + <% if !comment.content_detail.blank? %> +
    + <%= comment.content_detail.html_safe %> +
    +
    +
    + + + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> + + + <%= link_to( + l(:button_reply), + {:controller => 'blog_comments', :action => 'quote', :user_id => comment.author_id, :blog_id => comment.blog_id, :id => comment.id}, + :remote => true, + :method => 'get', + :title => l(:button_reply)) if !@article.locked? %> + + + <% if comment.author == User.current %> + <%= link_to( + l(:button_delete), + {:controller => 'blog_comments', :action => 'destroy', :id => comment.id}, + :method => :delete, + :id => "delete_reply_#{comment.id}", + :class => 'fr mr20 undis', + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete) + ) %> + <% end %> + +
    +
    +
    +

    + <% end %> +
    +
    +
    • +<% end %> +<% if @reply_count > @page * @limit + 10 %> +
    +
    + ↓ + + <%= link_to '点击展开更多回复', blog_comment_path(@article, :page => @page),:remote=>true %> +
    +
    +<% end %> diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 7143e980b..41bcdf4c4 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -105,13 +105,13 @@
    - <% all_comments = []%> - <% all_replies = get_all_children(all_comments, @article) %> - <% count= all_replies.count %> + <%# all_comments = []%> + <%# all_replies = get_all_children(all_comments, @article) %> + <%# count= all_replies.count %>
    回复 - <%= count>0 ? "（#{count}）" : "" %> + <%= @reply_count > 0 ? "（#{@reply_count}）" : "" %> ▪ <%= render :partial => "praise_tread/praise", :locals => {:activity => @article, :user_activity_id => @article.id, :type => "activity"} %> @@ -120,62 +120,10 @@
    - <% comments = all_replies %> - <% if count > 0 %> + <%# comments = all_replies %> + <% if @reply_count > 0 %>
    - <% comments.each do |comment| %> - -
  • -
    - <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %> -
    -
    - <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%> - - <% if !comment.content_detail.blank? %> -
    - <%= comment.content_detail.html_safe %> -
    -
    -
    - - - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - - - <%= link_to( - l(:button_reply), - {:controller => 'blog_comments', :action => 'quote', :user_id => comment.author_id, :blog_id => comment.blog_id, :id => comment.id}, - :remote => true, - :method => 'get', - :title => l(:button_reply)) if !@article.locked? %> - - - <% if comment.author == User.current %> - <%= link_to( - l(:button_delete), - {:controller => 'blog_comments', :action => 'destroy', :id => comment.id}, - :method => :delete, - :id => "delete_reply_#{comment.id}", - :class => 'fr mr20 undis', - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete) - ) %> - <% end %> - -
    -
    -
    -

    - <% end %> -
    -
    -
    • <% end %> + <%= render :partial => 'blog_comment_show_replies' %>
    <% end %> diff --git a/app/views/blog_comments/show.js.erb b/app/views/blog_comments/show.js.erb new file mode 100644 index 000000000..be5362685 --- /dev/null +++ b/app/views/blog_comments/show.js.erb @@ -0,0 +1 @@ +$("#more_blog_replies").replaceWith("<%= escape_javascript(render :partial => 'blog_comment_show_replies')%>"); \ No newline at end of file diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index dd818fe72..620d68bec 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -36,12 +36,13 @@ <% end %>
    - <% count=0 %> - <% if activity.parent %> - <% count=activity.parent.children.count%> - <% else %> - <% count=activity.children.count%> - <% end %> + <% all_comments = [] %> + <% count = (get_all_children all_comments, activity).count %> + <%# if activity.parent %> + <%# count=activity.parent.children.count%> + <%# else %> + <%# count=activity.children.count%> + <%# end %>
  • 发布：<%= format_time(activity.created_on) %> 更新：<%= format_time(activity.updated_on) %> diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb index c52fa017e..da5e78c73 100644 --- a/app/views/blogs/_article_list.html.erb +++ b/app/views/blogs/_article_list.html.erb @@ -39,7 +39,7 @@
    - <%= @user.name%>的博客 + <%= @user.show_name%>的博客
    From f380c64653707cbde25d6579c84907a9779c6215 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sun, 9 Oct 2016 11:27:35 +0800 Subject: [PATCH 10/48] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/syllabus.rb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb index 2f69ce5c4..b046ce2cd 100644 --- a/app/models/syllabus.rb +++ b/app/models/syllabus.rb @@ -17,6 +17,10 @@ class Syllabus < ActiveRecord::Base validates :title, :user_id, presence: true + after_update :update_syllabus_ealasticsearch_index + after_create :create_syllabus_ealasticsearch_index + before_destroy :delete_syllabus_ealasticsearch_index + scope :like, lambda {|arg| if arg.blank? where(nil) @@ -58,6 +62,29 @@ class Syllabus < ActiveRecord::Base jfm end + def create_syllabus_ealasticsearch_index + return if Rails.env.development? + self.__elasticsearch__.index_document + end + + def update_syllabus_ealasticsearch_index + return if Rails.env.development? + begin + self.__elasticsearch__.update_document + rescue => e + self.__elasticsearch__.index_document + end + end + + def delete_syllabus_ealasticsearch_index + return if Rails.env.development? + begin + self.__elasticsearch__.delete_document + rescue => e + + end + end + def self.search(query) __elasticsearch__.search( { From 1fe2f8946bfa40a1cba9bf8da73fa8e307a096f1 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sun, 9 Oct 2016 12:10:34 +0800 Subject: [PATCH 11/48] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=BE=E7=A8=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/syllabus.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb index b046ce2cd..6bd770d5d 100644 --- a/app/models/syllabus.rb +++ b/app/models/syllabus.rb @@ -2,6 +2,7 @@ class Syllabus < ActiveRecord::Base include Redmine::SafeAttributes include ApplicationHelper + include Elasticsearch::Model acts_as_taggable acts_as_attachable has_many_kindeditor_assets :assets, :dependent => :destroy From 9dd6a6531698a786964db24cd0cced693e2dce90 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sun, 9 Oct 2016 13:16:03 +0800 Subject: [PATCH 12/48] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/syllabus.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb index 6bd770d5d..fff88c83f 100644 --- a/app/models/syllabus.rb +++ b/app/models/syllabus.rb @@ -2,7 +2,18 @@ class Syllabus < ActiveRecord::Base include Redmine::SafeAttributes include ApplicationHelper + #elasticsearch include Elasticsearch::Model + #elasticsearch kaminari init + Kaminari::Hooks.init + Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari + settings index: { number_of_shards: 5 } do + mappings dynamic: 'false' do + indexes :name, analyzer: 'smartcn',index_options: 'offsets' + indexes :description, analyzer: 'smartcn',index_options: 'offsets' + indexes :updated_on, index:"not_analyzed", type:'date' + end + end acts_as_taggable acts_as_attachable has_many_kindeditor_assets :assets, :dependent => :destroy From 28d6bca3df09751f998a8c137eef0eb5d2d95002 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sun, 9 Oct 2016 13:29:13 +0800 Subject: [PATCH 13/48] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/syllabus.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb index fff88c83f..5314f8dbd 100644 --- a/app/models/syllabus.rb +++ b/app/models/syllabus.rb @@ -9,9 +9,9 @@ class Syllabus < ActiveRecord::Base Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari settings index: { number_of_shards: 5 } do mappings dynamic: 'false' do - indexes :name, analyzer: 'smartcn',index_options: 'offsets' + indexes :title, analyzer: 'smartcn',index_options: 'offsets' indexes :description, analyzer: 'smartcn',index_options: 'offsets' - indexes :updated_on, index:"not_analyzed", type:'date' + indexes :updated_at, index:"not_analyzed", type:'date' end end acts_as_taggable From c90d8d6bea38c52da656a96e8005dab1e12094ef Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sun, 9 Oct 2016 13:32:31 +0800 Subject: [PATCH 14/48] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/_search_syllabus_results.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/welcome/_search_syllabus_results.html.erb b/app/views/welcome/_search_syllabus_results.html.erb index 8c95a1e84..842cceb2b 100644 --- a/app/views/welcome/_search_syllabus_results.html.erb +++ b/app/views/welcome/_search_syllabus_results.html.erb @@ -1,7 +1,7 @@ <% unless syllabuses.nil? || syllabuses.empty?%> <% syllabuses.each do |syllabus|%>
      -
    • <%= syllabus.title %>课程
      课程
      • +
    • <%= syllabus.title %>课程
      课程
    • 创建者：<%=syllabus.user.login+"("+syllabus.user.show_name+")"%>教师团队：<%=syllabus.syllabus_members.count%>班级：<%=syllabus.courses.count%>更新时间：<%=format_date(syllabus.updated_at)%>单位：<%=syllabus.user.user_extensions.occupation.present? ? syllabus.user.user_extensions.occupation:'' %>
    <% end %> From 11edc93c0f9f154461ebbef53698f081ea25b320 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sun, 9 Oct 2016 13:48:38 +0800 Subject: [PATCH 15/48] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/_search_syllabus_results.html.erb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/views/welcome/_search_syllabus_results.html.erb b/app/views/welcome/_search_syllabus_results.html.erb index 842cceb2b..f59b83d9a 100644 --- a/app/views/welcome/_search_syllabus_results.html.erb +++ b/app/views/welcome/_search_syllabus_results.html.erb @@ -1,8 +1,17 @@ <% unless syllabuses.nil? || syllabuses.empty?%> <% syllabuses.each do |syllabus|%>
      -
    • <%= syllabus.title %>课程
      课程
      • -
    • 创建者：<%=syllabus.user.login+"("+syllabus.user.show_name+")"%>教师团队：<%=syllabus.syllabus_members.count%>班级：<%=syllabus.courses.count%>更新时间：<%=format_date(syllabus.updated_at)%>单位：<%=syllabus.user.user_extensions.occupation.present? ? syllabus.user.user_extensions.occupation:'' %>
      • +
    • + <%= syllabus.title %>课程 + <%= syllabus.try(:highlight).try(:title) ? syllabus.highlight.title[0].html_safe : syllabus.title %>课程 +
      课程
      • +
    • + 创建者：<%=syllabus.user.login+"("+syllabus.user.show_name+")"%> + 教师团队：<%=syllabus.syllabus_members.count%> + 班级：<%=syllabus.courses.count%> + 更新时间：<%=format_date(syllabus.updated_at)%> + 单位：<%=syllabus.user.user_extensions.occupation.present? ? syllabus.user.user_extensions.occupation : '' %> +
    <% end %>
    From fdcb13a3deed66e794d7f4747840657fd1b04162 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sun, 9 Oct 2016 13:57:27 +0800 Subject: [PATCH 16/48] =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/_search_all_results.html.erb | 13 +++++++++++++ app/views/welcome/_search_syllabus_results.html.erb | 2 +- app/views/welcome/search.html.erb | 6 +++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/views/welcome/_search_all_results.html.erb b/app/views/welcome/_search_all_results.html.erb index 3316cbc8a..bacafb323 100644 --- a/app/views/welcome/_search_all_results.html.erb +++ b/app/views/welcome/_search_all_results.html.erb @@ -25,6 +25,19 @@
    • + <% when 'syllabus'%> + <% when 'course'%>
    • diff --git a/app/views/welcome/_search_syllabus_results.html.erb b/app/views/welcome/_search_syllabus_results.html.erb index f59b83d9a..779570a4e 100644 --- a/app/views/welcome/_search_syllabus_results.html.erb +++ b/app/views/welcome/_search_syllabus_results.html.erb @@ -2,7 +2,7 @@ <% syllabuses.each do |syllabus|%> <% when 'syllabus'%> + <% logger.info "input_item" %> + <% logger.info item %>
      • <%= item.try(:highlight).try(:title) ? item.highlight.title[0].html_safe : item.title %>课程 From 9ca685ea940d74c8befba2d6971cb3b02327b7b9 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sun, 9 Oct 2016 16:10:33 +0800 Subject: [PATCH 21/48] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 4 +--- app/views/welcome/_search_all_results.html.erb | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 23876adf3..51ede7d9f 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -183,9 +183,7 @@ class WelcomeController < ApplicationController when 'user' @users = User.search(@name).page(params[:page] || 1).per(20) when 'syllabus' - @syllabuses = Syllabus.search(@name).page(params[:page] || 1).per(20) - logger.info "input_syllabus" - logger.info @syllabuses[0] + @syllabuses = Syllabus.search(@name).page(params[:page] || 1).per(20).results when 'project' @projects = Project.search(@name).page(params[:page] || 1).per(20).results when 'course' diff --git a/app/views/welcome/_search_all_results.html.erb b/app/views/welcome/_search_all_results.html.erb index 10f5a14cf..69ee1756b 100644 --- a/app/views/welcome/_search_all_results.html.erb +++ b/app/views/welcome/_search_all_results.html.erb @@ -26,8 +26,6 @@
      <% when 'syllabus'%> - <% logger.info "input_item" %> - <% logger.info item %>
      • <%= item.try(:highlight).try(:title) ? item.highlight.title[0].html_safe : item.title %>课程 From 4de0105d994e1c2a1d2099df8daa15399f763d8f Mon Sep 17 00:00:00 2001 From: cxt Date: Sun, 9 Oct 2016 17:05:32 +0800 Subject: [PATCH 22/48] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_edit_head.html.erb | 57 ++++++++++++------------------ app/views/poll/_poll_form.html.erb | 7 ++-- app/views/poll/_show_head.html.erb | 8 ++--- 3 files changed, 29 insertions(+), 43 deletions(-) diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb index 8eebae5a2..6182aedf5 100644 --- a/app/views/poll/_edit_head.html.erb +++ b/app/views/poll/_edit_head.html.erb @@ -1,42 +1,31 @@ <%= form_for @poll,:remote => true do |f|%> -
        -
        - -
        -
        -
        - <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%> -
        - -
        -
        - - <%= l(:label_button_ok)%> - - - <%= l(:button_cancel)%> - +
        +
        +
        + + 取消 + 保存
        <% end%> diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index 27f67c5f7..bf2f39d9a 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -307,7 +307,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){ function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();} function pollsSubmit(doc){ var title = $.trim($("#polls_title").val()); - if(title.length == 0){alert("问卷标题不能为空");}else{doc.parent().parent().parent().submit();} + if(title.length == 0){alert("问卷标题不能为空");}else{doc.parent().parent().submit();} } function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();} // @@ -363,9 +363,8 @@ function insert_MCQ(quest_type,quest_num,quest_id){ } } -
        -
        - +
        +
        • -
      • <%= User.find(item.id).user_extensions && User.find(item.id).user_extensions.brief_introduction.present? ? User.find(item.id).user_extensions.brief_introduction : '这位童鞋很懒，什么也没有留下～'%>
        • + <% user = User.find(item.id)%> +
      • <%= user.user_extensions && user.user_extensions.brief_introduction.present? ? user.user_extensions.brief_introduction : '这位童鞋很懒，什么也没有留下～'%>
      • - 加入时间：<%= format_date( User.find(item.id).created_on)%> - 最后登录时间：<%= format_date( User.find(item.id).last_login_on)%> - <%= User.find(item.id).user_extensions.occupation.present? ? '单位：'+User.find(item.id).user_extensions.occupation : ''%>
        • + 加入时间：<%= format_date( user.created_on)%> + 最后登录时间：<%= format_date( user.last_login_on)%> + <%=user.show_occupation.nil? ? "": "单位："+user.show_occupation %>
      • @@ -29,13 +30,15 @@
      • <%= item.try(:highlight).try(:title) ? item.highlight.title[0].html_safe : item.title %>课程 -
        课程
        • +
        <%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %>课程
      • - 创建者：<%=item.user.login+"("+item.user.show_name+")"%> - 教师团队：<%=item.syllabus_members.count%> - 班级：<%=item.courses.count%> + <% user = User.find(item.user_id)%> + <% syllabus = Syllabus.find(item.id) %> + 创建者：<%=user.login+"("+user.show_name+")"%> + 教师团队：<%=syllabus.syllabus_members.count%> + 班级：<%=syllabus.courses.count%> 更新时间：<%=format_date(item.updated_at)%> - 单位：<%=item.user.user_extensions.occupation.present? ? item.user.user_extensions.occupation : '' %> + <%=user.show_occupation.nil? ? "": "单位："+user.show_occupation %>
      <% when 'course'%> @@ -51,10 +54,11 @@
    • <%= item.try(:highlight).try(:description) ? item.highlight.description[0].html_safe : item.description %>
    • - 教师：<%= User.find(item.tea_id).realname %> + <% user = User.find(item.tea_id)%> + 教师：<%= user.realname %> 授课时间：<%= item.time.to_s + item.term%> 更新时间：<%= format_date(item.updated_at)%> - <%= User.find(item.tea_id).user_extensions.occupation.present? ? '单位：'+User.find(item.tea_id).user_extensions.occupation : ''%>
      • + <%=user.show_occupation.nil? ? "": "单位："+user.show_occupation %>
    @@ -69,7 +73,8 @@
    <%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %>资源
    -
  • 发布者：<%= User.find(item.author_id).login%>（<%= User.find(item.author_id).realname%>） + <% user = User.find(item.author_id)%> +
  • 发布者：<%= user.login%>（<%= user.realname%>） 发布时间：<%= format_date(item.created_on)%> 下载次数：<%= item.downloads%>次 diff --git a/app/views/welcome/_search_attachment_results.html.erb b/app/views/welcome/_search_attachment_results.html.erb index e51706085..fa0468385 100644 --- a/app/views/welcome/_search_attachment_results.html.erb +++ b/app/views/welcome/_search_attachment_results.html.erb @@ -10,7 +10,8 @@
    <%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %>资源
    • -
  • 发布者：<%= User.find(attachment.author_id).login%>（<%= User.find(attachment.author_id).realname%>） + <% user = User.find(attachment.author_id)%> +
  • 发布者：<%= user.login%>（<%= user.realname%>） 发布时间：<%= format_date(attachment.created_on)%> 下载次数：<%= attachment.downloads%>次 diff --git a/app/views/welcome/_search_course_results.html.erb b/app/views/welcome/_search_course_results.html.erb index 322a47de5..dd4c9f405 100644 --- a/app/views/welcome/_search_course_results.html.erb +++ b/app/views/welcome/_search_course_results.html.erb @@ -13,10 +13,11 @@
  • <%= course.try(:highlight).try(:description) ? course.highlight.description[0].html_safe : (course.description.present? ? course.description : '暂时没有该班级描述') %>
  • - 教师：<%= User.find(course.tea_id).realname %> + <% user = User.find(course.tea_id)%> + 教师：<%= user.realname %> 授课时间：<%= course.time.to_s + course.term%> 更新时间：<%= format_date(course.updated_at)%> - <%= User.find(course.tea_id).user_extensions.occupation.present? ? '单位：'+User.find(course.tea_id).user_extensions.occupation : ''%>
    • + <%=user.show_occupation.nil? ? "": "单位："+user.show_occupation %>
    diff --git a/app/views/welcome/_search_syllabus_results.html.erb b/app/views/welcome/_search_syllabus_results.html.erb index 779570a4e..163392341 100644 --- a/app/views/welcome/_search_syllabus_results.html.erb +++ b/app/views/welcome/_search_syllabus_results.html.erb @@ -1,16 +1,18 @@ <% unless syllabuses.nil? || syllabuses.empty?%> - <% syllabuses.each do |syllabus|%> + <% syllabuses.each do |item|%> <% end %> diff --git a/app/views/welcome/_search_user_results.html.erb b/app/views/welcome/_search_user_results.html.erb index 06a40d021..3b9e18fba 100644 --- a/app/views/welcome/_search_user_results.html.erb +++ b/app/views/welcome/_search_user_results.html.erb @@ -1,20 +1,21 @@ <% unless users.nil? || users.empty?%> -<% users.each do |user|%> +<% users.each do |item|%>
    • - <%= link_to image_tag(url_to_avatar(User.find(user.id)), :width => "75", :height => "75",:class=>'searchCourseImage'), user_path(user.id), :alt => "用户头像" %> + <% user = User.find(item.id)%> + <%= link_to image_tag(url_to_avatar(user), :width => "75", :height => "75",:class=>'searchCourseImage'), user_path(user.id), :alt => "用户头像" %>
      • diff --git a/lib/tasks/elasticsearch_batch_op.rake b/lib/tasks/elasticsearch_batch_op.rake index 6693fcf69..0c041ba8c 100644 --- a/lib/tasks/elasticsearch_batch_op.rake +++ b/lib/tasks/elasticsearch_batch_op.rake @@ -7,21 +7,6 @@ namespace :importer do ENV['BATCH']='1000' Rake::Task["elasticsearch:import:model"].execute end - task :importproject => :environment do - - ENV['CLASS']='Project' - ENV['SCOPE']='indexable' - ENV['FORCE']='y' - ENV['BATCH']='1000' - Rake::Task["elasticsearch:import:model"].execute - end - task :importcourse => :environment do - ENV['CLASS']='Course' - ENV['SCOPE']='indexable' - ENV['FORCE']='y' - ENV['BATCH']='1000' - Rake::Task["elasticsearch:import:model"].execute - end task :importsyllabus => :environment do ENV['CLASS']='Syllabus' ENV['SCOPE']='indexable' @@ -29,6 +14,13 @@ namespace :importer do ENV['BATCH']='1000' Rake::Task["elasticsearch:import:model"].execute end + task :importcourse => :environment do + ENV['CLASS']='Course' + ENV['SCOPE']='indexable' + ENV['FORCE']='y' + ENV['BATCH']='1000' + Rake::Task["elasticsearch:import:model"].execute + end task :importattachment => :environment do ENV['CLASS']='Attachment' ENV['SCOPE']='indexable' @@ -36,6 +28,14 @@ namespace :importer do ENV['BATCH']='1000' Rake::Task["elasticsearch:import:model"].execute end + task :importproject => :environment do + + ENV['CLASS']='Project' + ENV['SCOPE']='indexable' + ENV['FORCE']='y' + ENV['BATCH']='1000' + Rake::Task["elasticsearch:import:model"].execute + end task :importmemo => :environment do ENV['CLASS']='Memo' ENV['SCOPE']='indexable' @@ -45,5 +45,5 @@ namespace :importer do end desc "Run all tasks" - task :all => [:importuser,:importproject,:importsyllabus,:importcourse,:importattachment,:importmemo] + task :all => [:importuser,:importsyllabus,:importcourse,:importattachment,:importproject,:importmemo] end \ No newline at end of file From 163abb70de00fd8bbe6435606a78f425e6d0230b Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Mon, 10 Oct 2016 14:00:10 +0800 Subject: [PATCH 24/48] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=90=9C=E7=B4=A2title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/syllabus.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb index b471c0684..959499bf0 100644 --- a/app/models/syllabus.rb +++ b/app/models/syllabus.rb @@ -107,7 +107,7 @@ class Syllabus < ActiveRecord::Base query: query, type:"most_fields", operator: "or", - fields: ['title', 'description^0.5'] + fields: ['title'] } }, sort: { From 3217f84df27f421ea99bd06bfe37eec57c61753b Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 10 Oct 2016 14:13:20 +0800 Subject: [PATCH 25/48] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=9A=84=E5=8D=95?= =?UTF-8?q?=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_controller.rb | 7 +++++ app/views/poll/_new_MC.html.erb | 50 ++++++++++++++++++------------ app/views/poll/_poll_form.html.erb | 34 +++++++++++++++----- public/stylesheets/css/common.css | 5 ++- public/stylesheets/css/courses.css | 7 ++++- public/stylesheets/css/public.css | 3 ++ 6 files changed, 76 insertions(+), 30 deletions(-) diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index 95724edf3..bc5e5dc9e 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -151,6 +151,13 @@ class PollController < ApplicationController @poll_questions.poll_answers.new question_option end end + if params[:question_other_answer] + question_option = { + :answer_position => params[:question_answer].count + 1, + :answer_text => '' + } + @poll_questions.poll_answers.new question_option + end # 如果是插入的话，那么从插入的这个id以后的question_num都将要+1 if params[:quest_id] @is_insert = true diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb index 268ce18b1..0a9114158 100644 --- a/app/views/poll/_new_MC.html.erb +++ b/app/views/poll/_new_MC.html.erb @@ -1,37 +1,47 @@ <%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%> <% insert_begin = insert_begin %> -
      +
      - +
      +
        +
      • + + + + +
        • +
        +
      • + + + + +
        • +
        +
      • + + + + +
        • +
        +
        -
      • - - - - +
      • +
        新建选项
        • -
      • - - - - +
      • + 添加[其他]选项
        • -
        -
      • - - - - -
        • -
        +
      diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index bf2f39d9a..bcf9dea3d 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -323,13 +323,22 @@ function insert_MCQ(quest_type,quest_num,quest_id){ //单选题 function add_single_answer(doc) { - doc.parent().after("
    • " + - ""+ - "
      • "); + if (doc.parent().parent().prev().children('li:last').hasClass('other_answer')) { + doc.parent().parent().prev().children('li:last').before("
    • " + + ""+ + "
      • "); + } else { + doc.parent().parent().prev().append("
    • " + + ""+ + "
      • "); + } +// doc.parent().before("
    • " + +// ""+ +// "
      • "); } function remove_single_answer(doc) { - if(doc.parent().siblings("li").length == 0) + if(doc.parent().siblings("li.new_answer").length == 0) { alert("选择题至少有一个选项"); } @@ -338,7 +347,15 @@ function insert_MCQ(quest_type,quest_num,quest_id){ doc.parent().remove(); } } - + //其他选项 + function add_other_answer(doc) + { + if(doc.parent().parent().prev().children('li.other_answer').length == 0) { + doc.parent().parent().prev().append("
    • " + + ""+ + "
      • "); + } + } function poll_submit() { var title = $.trim($("#polls_name_h").html()); @@ -378,9 +395,10 @@ function insert_MCQ(quest_type,quest_num,quest_id){ <%= render :partial => 'poll_content', :locals => {:poll => @poll}%>
      -
      -
        -
      • +
        + 题型 +
          +
        • <%= l(:label_MC) %> diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index defbdbed1..3420a994d 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -588,4 +588,7 @@ a:hover.sy_btn_blue{ background: #2788d0;} /*状态提示图标*/ .success-icon {background:url("/images/icons_ziliao.png") 0 -28px no-repeat; padding-left:25px;} -.error-icon {background:url("/images/icons_ziliao.png") 0 -56px no-repeat; padding-left:25px;} \ No newline at end of file +.error-icon {background:url("/images/icons_ziliao.png") 0 -56px no-repeat; padding-left:25px;} + +/*禁用*/ +.disabled {background-color:#f5f5f5;} \ No newline at end of file diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index a21633e44..fee11954f 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -545,4 +545,9 @@ a:hover.blueCir{ background:#3598db; color:#fff;} .homework-detail-tab li {float:left; width:100px; text-align:center; padding:3px 0; border-bottom:2px solid #ddd;} .homework-detail-tab li.selected {border-bottom:2px solid #f00;} .test-set-table, .test-set-table tr, .test-set-table th, .test-set-table td {border-collapse:collapse; text-align:left; border:1px solid #ddd; color:#484848;} -.test-set-table th, .test-set-table td {padding:2px 5px;} \ No newline at end of file +.test-set-table th, .test-set-table td {padding:2px 5px;} + +/*20160912问卷调查*/ +.new-question {width:324px; height:30px; color:#888; background-color:#fff; padding-left:5px; margin-left:46px; cursor:pointer;} +.new-subjective {width:550px; height:30px; color:#888; background-color:#fff; padding-left:5px; margin-left:96px; cursor:pointer;} +.questionnaire-input {height:30px; border:1px solid #cbcbcb; padding-left:5px;} \ No newline at end of file diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index 514139513..3117e1a07 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -1461,3 +1461,6 @@ a:hover.sy_btn_green{ background: #51a74f;} .flex-container {display:flex;} .flex-cell {flex:1;} .flex-cell:last-child {text-align:right;} + +/*20160912问卷调查*/ +.dash-block {border:1px dashed #ddd;} \ No newline at end of file From 405e2cfb9b1338d7c18d7bf0fc242a33ec65fe40 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 11 Oct 2016 08:51:00 +0800 Subject: [PATCH 26/48] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=8D=95=E9=80=89?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_controller.rb | 15 ++++++ app/views/poll/_edit_MC.html.erb | 36 +++++++++---- app/views/poll/_poll_content.html.erb | 78 ++++++++++++++++++--------- app/views/poll/_show_MC.html.erb | 28 +++++----- public/stylesheets/css/common.css | 1 + 5 files changed, 113 insertions(+), 45 deletions(-) diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index bc5e5dc9e..d7b2cfa26 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -199,6 +199,21 @@ class PollController < ApplicationController @poll_question.poll_answers.new question_option end end + if params[:question_other_answer] + question = @poll_question.poll_answers.where("answer_text = ''").first + unless question + question_option = { + :answer_position => params[:question_answer].count + 1, + :answer_text => '' + } + @poll_question.poll_answers.new question_option + end + else + question = @poll_question.poll_answers.where("answer_text = ''").first + if question + question.destroy + end + end end @poll_question.save respond_to do |format| diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb index 9209bf61d..08aeacc43 100644 --- a/app/views/poll/_edit_MC.html.erb +++ b/app/views/poll/_edit_MC.html.erb @@ -17,26 +17,44 @@ } -
          +
          - + />
            <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %> -
          • - - - - -
            • -
            + <% if poll_answer.answer_text != '' %> +
          • + + + +
            • +
            + <% else %> +
          • + + + +
            • +
            + <% end %> <% end%>
          +
          diff --git a/app/views/poll/_poll_content.html.erb b/app/views/poll/_poll_content.html.erb index 40c9a6181..c328c2cb5 100644 --- a/app/views/poll/_poll_content.html.erb +++ b/app/views/poll/_poll_content.html.erb @@ -1,26 +1,56 @@ -<% poll.poll_questions.each do |poll_question|%> -
          -
          - <% if poll_question.question_type == 1%> - <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %> - <% elsif poll_question.question_type == 2%> - <%= render :partial => 'show_MCQ', :locals => {:poll_question => poll_question} %> - <% elsif poll_question.question_type == 3%> - <%= render :partial => 'show_single', :locals => {:poll_question => poll_question} %> - <% elsif poll_question.question_type == 4%> - <%= render :partial => 'show_mulit', :locals => {:poll_question => poll_question} %> - <% end%> +<% mc_question_list = poll.poll_questions.where("question_type=1") %> +<% mcq_question_list = poll.poll_questions.where("question_type=2") %> +<% single_question_list = poll.poll_questions.where("question_type=3") %> +<% multi_question_list = poll.poll_questions.where("question_type=4") %> +
          "> +

          单选题

          + <% mc_question_list.each do |poll_question| %> +
          +
          + <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %> +
          +
          - +
          "> +

          多选题

          + <% mcq_question_list.each do |poll_question| %> +
          +
          + <%= render :partial => 'show_MCQ', :locals => {:poll_question => poll_question} %> +
          +
          -
          -<% end %> \ No newline at end of file + <% end %> +
          +
          "> +

          单行主观题

          + <% single_question_list.each do |poll_question| %> +
          +
          + <%= render :partial => 'show_single', :locals => {:poll_question => poll_question} %> +
          + +
          + <% end %> +
          +
          "> +

          多行主观题

          + <% multi_question_list.each do |poll_question| %> +
          +
          + <%= render :partial => 'show_mulit', :locals => {:poll_question => poll_question} %> +
          + +
          + <% end %> +
          \ No newline at end of file diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb index 901b98541..7209a4d52 100644 --- a/app/views/poll/_show_MC.html.erb +++ b/app/views/poll/_show_MC.html.erb @@ -1,15 +1,12 @@ -
          -
          - - 第<%= poll_question.question_number%>题： - +
          +
          + 第<%= poll_question.question_number%>题： <%= poll_question.question_title %> - [单选题] <%if poll_question.is_necessary == 1%> - * + * <%end%>
          @@ -19,15 +16,22 @@
          - +
          <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %> <% end %> diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 3420a994d..79960bfba 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -263,6 +263,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/ .w520{ width:520px;} .w543{ width:543px;} .w557{ width:557px;} +.w570 {width:570px !important;} .w576{ width:576px;} .w607 {width:607px;} .w664{ width:664px;} From a581f989c9c6f0ff0ec6283a31177e5258747d23 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 11 Oct 2016 14:08:44 +0800 Subject: [PATCH 27/48] =?UTF-8?q?=E7=BB=99messages=E3=80=81journals=5Ffor?= =?UTF-8?q?=5Fmessages=E3=80=81blog=5Fcomments=E3=80=81org=5Fdocument=5Fco?= =?UTF-8?q?mments=E8=A1=A8=E5=A2=9E=E5=8A=A0root=5Fid=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=B9=B3=E5=8F=B0=E7=9A=84=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/blog_comments_controller.rb | 2 + app/controllers/boards_controller.rb | 3 +- app/controllers/messages_controller.rb | 4 +- .../org_document_comments_controller.rb | 3 + app/controllers/users_controller.rb | 24 +- app/controllers/words_controller.rb | 12 +- app/models/blog_comment.rb | 2 +- app/models/homework_common.rb | 4 +- app/models/journals_for_message.rb | 3 +- app/models/message.rb | 2 +- app/models/org_document_comment.rb | 2 +- app/models/syllabus.rb | 4 +- app/views/blog_comments/show.html.erb | 2 +- app/views/blogs/_article.html.erb | 8 +- app/views/blogs/_homepage.html.erb | 2 +- app/views/org_document_comments/show.html.erb | 2 +- .../_org_subfield_message.html.erb | 2 +- .../organizations/_show_org_document.html.erb | 2 +- app/views/users/_course_boardlist.html.erb | 2 +- .../users/_course_journalsformessage.html.erb | 2 +- app/views/users/_course_message.html.erb | 3 +- app/views/users/_project_boardlist.html.erb | 2 +- app/views/users/_project_message.html.erb | 2 +- app/views/users/_user_blog.html.erb | 4 +- .../users/_user_journalsformessage.html.erb | 2 +- db/migrate/20161011012114_add_root_id.rb | 73 +++ db/schema.rb | 415 +----------------- 27 files changed, 141 insertions(+), 447 deletions(-) create mode 100644 db/migrate/20161011012114_add_root_id.rb diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb index dcd549d76..bbccf2d6e 100644 --- a/app/controllers/blog_comments_controller.rb +++ b/app/controllers/blog_comments_controller.rb @@ -145,10 +145,12 @@ class BlogCommentsController < ApplicationController @blogComment.content = params[:blog_comment][:content] parent = BlogComment.find params[:parent_id] @blogComment.reply_id = params[:id] + @blogComment.root_id = parent.root_id.nil? ? parent.id : parent.root_id parent.children << @blogComment else @quote = params[:quote][:quote] || "" @blogComment.content = @quote + @blogComment.content + @blogComment.root_id = @article.id @article.children << @blogComment end @article.save diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 099e9404a..d4eedb7e3 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -126,7 +126,8 @@ class BoardsController < ApplicationController @type = 2 @topics.each do |topic| all_comments = [] - count=get_all_children(all_comments, topic).count + #count=get_all_children(all_comments, topic).count + count=Message.where("root_id = #{topic.id}").count topic[:infocount] = get_praise_num(topic) + count if topic[:infocount] < 0 topic[:infocount] = 0 diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 226d24afa..31ca95789 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -45,7 +45,7 @@ class MessagesController < ApplicationController # page = 1 + offset / REPLIES_PER_PAGE # end all_comments = [] - @replies = get_all_children(all_comments, @topic) + @replies = Message.where("root_id = #{@topic.id}").reorder("created_on desc") @reply_count = @replies.count @page = params[:page] ? params[:page].to_i + 1 : 0 @limit = 10 @@ -165,6 +165,7 @@ class MessagesController < ApplicationController @reply.content = params[:content] @reply.subject = "RE: #{@topic.subject}" @reply.reply_id = params[:id] + @reply.root_id = parent.root_id.nil? ? parent.id : parent.root_id # @reply.reply_id = params[:id] parent.children << @reply @user_activity_id = params[:user_activity_id] if params[:user_activity_id] @@ -178,6 +179,7 @@ class MessagesController < ApplicationController @reply.safe_attributes = params[:reply] @reply.content = @quote + @reply.content @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject] + @reply.root_id = @topic.id @topic.children << @reply # @reply.reply_id = params[:id] end diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index a8a294d4d..65dae9b9e 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -89,6 +89,7 @@ class OrgDocumentCommentsController < ApplicationController @act = OrgActivity.find(params[:act_id]) @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id]) @comment.content = params[:org_content] + @comment.root_id = @document.id @document.children << @comment @document.save end @@ -102,6 +103,7 @@ class OrgDocumentCommentsController < ApplicationController @comment.content = params[:org_comment][:org_content] end + @comment.root_id = @document.id @document.children << @comment @document.save respond_to do |format| @@ -161,6 +163,7 @@ class OrgDocumentCommentsController < ApplicationController @org_document.title = params[:org_document_comment][:title] @org_document.content = params[:org_document_comment][:content] + @org_document.root_id = @document.root_id.nil? ? @document.id : @document.root_id @document.children << @org_document @document = @document.root diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 78c60599a..150a113a3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3524,19 +3524,19 @@ class UsersController < ApplicationController if params[:type].present? case params[:type] when 'OrgDocumentComment' - obj = OrgDocumentComment.where('id = ?', params[:id].to_i).first + #obj = OrgDocumentComment.where('id = ?', params[:id].to_i).first @user_activity_id = params[:div_id].to_i if params[:div_id] @type = 'OrgDocumentComment' - comments = [] - @journals = get_all_children(comments, obj) + #comments = [] + @journals = OrgDocumentComment.where("root_id = #{params[:id].to_i}").reorder("created_at desc") when 'Message' - obj = Message.where('id = ?', params[:id].to_i).first + #obj = Message.where('id = ?', params[:id].to_i).first @type = 'Message' @is_course = params[:is_course] @is_board = params[:is_board] @user_activity_id = params[:div_id].to_i if params[:div_id] - comments = [] - @journals = get_all_children(comments, obj) + #comments = [] + @journals = Message.where("root_id = #{params[:id].to_i}").reorder("created_on desc") when 'News' obj = News.where('id = ?', params[:id].to_i).first @journals = obj.comments.reorder("created_on desc") @@ -3548,9 +3548,9 @@ class UsersController < ApplicationController @type = 'Syllabus' @user_activity_id = params[:div_id].to_i if params[:div_id] when 'JournalsForMessage' - obj = JournalsForMessage.where('id = ?', params[:id].to_i).first - journals = [] - @journals = get_all_children(journals, obj) + #obj = JournalsForMessage.where('id = ?', params[:id].to_i).first + #journals = [] + @journals = JournalsForMessage.where("root_id = #{params[:id].to_i}").reorder("created_on desc") @type = 'JournalsForMessage' @user_activity_id = params[:div_id].to_i if params[:div_id] when 'Issue' @@ -3559,13 +3559,13 @@ class UsersController < ApplicationController @type = 'Issue' @user_activity_id = params[:div_id].to_i if params[:div_id] when 'BlogComment' - obj = BlogComment.where('id = ?', params[:id].to_i).first + #obj = BlogComment.where('id = ?', params[:id].to_i).first @user_activity_id = params[:div_id].to_i if params[:div_id] @homepage = params[:homepage].to_i @type = 'BlogComment' @user_id = obj.author_id - comments = [] - @journals = get_all_children(comments, obj) + #comments = [] + @journals = BlogComment.where("root_id = #{params[:id].to_i}").reorder("created_on desc") when 'HomeworkCommon' obj = HomeworkCommon.where('id = ?', params[:id].to_i).first @type = 'HomeworkCommon' diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index 9c8954ed9..c9bb42ebe 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -41,6 +41,7 @@ class WordsController < ApplicationController # 删除留言功能要调用destroy，也记得在destroy.js中修改 # deny api. api useless + parent = JournalsForMessage.find params[:reference_id].to_i parent_id = params[:reference_id] author_id = User.current.id reply_user_id = params[:reference_user_id] @@ -52,7 +53,8 @@ class WordsController < ApplicationController :m_parent_id => parent_id, :m_reply_id => reply_id, :reply_id => reply_user_id, - :notes => content, + :notes => content, + :root_id => parent.root_id.nil? ? parent.id : parent.root_id, :is_readed => false} @activity = params[:activity_id].nil? ? JournalsForMessage.find(parent_id) : JournalsForMessage.find(params[:activity_id].to_i) @jfm = add_reply_adapter(@activity, options) @@ -274,7 +276,7 @@ class WordsController < ApplicationController @user = User.current @syllabus = Syllabus.find(params[:id]); if params[:comment].size>0 && User.current.logged? && @user - feedback = Syllabus.add_syllabus_jour(@user, params[:comment], params[:id]) + feedback = Syllabus.add_syllabus_jour(@user, params[:comment], params[:id], @syllabus.id) if (feedback.errors.empty?) if params[:asset_id] ids = params[:asset_id].split(',') @@ -296,7 +298,7 @@ class WordsController < ApplicationController @user = User.current @homework_common = HomeworkCommon.find(params[:id]); if params[:homework_message].size>0 && User.current.logged? && @user - feedback = HomeworkCommon.add_homework_jour(@user, params[:homework_message], params[:id]) + feedback = HomeworkCommon.add_homework_jour(@user, params[:homework_message], params[:id], @homework_common.id) if (feedback.errors.empty?) if params[:asset_id] ids = params[:asset_id].split(',') @@ -329,7 +331,7 @@ class WordsController < ApplicationController reply = JournalsForMessage.find params[:id].to_i @homework_common = HomeworkCommon.find reply.jour_id if params[:reply_message].size>0 && User.current.logged? && @user - options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => @user.id,:m_parent_id => params[:id].to_i,:m_reply_id => params[:id].to_i} + options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => @user.id,:m_parent_id => params[:id].to_i,:m_reply_id => params[:id].to_i, :root_id => reply.root_id} feedback = HomeworkCommon.add_homework_jour(@user, params[:reply_message], reply.jour_id, options) if (feedback.errors.empty?) if params[:asset_id] @@ -363,7 +365,7 @@ class WordsController < ApplicationController reply = JournalsForMessage.find params[:id].to_i @syllabus = Syllabus.find reply.jour_id if params[:reply_message].size>0 && User.current.logged? && @user - options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => @user.id,:m_parent_id => params[:id].to_i,:m_reply_id => params[:id].to_i} + options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => @user.id,:m_parent_id => params[:id].to_i,:m_reply_id => params[:id].to_i, :root_id => reply.root_id} feedback = Syllabus.add_syllabus_jour(@user, params[:reply_message], reply.jour_id, options) if (feedback.errors.empty?) if params[:asset_id] diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb index 6290840a3..6189d435f 100644 --- a/app/models/blog_comment.rb +++ b/app/models/blog_comment.rb @@ -19,7 +19,7 @@ class BlogComment < ActiveRecord::Base validates_presence_of :title, :content validates_length_of :title, :maximum => 255 #validate :cannot_reply_to_locked_comment, :on => :create - safe_attributes 'title', 'content',"sticky", "locked" + safe_attributes 'title', 'content',"sticky", "locked", "root_id" after_save :add_user_activity after_update :update_activity diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb index dfff273a0..3072fa72b 100644 --- a/app/models/homework_common.rb +++ b/app/models/homework_common.rb @@ -113,10 +113,10 @@ class HomeworkCommon < ActiveRecord::Base end ###添加回复 - def self.add_homework_jour(user, notes, id , options = {}) + def self.add_homework_jour(user, notes, id, root_id, options = {}) homework = HomeworkCommon.find(id) if options.count == 0 - jfm = homework.journals_for_messages.build(:user_id => user.id, :notes => notes, :reply_id => 0) + jfm = homework.journals_for_messages.build(:user_id => user.id, :notes => notes, :reply_id => 0, :root_id => root_id) else jfm = homework.journals_for_messages.build(options) end diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 30d8120ef..2ea52fd92 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -19,7 +19,8 @@ class JournalsForMessage < ActiveRecord::Base "m_reply_count", # 留言的回复数量 "m_reply_id" , # 回复某留言的留言id(a留言回复了b留言，这是b留言的id) "is_comprehensive_evaluation", # 1 教师评论、2 匿评、3 留言 - "private" + "private", + "root_id" acts_as_tree :foreign_key => 'm_parent_id', :counter_cache => :m_reply_count, :order => "#{JournalsForMessage.table_name}.created_on ASC" after_destroy :delete_kindeditor_assets belongs_to :project, diff --git a/app/models/message.rb b/app/models/message.rb index 3192907fe..1d76c8ef6 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -96,7 +96,7 @@ class Message < ActiveRecord::Base } - safe_attributes 'subject', 'content', 'reply_id' + safe_attributes 'subject', 'content', 'reply_id', 'root_id' safe_attributes 'board_id','locked', 'sticky', :if => lambda {|message, user| if message.project diff --git a/app/models/org_document_comment.rb b/app/models/org_document_comment.rb index a87fe783f..59fcd28dc 100644 --- a/app/models/org_document_comment.rb +++ b/app/models/org_document_comment.rb @@ -1,6 +1,6 @@ class OrgDocumentComment < ActiveRecord::Base # status: 1 模式二中置顶 0：模式二中正常显示 - attr_accessible :content, :creator_id, :organization_id, :parent_id, :reply_id, :title, :sticky, :locked, :status + attr_accessible :content, :creator_id, :organization_id, :parent_id, :reply_id, :title, :sticky, :locked, :status, :root_id include Redmine::SafeAttributes include ApplicationHelper belongs_to :organization diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb index f72463503..93043b765 100644 --- a/app/models/syllabus.rb +++ b/app/models/syllabus.rb @@ -47,10 +47,10 @@ class Syllabus < ActiveRecord::Base end ###添加回复 - def self.add_syllabus_jour(user, notes, id , options = {}) + def self.add_syllabus_jour(user, notes, id, root_id, options = {}) syllabus = Syllabus.find(id) if options.count == 0 - jfm = syllabus.journals_for_messages.build(:user_id => user.id, :notes => notes, :reply_id => 0) + jfm = syllabus.journals_for_messages.build(:user_id => user.id, :notes => notes, :reply_id => 0, :root_id => root_id) else jfm = syllabus.journals_for_messages.build(options) end diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 7143e980b..4e46879fc 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -106,7 +106,7 @@
          <% all_comments = []%> - <% all_replies = get_all_children(all_comments, @article) %> + <% all_replies = BlogComment.where("root_id = #{@article.id}").reorder("created_on desc") %> <% count= all_replies.count %>
          diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index dd818fe72..bb16dcea0 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -36,12 +36,8 @@ <% end %>
          - <% count=0 %> - <% if activity.parent %> - <% count=activity.parent.children.count%> - <% else %> - <% count=activity.children.count%> - <% end %> + + <% count=BlogComment.where("root_id = #{activity.id}").count%>
        • 发布：<%= format_time(activity.created_on) %> 更新：<%= format_time(activity.updated_on) %> diff --git a/app/views/blogs/_homepage.html.erb b/app/views/blogs/_homepage.html.erb index 6e45fdd88..6b40a23da 100644 --- a/app/views/blogs/_homepage.html.erb +++ b/app/views/blogs/_homepage.html.erb @@ -46,7 +46,7 @@
          • <% all_comments = []%> - <% all_repies = get_all_children(all_comments, activity) %> + <% all_repies = BlogComment.where("root_id = #{activity.id}").reorder("created_on desc") %> <% count = all_repies.count %>
          <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :homepage => 1} %> diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index 0fe72ad36..d67adeb09 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -75,7 +75,7 @@
          <% all_comments = []%> - <% all_replies = get_all_children(all_comments, @document) %> + <% all_replies = OrgDocumentComment.where("root_id = #{@document.id}").reorder("created_at desc") %> <% count = all_replies.count %>
          diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb index 8cf19aec9..353e9903e 100644 --- a/app/views/organizations/_org_subfield_message.html.erb +++ b/app/views/organizations/_org_subfield_message.html.erb @@ -70,7 +70,7 @@
          <% all_comments = []%> - <% all_replies = get_all_children(all_comments, activity) %> + <% all_replies = OrgDocumentComment.where("root_id = #{activity.id}").reorder("created_at desc") %> <% count = all_replies.count %>
          <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => 0,:is_board =>0} %> diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index bcdaa382e..7d5595230 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -68,7 +68,7 @@
          <% all_comments = []%> - <% all_replies = get_all_children(all_comments, document) %> + <% all_replies = OrgDocumentComment.where("root_id = #{document.id}").reorder("created_at desc") %> <% count = all_replies.count %>
          diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb index 86b308778..8516d774c 100644 --- a/app/views/users/_course_boardlist.html.erb +++ b/app/views/users/_course_boardlist.html.erb @@ -47,7 +47,7 @@ 更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %> <% all_comments = []%> - <% count=get_all_children(all_comments, activity).count %> + <% count=Message.where("root_id = #{activity.id}").count %>

          <%= count>0 ? "#{count}" : "0" %>回复|<%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %>赞

          diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb index f93efefe3..c4bdedb11 100644 --- a/app/views/users/_course_journalsformessage.html.erb +++ b/app/views/users/_course_journalsformessage.html.erb @@ -41,7 +41,7 @@
          <% all_comments = []%> - <% all_replies = get_all_children(all_comments, activity) %> + <% all_replies = JournalsForMessage.where("root_id = #{activity.id}").reorder("created_on desc") %> <% count = all_replies.count %>
          <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %> diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 99e3aca62..08ab6d763 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -81,7 +81,8 @@
          <% all_comments = []%> - <% all_replies = get_all_children(all_comments, activity) %> + <%# all_replies = get_all_children(all_comments, activity) %> + <% all_replies = Message.where("root_id = #{activity.id}").reorder("created_on desc") %> <% count = all_replies.count %>
          <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %> diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb index e0e2fddf8..6072eb189 100644 --- a/app/views/users/_project_boardlist.html.erb +++ b/app/views/users/_project_boardlist.html.erb @@ -47,7 +47,7 @@ 更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %> <% all_comments = []%> - <% count=get_all_children(all_comments, activity).count %> + <% count=Message.where("root_id = #{activity.id}").count %>

          <%= count>0 ? "#{count}" : "0" %>回复|<%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %>赞

          diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 8005d9694..e3e16605e 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -82,7 +82,7 @@
          <% all_comments = []%> - <% all_replies = get_all_children(all_comments, activity) %> + <% all_replies = Message.where("root_id = #{activity.id}").reorder("created_on desc") %> <% count = all_replies.count %> <%# allow_delete = (activity.user == User.current || User.current.admin? || User.current.allowed_to?(:as_teacher,activity.course)) %> <%# count = fetch_user_leaveWord_reply(activity).count %> diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb index 7906f7a7c..d2eb57b83 100644 --- a/app/views/users/_user_blog.html.erb +++ b/app/views/users/_user_blog.html.erb @@ -41,8 +41,8 @@
          - <% all_comments = []%> - <% all_replies = get_all_children(all_comments, activity) %> + <%# all_comments = []%> + <% all_replies = BlogComment.where("root_id = #{activity.id}").reorder("created_on desc") %> <% count = all_replies.count %>
          <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :homepage => 0} %> diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb index e4bad29b4..67fbbf494 100644 --- a/app/views/users/_user_journalsformessage.html.erb +++ b/app/views/users/_user_journalsformessage.html.erb @@ -63,7 +63,7 @@
          <% all_comments = []%> - <% all_replies = get_all_children(all_comments, activity) %> + <% all_replies = JournalsForMessage.where("root_id = #{activity.id}").reorder("created_on desc") %> <% count = all_replies.count %>
          <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %> diff --git a/db/migrate/20161011012114_add_root_id.rb b/db/migrate/20161011012114_add_root_id.rb new file mode 100644 index 000000000..c15674eeb --- /dev/null +++ b/db/migrate/20161011012114_add_root_id.rb @@ -0,0 +1,73 @@ +class AddRootId < ActiveRecord::Migration + def change + add_column :messages, :root_id, :integer, :default => nil + add_column :journals_for_messages, :root_id, :integer, :default => nil + add_column :blog_comments, :root_id, :integer, :default => nil + add_column :org_document_comments, :root_id, :integer, :default => nil + + add_index :messages, :root_id + add_index :journals_for_messages,:root_id + add_index :blog_comments,:root_id + add_index :org_document_comments,:root_id + + def get_base_parent comment + comm = comment + while comm.parent + comm = comm.parent + end + comm + end + + count = Message.all.count / 30 + 2 + transaction do + for i in 1 ... count do i + Message.page(i).per(30).each do |message| + unless message.parent.nil? + parent = get_base_parent message + message.update_column('root_id', parent.id) + end + end + end + end + + count = JournalsForMessage.all.count / 30 + 2 + transaction do + for i in 1 ... count do i + JournalsForMessage.page(i).per(30).each do |message| + if message.jour_type == "HomeworkCommon" || message.jour_type == "Syllabus" + message.update_column('root_id', message.jour_id) + else + unless message.parent.nil? + parent = get_base_parent message + message.update_column('root_id', parent.id) + end + end + end + end + end + + count = BlogComment.all.count / 30 + 2 + transaction do + for i in 1 ... count do i + BlogComment.page(i).per(30).each do |message| + unless message.parent.nil? + parent = get_base_parent message + message.update_column('root_id', parent.id) + end + end + end + end + + count = OrgDocumentComment.all.count / 30 + 2 + transaction do + for i in 1 ... count do i + OrgDocumentComment.page(i).per(30).each do |message| + unless message.parent.nil? + parent = get_base_parent message + message.update_column('root_id', parent.id) + end + end + end + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 131f50c29..1f763c39e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20161009053958) do +ActiveRecord::Schema.define(:version => 20161011012114) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -52,28 +52,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token" add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id" - create_table "application_settings", :force => true do |t| - t.integer "default_projects_limit" - t.boolean "signup_enabled" - t.boolean "signin_enabled" - t.boolean "gravatar_enabled" - t.text "sign_in_text" - t.datetime "created_at" - t.datetime "updated_at" - t.string "home_page_url" - t.integer "default_branch_protection", :default => 2 - t.boolean "twitter_sharing_enabled", :default => true - t.text "restricted_visibility_levels" - t.boolean "version_check_enabled", :default => true - t.integer "max_attachment_size", :default => 10, :null => false - t.integer "default_project_visibility" - t.integer "default_snippet_visibility" - t.text "restricted_signup_domains" - t.boolean "user_oauth_applications", :default => true - t.string "after_sign_out_path" - t.integer "session_expire_delay", :default => 10080, :null => false - end - create_table "applied_messages", :force => true do |t| t.integer "user_id" t.integer "applied_id" @@ -206,20 +184,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.string "typeName", :limit => 50 end - create_table "audit_events", :force => true do |t| - t.integer "author_id", :null => false - t.string "type", :null => false - t.integer "entity_id", :null => false - t.string "entity_type", :null => false - t.text "details" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id" - add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type" - add_index "audit_events", ["type"], :name => "index_audit_events_on_type" - create_table "auth_sources", :force => true do |t| t.string "type", :limit => 30, :default => "", :null => false t.string "name", :limit => 60, :default => "", :null => false @@ -285,8 +249,11 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.integer "reply_id" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false + t.integer "root_id" end + add_index "blog_comments", ["root_id"], :name => "index_blog_comments_on_root_id" + create_table "blogs", :force => true do |t| t.string "name", :default => "", :null => false t.text "description" @@ -317,17 +284,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id" add_index "boards", ["project_id"], :name => "boards_project_id" - create_table "broadcast_messages", :force => true do |t| - t.text "message", :null => false - t.datetime "starts_at" - t.datetime "ends_at" - t.integer "alert_type" - t.datetime "created_at" - t.datetime "updated_at" - t.string "color" - t.string "font" - end - create_table "bug_to_osps", :force => true do |t| t.integer "osp_id" t.integer "relative_memo_id" @@ -357,16 +313,14 @@ ActiveRecord::Schema.define(:version => 20161009053958) do add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids" create_table "changesets", :force => true do |t| - t.integer "repository_id", :null => false - t.string "revision", :null => false + t.integer "repository_id", :null => false + t.string "revision", :null => false t.string "committer" - t.datetime "committed_on", :null => false + t.datetime "committed_on", :null => false t.text "comments" t.date "commit_date" t.string "scmid" t.integer "user_id" - t.integer "project_id" - t.integer "type", :default => 0 end add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on" @@ -715,15 +669,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" - create_table "deploy_keys_projects", :force => true do |t| - t.integer "deploy_key_id", :null => false - t.integer "project_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id" - create_table "discuss_demos", :force => true do |t| t.string "title" t.text "body" @@ -773,16 +718,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.datetime "created_at" end - create_table "emails", :force => true do |t| - t.integer "user_id", :null => false - t.string "email", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true - add_index "emails", ["user_id"], :name => "index_emails_on_user_id" - create_table "enabled_modules", :force => true do |t| t.integer "project_id" t.string "name", :null => false @@ -805,25 +740,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" - create_table "events", :force => true do |t| - t.string "target_type" - t.integer "target_id" - t.string "title" - t.text "data" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "action" - t.integer "author_id" - end - - add_index "events", ["action"], :name => "index_events_on_action" - add_index "events", ["author_id"], :name => "index_events_on_author_id" - add_index "events", ["created_at"], :name => "index_events_on_created_at" - add_index "events", ["project_id"], :name => "index_events_on_project_id" - add_index "events", ["target_id"], :name => "index_events_on_target_id" - add_index "events", ["target_type"], :name => "index_events_on_target_type" - create_table "exercise_answers", :force => true do |t| t.integer "user_id" t.integer "exercise_question_id" @@ -926,15 +842,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type" add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at" - create_table "forked_project_links", :force => true do |t| - t.integer "forked_to_project_id", :null => false - t.integer "forked_from_project_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true - create_table "forums", :force => true do |t| t.string "name", :null => false t.text "description" @@ -1064,21 +971,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.datetime "updated_at", :null => false end - create_table "identities", :force => true do |t| - t.string "extern_uid" - t.string "provider" - t.integer "user_id" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id" - add_index "identities", ["user_id"], :name => "index_identities_on_user_id" - - create_table "innodb_monitor", :id => false, :force => true do |t| - t.integer "a" - end - create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1223,21 +1115,10 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.integer "m_reply_id" t.integer "is_comprehensive_evaluation" t.integer "private", :default => 0 + t.integer "root_id" end - create_table "keys", :force => true do |t| - t.integer "user_id" - t.datetime "created_at" - t.datetime "updated_at" - t.text "key" - t.string "title" - t.string "type" - t.string "fingerprint" - t.boolean "public", :default => false, :null => false - end - - add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id" - add_index "keys", ["user_id"], :name => "index_keys_on_user_id" + add_index "journals_for_messages", ["root_id"], :name => "index_journals_for_messages_on_root_id" create_table "kindeditor_assets", :force => true do |t| t.string "asset" @@ -1250,27 +1131,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.integer "owner_type", :default => 0 end - create_table "label_links", :force => true do |t| - t.integer "label_id" - t.integer "target_id" - t.string "target_type" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id" - add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type" - - create_table "labels", :force => true do |t| - t.string "title" - t.string "color" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "labels", ["project_id"], :name => "index_labels_on_project_id" - create_table "member_roles", :force => true do |t| t.integer "member_id", :null => false t.integer "role_id", :null => false @@ -1324,47 +1184,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.integer "viewed_count", :default => 0 end - create_table "merge_request_diffs", :force => true do |t| - t.string "state" - t.text "st_commits", :limit => 2147483647 - t.text "st_diffs", :limit => 2147483647 - t.integer "merge_request_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true - - create_table "merge_requests", :force => true do |t| - t.string "target_branch", :null => false - t.string "source_branch", :null => false - t.integer "source_project_id", :null => false - t.integer "author_id" - t.integer "assignee_id" - t.string "title" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "milestone_id" - t.string "state" - t.string "merge_status" - t.integer "target_project_id", :null => false - t.integer "iid" - t.text "description" - t.integer "position", :default => 0 - t.datetime "locked_at" - end - - add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id" - add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id" - add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id" - add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at" - add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id" - add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch" - add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id" - add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch" - add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true - add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title" - create_table "message_alls", :force => true do |t| t.integer "user_id" t.integer "message_id" @@ -1391,6 +1210,7 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.integer "reply_id" t.integer "quotes" t.integer "status", :default => 0 + t.integer "root_id" end add_index "messages", ["author_id"], :name => "index_messages_on_author_id" @@ -1398,39 +1218,7 @@ ActiveRecord::Schema.define(:version => 20161009053958) do add_index "messages", ["created_on"], :name => "index_messages_on_created_on" add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" add_index "messages", ["parent_id"], :name => "messages_parent_id" - - create_table "milestones", :force => true do |t| - t.string "title", :null => false - t.integer "project_id", :null => false - t.text "description" - t.date "due_date" - t.datetime "created_at" - t.datetime "updated_at" - t.string "state" - t.integer "iid" - end - - add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id" - add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date" - add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true - add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id" - - create_table "namespaces", :force => true do |t| - t.string "name", :null => false - t.string "path", :null => false - t.integer "owner_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "type" - t.string "description", :default => "", :null => false - t.string "avatar" - end - - add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id" - add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true - add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id" - add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true - add_index "namespaces", ["type"], :name => "index_namespaces_on_type" + add_index "messages", ["root_id"], :name => "index_messages_on_root_id" create_table "news", :force => true do |t| t.integer "project_id" @@ -1457,31 +1245,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.datetime "updated_at", :null => false end - create_table "notes", :force => true do |t| - t.text "note" - t.string "noteable_type" - t.integer "author_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "project_id" - t.string "attachment" - t.string "line_code" - t.string "commit_id" - t.integer "noteable_id" - t.boolean "system", :default => false, :null => false - t.text "st_diff", :limit => 2147483647 - end - - add_index "notes", ["author_id"], :name => "index_notes_on_author_id" - add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id" - add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id" - add_index "notes", ["created_at"], :name => "index_notes_on_created_at" - add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type" - add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type" - add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type" - add_index "notes", ["project_id"], :name => "index_notes_on_project_id" - add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at" - create_table "notificationcomments", :force => true do |t| t.string "notificationcommented_type" t.integer "notificationcommented_id" @@ -1491,49 +1254,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.datetime "updated_at", :null => false end - create_table "oauth_access_grants", :force => true do |t| - t.integer "resource_owner_id", :null => false - t.integer "application_id", :null => false - t.string "token", :null => false - t.integer "expires_in", :null => false - t.text "redirect_uri", :null => false - t.datetime "created_at", :null => false - t.datetime "revoked_at" - t.string "scopes" - end - - add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true - - create_table "oauth_access_tokens", :force => true do |t| - t.integer "resource_owner_id" - t.integer "application_id" - t.string "token", :null => false - t.string "refresh_token" - t.integer "expires_in" - t.datetime "revoked_at" - t.datetime "created_at", :null => false - t.string "scopes" - end - - add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true - add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id" - add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true - - create_table "oauth_applications", :force => true do |t| - t.string "name", :null => false - t.string "uid", :null => false - t.string "secret", :null => false - t.text "redirect_uri", :null => false - t.string "scopes", :default => "", :null => false - t.datetime "created_at" - t.datetime "updated_at" - t.integer "owner_id" - t.string "owner_type" - end - - add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type" - add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true - create_table "onclick_times", :force => true do |t| t.integer "user_id" t.datetime "onclick_time" @@ -1625,8 +1345,11 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.integer "sticky", :default => 0 t.integer "org_subfield_id" t.integer "status", :default => 0 + t.integer "root_id" end + add_index "org_document_comments", ["root_id"], :name => "index_org_document_comments_on_root_id" + create_table "org_member_roles", :force => true do |t| t.integer "org_member_id" t.integer "role_id" @@ -1691,23 +1414,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.integer "allow_teacher", :default => 0 end - create_table "permissions", :force => true do |t| - t.string "controller", :limit => 30, :default => "", :null => false - t.string "action", :limit => 30, :default => "", :null => false - t.string "description", :limit => 60, :default => "", :null => false - t.boolean "is_public", :default => false, :null => false - t.integer "sort", :default => 0, :null => false - t.boolean "mail_option", :default => false, :null => false - t.boolean "mail_enabled", :default => false, :null => false - end - - create_table "permissions_roles", :id => false, :force => true do |t| - t.integer "permission_id", :default => 0, :null => false - t.integer "role_id", :default => 0, :null => false - end - - add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id" - create_table "phone_app_versions", :force => true do |t| t.string "version" t.text "description" @@ -1790,11 +1496,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.datetime "updated_at", :null => false end - create_table "project_import_data", :force => true do |t| - t.integer "project_id" - t.text "data" - end - create_table "project_infos", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1888,16 +1589,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" - create_table "protected_branches", :force => true do |t| - t.integer "project_id", :null => false - t.string "name", :null => false - t.datetime "created_at" - t.datetime "updated_at" - t.boolean "developers_can_push", :default => false, :null => false - end - - add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id" - create_table "pull_requests", :force => true do |t| t.integer "pull_request_id" t.integer "gpid" @@ -2054,25 +1745,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.integer "is_teacher_score", :default => 0 end - create_table "services", :force => true do |t| - t.string "type" - t.string "title" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.boolean "active", :default => false, :null => false - t.text "properties" - t.boolean "template", :default => false - t.boolean "push_events", :default => true - t.boolean "issues_events", :default => true - t.boolean "merge_requests_events", :default => true - t.boolean "tag_push_events", :default => true - t.boolean "note_events", :default => true, :null => false - end - - add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id" - add_index "services", ["project_id"], :name => "index_services_on_project_id" - create_table "settings", :force => true do |t| t.string "name", :default => "", :null => false t.text "value" @@ -2111,26 +1783,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.datetime "updated_at", :null => false end - create_table "snippets", :force => true do |t| - t.string "title" - t.text "content", :limit => 2147483647 - t.integer "author_id", :null => false - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "file_name" - t.datetime "expires_at" - t.string "type" - t.integer "visibility_level", :default => 0, :null => false - end - - add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id" - add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id" - add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at" - add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at" - add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id" - add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level" - create_table "softapplications", :force => true do |t| t.string "name" t.text "description" @@ -2284,17 +1936,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.datetime "updated_at", :null => false end - create_table "subscriptions", :force => true do |t| - t.integer "user_id" - t.integer "subscribable_id" - t.string "subscribable_type" - t.boolean "subscribed" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true - create_table "syllabus_members", :force => true do |t| t.integer "rank" t.integer "syllabus_id" @@ -2568,17 +2209,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do add_index "users", ["id", "type"], :name => "index_users_on_id_and_type" add_index "users", ["type"], :name => "index_users_on_type" - create_table "users_star_projects", :force => true do |t| - t.integer "project_id", :null => false - t.integer "user_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id" - add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true - add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id" - create_table "versions", :force => true do |t| t.integer "project_id", :default => 0, :null => false t.string "name", :default => "", :null => false @@ -2630,23 +2260,6 @@ ActiveRecord::Schema.define(:version => 20161009053958) do t.datetime "updated_at", :null => false end - create_table "web_hooks", :force => true do |t| - t.string "url" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "type", :default => "ProjectHook" - t.integer "service_id" - t.boolean "push_events", :default => true, :null => false - t.boolean "issues_events", :default => false, :null => false - t.boolean "merge_requests_events", :default => false, :null => false - t.boolean "tag_push_events", :default => false - t.boolean "note_events", :default => false, :null => false - end - - add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id" - add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id" - create_table "wechat_logs", :force => true do |t| t.string "openid", :null => false t.text "request_raw" From 005cd09d4ae6c4470f7776d236d21dbe4db1cadf Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 11 Oct 2016 14:58:50 +0800 Subject: [PATCH 28/48] =?UTF-8?q?=E5=A4=A7=E7=BA=B2=E4=B8=AD=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F=E7=A7=BB=E5=88=B0common.css?= =?UTF-8?q?=E4=B8=AD=EF=BC=9Bproject.css=E4=B8=AD=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=8E=BB=E9=87=8D=EF=BC=9B=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=81=B0=E8=89=B2=E8=BE=B9=E7=BA=BF=EF=BC=9B?= =?UTF-8?q?=E5=A4=A7=E7=BA=B2=E9=A1=B9=E7=9B=AE=E5=85=AC=E7=94=A8=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E6=8F=90=E5=8F=96=E5=88=B0public.css=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css/common.css | 69 +++++++++++++- public/stylesheets/css/courses.css | 2 - public/stylesheets/css/project.css | 141 +---------------------------- public/stylesheets/css/public.css | 34 +++---- public/stylesheets/sy_public.css | 70 -------------- public/stylesheets/syllabus.css | 7 +- 6 files changed, 85 insertions(+), 238 deletions(-) diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index defbdbed1..7503e2320 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -530,7 +530,43 @@ a:hover.BlueCirBtn{ background:#3598db; color:#fff;} a.BlueCirBtnMini{ display:block;width:40px; height:24px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} a:hover.BlueCirBtnMini{ background:#3598db; color:#fff;} -/*20160725 项目申请按钮*/ +/* 按钮*/ +a.btn_orange_big{ + display:inline-block; + border: 1px solid #ee4a1f; + color: #ee4a1f; + text-align: center; + font-size: 14px; + padding:0 10px; + height: 30px; + line-height: 30px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; +} +a:hover.btn_orange_big{ + background: #ee4a1f; + color: #fff; +} +a.btn_green_big{ + display:inline-block; + border: 1px solid #60b25e; + color: #60b25e; + text-align: center; + font-size: 14px; + padding:0 10px; + height: 30px; + line-height: 30px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; +} +a:hover.btn_green_big{ + background: #60b25e; + color: #fff; +} a.sy_btn_grey{ display:inline-block; color: #333; @@ -561,6 +597,37 @@ a.sy_btn_blue{ border-radius:3px; } a:hover.sy_btn_blue{ background: #2788d0;} +a.sy_btn_green{ + display:inline-block; + color: #fff; + background: #60b25e; + text-align: center; + font-size: 12px; + padding:0 15px; + height: 30px; + line-height: 30px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; +} +a:hover.sy_btn_green{ background: #51a74f;} +a.hw_btn_blue{ + display: inline-block; + color: #3b94d6; + border:1px solid #3b94d6; + background:#fff; + text-align: center; + font-size: 12px; + padding:0 15px; + height: 30px; + line-height: 30px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; +} +a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;} /* commonpic */ .pic_date{ display:block; background:url(/images/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; } .pic_add{ display:block; background:url(/images/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; } diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index a21633e44..cd6c8b9e8 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -8,8 +8,6 @@ .HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd; float:right;} .RightBanner {font-size:16px; width:733px; color:#4b4b4b; padding:10px 0 0 15px; margin-bottom:10px; background:#fff; border:1px solid #dddddd;height:34px;} select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;} -/*a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}*/ -/*a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#3598db;}*/ a.FilesBtn{ background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:38px; height:20px; display:block; padding-left:20px; color:#888888;} a:hover.FilesBtn{background: url(../images/homepage_icon.png) -89px -372px no-repeat; color:#3598db;} a.ProBtn{background: url(../images/homepage_icon.png) -86px -396px no-repeat; width:30px; height:20px; display:block; padding-left:20px; color:#888888;} diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 44b607b3b..fe10650ce 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -678,109 +678,12 @@ a.syllabusbox_a_blue{ .syllabus_info_tishi a{ color:#3b94d6; } -.homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px; } .homepagePostSettiongText {width:75px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-48px; top:20px; padding:5px 0px; display:none;} -.homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;} a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;} a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3b94d6; color:#3b94d6; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} a:hover.BlueCirBtnMini{ background:#3b94d6; color:#fff;} -/* 按钮 复制课程大纲*/ -a.btn_orange_big{ - border: 1px solid #ee4a1f; - color: #ee4a1f; - text-align: center; - font-size: 14px; - padding:0 10px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.btn_orange_big{ - background: #ee4a1f; - color: #fff; -} -a.btn_green_big{ - border: 1px solid #60b25e; - color: #60b25e; - text-align: center; - font-size: 14px; - padding:0 10px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.btn_green_big{ - background: #60b25e; - color: #fff; -} -a.sy_btn_green{ - display: inline-block; - color: #fff; - background: #60b25e; - text-align: center; - font-size: 12px; - padding:0 15px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.sy_btn_green{ background: #51a74f;} -a.sy_btn_grey{ - color: #333; - background: #e1e1e1; - text-align: center; - font-size: 12px; - padding:0 15px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.sy_btn_grey{ background: #c3c3c3;} -a.sy_btn_blue{ - color: #fff; - background: #3b94d6; - text-align: center; - font-size: 12px; - padding:0 15px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.sy_btn_blue{ background: #2788d0;} -a.hw_btn_blue{ - display: inline-block; - color: #3b94d6; - border:1px solid #3b94d6; - background:#fff; - text-align: center; - font-size: 12px; - padding:0 15px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;} - /* 缺陷列表 */ .issues_greycirbg_btn{ background-color:#dedede; padding:1px 5px;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; } .issues_greycirbg_btn:hover{background-color:#cbcbcb;} @@ -805,8 +708,6 @@ input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} .issues_nav_hover{border-bottom:3px solid #3498db; font-weight:bold; } .issues_nav_nomall {border-bottom:none; } .issues_nav_tag{ background-color:#eaeaea; padding:2px 8px;-webkit-border-radius:15px;-moz-border-radius:15px;-o-border-radius:15px;border-radius:15px; font-size:12px;} -.undis {display:none;} -.dis {display:block;} .issues_form_filter{ position: absolute; top:0; right: 0;} .issues_form_filter select{ width:70px; height:30px; border:none; font-size:14px; border:none;border-right:none; color: #888; font-size: 12px; line-height: 30px; padding-right:10px;} .issues_form_filter select.issues_filter_select_min{width:50px; } @@ -837,48 +738,8 @@ a:hover.issues_list_title{color:#3b94d6;} .hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(/images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px; cursor:pointer;} .hw_search_box a:hover.hw_btn_search{background:url(/images/hw/icons_hw.png) -40px -57px no-repeat;} .hw_files_icon{display:block; width:17px; height:14px; background:url(/images/hw/icons_hw.png) 0 -135px no-repeat;} -/* 编辑删除 与课程相同 */ -.sy_icons_edit{ display: inline-block; padding:9px;background:url(/images/sy/sy_icons02.png) 0 1px no-repeat; } -.sy_icons_del{ padding:9px;background:url(/images/sy/sy_icons02.png) 0 -21px no-repeat;} -.sy_icons_edit:hover{ background:url(/images/sy/sy_icons02.png) -20px 1px no-repeat; } -.sy_icons_del:hover{ background:url(/images/sy/sy_icons02.png) -20px -21px no-repeat;} -/* 翻页 与课程相同*/ -.pages a{ - display:block; - border:1px solid #d1d1d1; - color:#888; - float:left; - width:30px; - text-align:center; - padding:3px 0; - line-height:1.9; - margin-right:5px; -} -.pages a:hover{ - background-color:#3b94d6; - border:1px solid #3b94d6; - color:#fff; -} -a.pages-big{ - width:50px; -} -.pages .active{ - background-color:#3b94d6; - border:1px solid #3b94d6; - color:#fff; -} -.pages{ - width:330px; - margin:20px auto 10px; -} -.sy_corange{ color: #ee4a1f;} -.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;} -.sy_cgrey{ color: #888;} -a.sy_cgrey{ color: #888;} -.sy_corange{ color: #ee4a1f;} -a.sy_corange{ color: #ee4a1f;} -a.sy_cblue{ color: #3b94d6;} + /* 新增粉色关注按钮*/ a.sy_btn_pink{ display: inline-block; diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index 514139513..8aded437c 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -423,9 +423,6 @@ a.sortArrowActiveU {background:url(../images/post_image_list.png) -17px -20px no .postDate {color:#888888; font-size:12px;} .postStatics { margin-top:28px; color:#888888; float:right; text-align:center;} .slice {width:1px; height:25px; background-color:#d1d1d1; float:right; margin-top:35px; margin-right:20px;} -.pageRoll {float:right; border-left:1px solid #dddddd; margin-top:15px;} -.pageCell {border:1px solid #dddddd; border-width:1px 1px 1px 0px; padding:5px 12px; float:left; border-spacing:0px;} -.pageCellActive {background-color:#3498db;} .postCreateInput {width:963px; height:28px; border:1px solid #d9d9d9 !important; outline:none;} .upImg {padding:1px 6px; border: 1px solid #dddddd; margin-top:53px;} @@ -550,7 +547,7 @@ a:hover.st_img { border:1px solid #1c9ec7; } .searchContentDes {width:883px;} .searchTag {font-size:12px; color:#ffffff; background-color:#7ec8e4; height:16px; min-height:16px; max-height:16px; float:left; line-height:16px; padding:0px 3px;} .numRed {color:#FF6600;} -.pageRoll {float:right; border-left:1px solid #dddddd; margin-top:15px;} +.pageRoll {float:right; margin-top:15px;} .pageCell {border:1px solid #dddddd; padding:5px 12px; float:left; margin-left:-1px; position:relative;} .pageCell:hover {border:1px solid #3498db; z-index:10;} .pageCellActive {background-color:#3498db; border:1px solid #3498db !important; position:relative; color:#ffffff;} @@ -1431,21 +1428,6 @@ a.syllabusbox_a_blue { margin-bottom:100px; color:#888; } -a.sy_btn_green{ - display:inline-block; - color: #fff; - background: #60b25e; - text-align: center; - font-size: 12px; - padding:0 15px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; - } -a:hover.sy_btn_green{ background: #51a74f;} /*资源提示框*/ .resource_tip_box {position:absolute; padding:5px 10px; white-space:nowrap; background-color:#fff; right:-150px; top:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} @@ -1461,3 +1443,17 @@ a:hover.sy_btn_green{ background: #51a74f;} .flex-container {display:flex;} .flex-cell {flex:1;} .flex-cell:last-child {text-align:right;} + +/*新课程、项目公用样式提取*/ +.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;} +.sy_cgrey{ color: #888;} +a.sy_cgrey{ color: #888;} +.sy_corange{ color: #ee4a1f;} +a.sy_corange{ color: #ee4a1f;} +a.sy_cblue{ color: #3b94d6;} + +/* 编辑删除 */ +.sy_icons_edit{ display: inline-block; padding:9px;background:url(/images/sy/sy_icons02.png) 0 1px no-repeat; } +.sy_icons_del{ padding:9px;background:url(/images/sy/sy_icons02.png) 0 -21px no-repeat;} +.sy_icons_edit:hover{ background:url(/images/sy/sy_icons02.png) -20px 1px no-repeat; } +.sy_icons_del:hover{ background:url(/images/sy/sy_icons02.png) -20px -21px no-repeat;} diff --git a/public/stylesheets/sy_public.css b/public/stylesheets/sy_public.css index adfce90bb..dfd806746 100644 --- a/public/stylesheets/sy_public.css +++ b/public/stylesheets/sy_public.css @@ -1,16 +1,11 @@ /* 字体颜色 */ .sy_cblack{ color: #333;} -.sy_cgrey{ color: #888;} -.sy_corange{ color: #ee4a1f;} .sy_f14{ font-size: 14px;} .sy_f16{ font-size: 16px;} a:hover.sy_cgrey{ color:#ee4a1f;} -a.sy_corange{ color: #ee4a1f; } a:hover.sy_corange{ text-decoration:underline;} -a.sy_cblue{ color: #3b94d6;} a.sy_cblack{ color: #333;} a:hover.sy_cblack{color: #3b94d6;} -a.sy_cgrey{ color: #888;} a.sy_cmore{ font-size:12px; color:#888; font-weight:normal;} a:hover.sy_cmore{color: #ee4a1f;} /* 题库新增*/ @@ -72,72 +67,7 @@ a:hover.hw_corange{ color: #e1412b;} .hw_cir_lgreen{ background:#7ecfa2;} .hw_w20{ width:20px; display:block; text-align:center;} .hw_w30{ width:30px; display:block; text-align:center;} -/* 按钮*/ -a.btn_orange_big{ - display:inline-block; - border: 1px solid #ee4a1f; - color: #ee4a1f; - text-align: center; - font-size: 12px; - padding:0 10px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.btn_orange_big{ - background: #ee4a1f; - color: #fff; -} -a.btn_green_big{ - display:inline-block; - border: 1px solid #60b25e; - color: #60b25e; - text-align: center; - font-size: 14px; - padding:0 10px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.btn_green_big{ - background: #60b25e; - color: #fff; -} -/*a.sy_btn_grey{*/ - /*color: #333;*/ - /*background: #e1e1e1;*/ - /*text-align: center;*/ - /*font-size: 12px;*/ - /*padding:0 15px;*/ - /*height: 30px;*/ - /*line-height: 30px;*/ - /*-webkit-border-radius:3px;*/ - /*-moz-border-radius:3px;*/ - /*-o-border-radius:3px;*/ - /*border-radius:3px;*/ -/*}*/ -/*a:hover.sy_btn_grey{ background: #c3c3c3;}*/ -/*a.sy_btn_blue{*/ - /*color: #fff;*/ - /*background: #3b94d6;*/ - /*text-align: center;*/ - /*font-size: 12px;*/ - /*padding:0 15px;*/ - /*height: 30px;*/ - /*line-height: 30px;*/ - /*-webkit-border-radius:3px;*/ - /*-moz-border-radius:3px;*/ - /*-o-border-radius:3px;*/ - /*border-radius:3px;*/ -/*}*/ -/*a:hover.sy_btn_blue{ background: #2788d0;}*/ /* 排序 */ .sy_category{ height: 50px; diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index 12f3ecb6c..14ca4ceda 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -624,7 +624,7 @@ a:hover.sy_class_ltitle{ color:#333;} .hw_tab_top{ height: 50px; line-height: 50px; padding-left: 15px; border-bottom:1px solid #ddd; border-left:3px solid #3b94d6; } /*20160918教师团队*/ -.sy_new_tablebox{ padding:15px; padding-bottom:none;} +.sy_new_tablebox{ padding:15px; padding-bottom:0;} .sy_new_table{ width:100%; background:#fff; border:1px solid #e5e5e5;} .sy_new_table thead tr{ height:40px; line-height:40px;} .sy_new_table thead tr th{ border-bottom:1px solid #e5e5e5;} @@ -634,7 +634,6 @@ a:hover.sy_class_ltitle{ color:#333;} .sy_new_tchlist li{ height:30px; line-height:30px;} .sy_new_search{-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3; background:#fff; padding-left:5px; color:#888; height:32px; width:370px;box-shadow: inset 0px 0px 3px #dcdcdc; } .sy_new_tchbox{ background:#f5f5f5; padding:15px; margin:15px; margin-top:0px;} -.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;} .sy_new_namebox{ width:180px; overflow:hidden;} .sy_new_name{ display:block;max-width:120px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} .sy_new_long_name{ display:block;width:180px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} @@ -647,10 +646,6 @@ a:hover.sy_class_ltitle{ color:#333;} .sy_class_r_more{ display: block;} .sy_class_fenban{border: 1px solid #e7e7e7; background-color: #fff; padding:15px;} .sy_fenban_input{ height: 28px; background-color: #fff; border: 1px solid #d1d1d1;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3;padding-left:5px; color:#888; box-shadow: inset 0px 0px 5px #dcdcdc; } -.sy_icons_edit{ display: inline-block; padding:9px;background:url(../images/sy/sy_icons02.png) 0 1px no-repeat; } -.sy_icons_del{ padding:9px;background:url(../images/sy/sy_icons02.png) 0 -21px no-repeat;} -.sy_icons_edit:hover{ background:url(../images/sy/sy_icons02.png) -20px 1px no-repeat; } -.sy_icons_del:hover{ background:url(../images/sy/sy_icons02.png) -20px -21px no-repeat;} .sy_icons_tips{padding:9px;background:url(../images/sy/sy_icons02.png) 0 -66px no-repeat;} .sy_sortupbtn{display: inline-block; width:15px; height:18px;background:url(../images/sy/sy_icons02.png) 0 -39px no-repeat;} .sy_sortdownbtn{display: inline-block; width:15px; height:18px;background:url(../images/sy/sy_icons02.png) -22px -39px no-repeat;} From c693afdee86fd5b2dfdb7e12c0b1f8a5789421cd Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 11 Oct 2016 17:26:36 +0800 Subject: [PATCH 29/48] =?UTF-8?q?project.css=E5=8E=BB=E9=87=8D=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E5=8F=96=E5=88=B0public.css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../syllabuses/_syllabus_course_list.html.erb | 2 +- public/stylesheets/css/project.css | 133 ------------------ public/stylesheets/css/public.css | 52 +++++++ public/stylesheets/css/structure.css | 2 +- public/stylesheets/syllabus.css | 35 ----- 5 files changed, 54 insertions(+), 170 deletions(-) diff --git a/app/views/syllabuses/_syllabus_course_list.html.erb b/app/views/syllabuses/_syllabus_course_list.html.erb index a8f22d0cb..6adcae4a7 100644 --- a/app/views/syllabuses/_syllabus_course_list.html.erb +++ b/app/views/syllabuses/_syllabus_course_list.html.erb @@ -62,7 +62,7 @@ <% if User.current.member_of_course?(course) %> <%=link_to '进入班级', course_path(course), :class => 'btn_orange_big fr mt5', :target => '_blank' %> <% else %> - <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "hw_btn_green2 fr mt5",:method => "post"%> + <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "hw_btn_green fr mt5",:method => "post"%> <% end %>
          diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index fe10650ce..a49750dea 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -560,130 +560,6 @@ a:hover.upload_btn_grey{background:#8a8a8a;} .publish-icon {background:url("/images/new_project/icons_issue.png") 0px -82px no-repeat; width:18px; height:18px; display:block;} .publish-icon:hover {background:url("/images/new_project/icons_issue.png") -25px -82px no-repeat;} -/* 班级主页 */ -.sy_class_infobox{ - padding:15px; - background:#fff; - margin:0px auto ; - width:968px; - border:1px solid #e5e5e5; - position: relative; -} -.homepagePostSetting { - position:absolute; - width:20px; - height:20px; - right:10px; - top:10px; -} -.homepagePostSetting ul li:hover ul { - display:block; -} - -.homepagePostSettiongText { - width:75px; - text-align: center; - line-height:2; - font-size:12px; - color:#616060; - background-color:#ffffff; - border:1px solid #eaeaea; - border-radius:3px; - position:absolute; - left:-60px; - top:20px; - padding:5px 0px; - display:none; - box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); -} - -a.postOptionLink { - color:#616060; - display:block; - width:55px; - padding:0px 10px; -} -a.postOptionLink:hover { - color:#fff; - background-color:#3b94d6; -} - -.sy_class_logo{ - width:110px; - height:110px; -} -.sy_class_id{ - width:110px; - height:80px; - background:#fff; - border: 1px solid #f1f1f1; - text-align:center; - padding-top:30px; -} -.sy_class_id p{ - font-size:16px; - color:#333; -} -.sy_class_title{ - font-size: 18px; - font-weight: normal; - margin-bottom: 5px; - max-width:440px; - overflow:hidden; - white-space: nowrap; - text-overflow:ellipsis; -} - -.sy_class_titbox{margin-bottom:5px; padding-top:10px; } - -/*旧版课程大纲新建编辑*/ -.sy_tab_con{width:740px; padding:20px; position:relative;} -.syllabuscon_title{ - color:#000; text-align:center; -} -.syllabuscon_txt p{ - font-size:14px; - line-height:1.9; - color:#000; -} -.syllabuscon_txt_title{ - font-weight:bold; - margin:10px 0; -} -.syllabusbox_tishi{ - font-size:14px; - width:733px; - color:#cb7c01; - padding:10px 0 0 15px; - margin-bottom:10px; - background:#fff7d1; - border:1px solid #fcd9b4; - height:34px; -} -a.syllabusbox_a_blue{ - color:#3b94d6; -} -.syllabus_leftinfo p{ - line-height:25px; - width:150px; - overflow:hidden; - white-space: nowrap; - text-overflow:ellipsis; -} -.syllabus_info_tishi{ - font-size:16px; - width:400px; - margin:100px auto; -} -.syllabus_info_tishi a{ - color:#3b94d6; -} -.homepagePostSettiongText {width:75px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-48px; top:20px; padding:5px 0px; display:none;} -a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;} -a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;} -a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3b94d6; color:#3b94d6; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} -a:hover.BlueCirBtnMini{ background:#3b94d6; color:#fff;} - /* 缺陷列表 */ .issues_greycirbg_btn{ background-color:#dedede; padding:1px 5px;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; } .issues_greycirbg_btn:hover{background-color:#cbcbcb;} @@ -731,15 +607,6 @@ a:hover.issues_list_title{color:#3b94d6;} .issues_list_txt li{ height: 50px; float: left; font-size: 12px; width: 70px; text-align: center; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;} .issues_list_txt li.issues_list_min{ width: 52px;} - -/* 搜索 与课程相同 */ -.hw_search_box{ position:relative; } -.hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;} -.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(/images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px; cursor:pointer;} -.hw_search_box a:hover.hw_btn_search{background:url(/images/hw/icons_hw.png) -40px -57px no-repeat;} -.hw_files_icon{display:block; width:17px; height:14px; background:url(/images/hw/icons_hw.png) 0 -135px no-repeat;} - - /* 新增粉色关注按钮*/ a.sy_btn_pink{ display: inline-block; diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index 8aded437c..ffa1bc206 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -1457,3 +1457,55 @@ a.sy_cblue{ color: #3b94d6;} .sy_icons_del{ padding:9px;background:url(/images/sy/sy_icons02.png) 0 -21px no-repeat;} .sy_icons_edit:hover{ background:url(/images/sy/sy_icons02.png) -20px 1px no-repeat; } .sy_icons_del:hover{ background:url(/images/sy/sy_icons02.png) -20px -21px no-repeat;} + +/*搜索*/ +.hw_search_box{ position:relative; } +.hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;} +.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(/images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px; cursor:pointer;} +.hw_search_box a:hover.hw_btn_search{background:url(/images/hw/icons_hw.png) -40px -57px no-repeat;} +.hw_files_icon{display:block; width:17px; height:14px; background:url(/images/hw/icons_hw.png) 0 -135px no-repeat;} + +/*课程大纲新建编辑*/ +.sy_tab_con{ + width:720px; padding:20px 28px 0 32px; position:relative; +} +.syllabuscon_title{ + color:#000; text-align:center; +} +.syllabuscon_txt p{ + font-size:14px; + line-height:1.9; + color:#000; +} +.syllabuscon_txt_title{ + font-weight:bold; + margin:10px 0; +} +.syllabusbox_tishi{ + font-size:14px; + width:733px; + color:#cb7c01; + padding:10px 0 0 15px; + margin-bottom:10px; + background:#fff7d1; + border:1px solid #fcd9b4; + height:34px; +} +a.syllabusbox_a_blue{ + color:#3b94d6; +} +.syllabus_leftinfo p{ + line-height:25px; + width:150px; + overflow:hidden; + white-space: nowrap; + text-overflow:ellipsis; +} +.syllabus_info_tishi{ + font-size:16px; + width:400px; + margin:100px auto; +} +.syllabus_info_tishi a{ + color:#3b94d6; +} diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index 4f7c2a91c..47ac92fb6 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -235,7 +235,7 @@ a.postReplyCancel:hover {color:#ffffff;} .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;} .homepagePostSetting ul li:hover ul {display:block;} .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;} -.homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;z-index:999;} +.homepagePostSettiongText {width:85px; text-align:center; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;z-index:999; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);} .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat; cursor: pointer;} .whiteSettingIcon {background:url(/images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;} .whiteSettingIcon:hover {background:url(/images/homepage_icon.png) -93px -44px no-repeat;} diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index 14ca4ceda..c74f977d3 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -40,37 +40,6 @@ input.syllabus_input_min{ background: #fff; border: 1px solid #dddddd; } -.sy_tab_con{ - width:720px; padding:20px 28px 0 32px; position:relative; -} -.syllabuscon_title{ - color:#000; text-align:center; -} -.syllabuscon_txt p{ - font-size:14px; - line-height:1.9; - color:#000; -} -.syllabuscon_txt_title{ - font-weight:bold; - margin:10px 0; -} - -.syllabus_leftinfo p{ - line-height:25px; - width:150px; - overflow:hidden; - white-space: nowrap; - text-overflow:ellipsis; -} -.syllabus_info_tishi{ - font-size:16px; - width:400px; - margin:100px auto; -} -.syllabus_info_tishi a{ - color:#3b94d6; -} /*课程大纲-课程列表*/ .icon_course{ background: url(../images/syllabus/icons_syllabus.png) 0 -35px no-repeat; width:18px; height:15px; display:block;} @@ -605,11 +574,8 @@ a:hover.sy_class_ltitle{ color:#333;} .hw_more_txt {width:75px; font-size:12px; color:#616060; background-color:#fff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-40px; top:15px; padding:5px 0px; display:none; box-shadow: 0px 0px 8px rgba(146, 153, 169, 0.5); z-index:1000;} .hw_more_txt li a.hw_more_li {font-size:12px;color:#888; display:block; width:75px;height:24px;line-height:24px;text-align:center; } .hw_more_txt li a.hw_more_li:hover {background-color:#f0f0f0;} -.hw_search_box{ position:relative; } -.hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;} .hw_search_box span.hw_btn_search{display:block; width:20px; height:20px; background:url(../images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:15px;} /*.hw_search_box a:hover.hw_btn_search{background:url(../images/hw/icons_hw.png) -40px -57px no-repeat;}*/ -.hw_files_icon{display:block; width:17px; height:14px; background:url(../images/hw/icons_hw.png) 0 -135px no-repeat;} .hw_list_classname{ width:300px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} .syllabus_course_name{ width:450px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} .hw_list_teachername{ width:80px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} @@ -669,5 +635,4 @@ a:hover.sy_class_ltitle{ color:#333;} .sy_tips_box:hover .sy_tips_box_inner{ display: block;} .sy_tips_box_inner{ position: absolute;line-height: 2.0;padding: 5px 10px; white-space: nowrap; background-color: #fff; left:30px; top: -5px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);} .sy_tips_box_inner span { display: block; border-width: 10px;position: absolute;top: 15px; left: -18px; border-style: dashed solid dashed dashed;border-color: transparent #fff transparent transparent;font-size: 0;line-height: 0;} -.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(../images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px;} From 399b982e0d4ef38f9c8f8989c9c9e65ae0cb8023 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 12 Oct 2016 13:34:09 +0800 Subject: [PATCH 30/48] =?UTF-8?q?=E5=95=8F=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_edit_MC.html.erb | 28 ++-- app/views/poll/_edit_MCQ.html.erb | 58 +++++--- app/views/poll/_edit_mulit.html.erb | 49 +++++-- app/views/poll/_edit_single.html.erb | 19 ++- app/views/poll/_new_MC.html.erb | 10 +- app/views/poll/_new_MCQ.html.erb | 31 +++-- app/views/poll/_new_mulit.html.erb | 38 +++-- app/views/poll/_new_single.html.erb | 18 +-- app/views/poll/_poll_content.html.erb | 2 +- app/views/poll/_poll_form.html.erb | 155 ++++++++++++++------- app/views/poll/_show_MC.html.erb | 12 +- app/views/poll/_show_MCQ.html.erb | 38 +++-- app/views/poll/_show_mulit.html.erb | 46 +++--- app/views/poll/_show_single.html.erb | 21 +-- app/views/poll/create_poll_question.js.erb | 56 +++++--- public/stylesheets/css/common.css | 4 +- 16 files changed, 344 insertions(+), 241 deletions(-) diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb index 08aeacc43..153874dd6 100644 --- a/app/views/poll/_edit_MC.html.erb +++ b/app/views/poll/_edit_MC.html.erb @@ -5,14 +5,22 @@ { $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>") $("#is_necessary_<%=poll_question.id%>").replaceWith("/>"); - $("#poll_answers_<%=poll_question.id%>").html("<% poll_question.poll_answers.reorder('answer_position').each do |poll_answer| %>" + - "
        • " + + $("#poll_answers_<%=poll_question.id%>").html("<% poll_question.poll_answers.reorder('answer_position').each do |poll_answer| %> " + + "<% if poll_answer.answer_text != '' %>" + + "
        • " + "" + - "" + - "" + + "" + "" + "
          • " + "
          " + + "<% else %>"+ + "
        • " + + "" + + "" + + "" + + "
          • " + + "
          " + + "<% end %>"+ "<% end%>"); } @@ -31,14 +39,14 @@ <% if poll_answer.answer_text != '' %>
        • - +
          • <% else %>
        • - +
          • @@ -57,12 +65,8 @@
          - - <%= l(:label_button_ok)%> - - - <%= l(:button_cancel)%> - + <%= l(:button_cancel)%> + <%= l(:label_button_ok)%>
          diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb index 86e04106f..d74356922 100644 --- a/app/views/poll/_edit_MCQ.html.erb +++ b/app/views/poll/_edit_MCQ.html.erb @@ -5,44 +5,66 @@ $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>") $("#is_necessary_<%=poll_question.id%>").replaceWith("/>"); $("#poll_answers_<%=poll_question.id%>").html("<% poll_question.poll_answers.reorder('answer_position').each do |poll_answer| %>" + - "
        • " + + "<% if poll_answer.answer_text != '' %>" + + "
        • " + "" + - "" + - "" + + "" + + "" + + "
          • " + + "
          " + + "<% else %>"+ + "
        • " + + "" + + "" + "" + "
          • " + "
          " + + "<% end %>"+ "<% end%>"); } -
          +
          - + />
            <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %> -
          • - - - - -
            • -
            + <% if poll_answer.answer_text != '' %> +
          • + + + +
            • +
            + <% else %> +
          • + + + +
            • +
            + <% end %> <% end%>
          +
          - - <%= l(:label_button_ok)%> - - - <%= l(:button_cancel)%> - + <%= l(:button_cancel)%> + <%= l(:label_button_ok)%>
          diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb index 390be25f2..921dfcb70 100644 --- a/app/views/poll/_edit_mulit.html.erb +++ b/app/views/poll/_edit_mulit.html.erb @@ -2,30 +2,53 @@ -
          +
          - - /> - + +
          -
          - - - +
          +
            + <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %> +
          • + + + +
            • +
            + <% end%> +
          +
            +
          • +
            新建选项
            +
            • +
            +
          - - <%= l(:label_button_ok)%> - - + <%= l(:button_cancel)%> + + <%= l(:label_button_ok)%> +
          diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb index 2feeee949..e004e6e0c 100644 --- a/app/views/poll/_edit_single.html.erb +++ b/app/views/poll/_edit_single.html.erb @@ -6,22 +6,19 @@ $("#is_necessary_<%=poll_question.id%>").replaceWith("/>"); } -
          +
          - - /> - + +
          - - <%= l(:label_button_ok)%> - - - <%= l(:button_cancel)%> - + <%= l(:button_cancel)%> + <%= l(:label_button_ok)%>
          diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb index 0a9114158..b029def78 100644 --- a/app/views/poll/_new_MC.html.erb +++ b/app/views/poll/_new_MC.html.erb @@ -10,7 +10,7 @@
          -
            +
            • @@ -45,12 +45,12 @@
          - - <%= l(:label_button_ok)%> - - + <%= l(:button_cancel)%> + + <%= l(:label_button_ok)%> +
          diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb index 0fbb588c5..0c9e7b96f 100644 --- a/app/views/poll/_new_MCQ.html.erb +++ b/app/views/poll/_new_MCQ.html.erb @@ -1,44 +1,51 @@ <%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%> -
          +
          - +
            -
          • +
          • -
            • -
          • +
          • -
            • -
          • +
          • -
          +
          - - <%= l(:label_button_ok)%> - - + <%= l(:button_cancel)%> + + <%= l(:label_button_ok)%> +
          diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb index d25d34542..226b6855a 100644 --- a/app/views/poll/_new_mulit.html.erb +++ b/app/views/poll/_new_mulit.html.erb @@ -1,24 +1,44 @@ <%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%> -
          +
          - - - + +
          -
          +
          +
            +
          • + + +
            • +
            +
          • + + +
            • +
            +
          +
            +
          • +
            新建选项
            +
            • +
            +
          - - <%= l(:label_button_ok)%> - - + <%= l(:button_cancel)%> + + <%= l(:label_button_ok)%> +
          diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb index fe8e7b604..034e6cbe6 100644 --- a/app/views/poll/_new_single.html.erb +++ b/app/views/poll/_new_single.html.erb @@ -1,19 +1,21 @@ <%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%> -
          +
          - - - + +
          - - <%= l(:label_button_ok)%> - - + <%= l(:button_cancel)%> + + <%= l(:label_button_ok)%> +
          diff --git a/app/views/poll/_poll_content.html.erb b/app/views/poll/_poll_content.html.erb index c328c2cb5..2ecf38e8e 100644 --- a/app/views/poll/_poll_content.html.erb +++ b/app/views/poll/_poll_content.html.erb @@ -41,7 +41,7 @@
          <% end %>
          -
          "> +
          ">

          多行主观题

          <% multi_question_list.each do |poll_question| %>
          diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index bcf9dea3d..23c3ecb35 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -58,48 +58,55 @@ function add_MC(){ function insert_MC(quest_type,quest_num,quest_id){ $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html( '<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>'+ - '
          '+ + '
          '+ '
          '+ ''+ ''+ ''+ ''+ - ''+ + ''+ ''+ ''+ '
          '+ '
          '+ '
            '+ - '
          • '+ + '
          • '+ ''+ - ''+ - ''+ + ''+ ''+ '
            • '+ '
            '+ - '
          • '+ + '
          • '+ ''+ - ''+ - ''+ + ''+ ''+ '
            • '+ '
            '+ - '
          • '+ + '
          • '+ ''+ - ''+ - ''+ + ''+ ''+ '
            • '+ '
            '+ '
          '+ + ''+ '
          '+ '
          '+ - ''+ - '<%= l(:label_button_ok)%>'+ - ''+ - ''+ + ''+ '<%= l(:button_cancel)%>'+ ''+ + ''+ + '<%= l(:label_button_ok)%>'+ + ''+ '
          '+ '
          '+ '
          '+ @@ -119,13 +126,13 @@ function add_MCQ(){ function insert_MCQ(quest_type,quest_num,quest_id){ $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html( '<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>'+ - '
          '+ + '
          '+ '
          '+ ''+ ''+ ''+ ''+ - ''+ + ''+ ''+ ''+ '
          '+ @@ -133,34 +140,41 @@ function insert_MCQ(quest_type,quest_num,quest_id){ '
            '+ '
          • '+ ''+ - ''+ - ''+ + ''+ ''+ '
            • '+ '
            '+ '
          • '+ ''+ - ''+ - ''+ + ''+ ''+ '
            • '+ '
            '+ '
          • '+ ''+ - ''+ - ''+ + ''+ ''+ '
            • '+ '
            '+ '
          '+ + ''+ '
          '+ '
          '+ - ''+ - '<%= l(:label_button_ok)%>'+ - ''+ - ''+ + ''+ '<%= l(:button_cancel)%>'+ ''+ + ''+ + '<%= l(:label_button_ok)%>'+ + ''+ '
          '+ '
          '+ '
          '+ @@ -180,23 +194,23 @@ function insert_MCQ(quest_type,quest_num,quest_id){ function insert_SINGLE(quest_type,quest_num,quest_id){ $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html( '<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>'+ - '
          '+ + '
          '+ '
          '+ ''+ ''+ ''+ ''+ - ''+ + ''+ ''+ ''+ '
          '+ '
          '+ - ''+ - '<%= l(:label_button_ok)%>'+ - ''+ - ''+ + ''+ '<%= l(:button_cancel)%>'+ ''+ + ''+ + '<%= l(:label_button_ok)%>'+ + ''+ '
          '+ '
          '+ '
          '+ @@ -215,25 +229,44 @@ function insert_MCQ(quest_type,quest_num,quest_id){ function insert_MULIT(quest_type,quest_num,quest_id){ $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html( '<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>'+ - '
          '+ + '
          '+ '
          '+ ''+ ''+ ''+ ''+ - ''+ - ''+ - ''+ + ''+ + ''+ '
          '+ - '
          '+ + '
          '+ + '
            '+ + '
          • '+ + ''+ + ''+ + ''+ + '
            • '+ + '
            '+ + '
          • '+ + ''+ + ''+ + '
            • '+ + '
            '+ + '
          '+ + '
            '+ + '
          • '+ + '
            新建选项
            '+ + '
            • '+ + '
            '+ + '
          '+ '
          '+ '
          '+ - ''+ - '<%= l(:label_button_ok)%>'+ - ''+ - ''+ - '<%= l(:button_cancel)%>'+ - ''+ + ''+ + '<%= l(:button_cancel)%>'+ + ''+ + ''+ + '<%= l(:label_button_ok)%>'+ + ''+ '
          '+ '
          '+ '
          '+ @@ -320,6 +353,13 @@ function insert_MCQ(quest_type,quest_num,quest_id){ $("#edit_poll_questions_"+question_id).show(); $("#poll_questions_title_"+question_id).focus(); } + //多行主观增加分题 + function add_multi_question(doc) + { + doc.parent().parent().prev().append("
        • " + + ""+ + "
          • "); + } //单选题 function add_single_answer(doc) { @@ -340,7 +380,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){ { if(doc.parent().siblings("li.new_answer").length == 0) { - alert("选择题至少有一个选项"); + alert("至少有一个选项"); } else { @@ -426,14 +466,23 @@ function insert_MCQ(quest_type,quest_num,quest_id){
          -
          - - <%= l(:label_memo_create)%> - -
          - - -
          + + + + + + + + + +
          + + +
          +
          diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb index 7209a4d52..555a81dfa 100644 --- a/app/views/poll/_show_MC.html.erb +++ b/app/views/poll/_show_MC.html.erb @@ -13,7 +13,7 @@ <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id), method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> - +
          - + <% if poll_answer.answer_text != '' %> + + <% else %> + + + <% end %>
          @@ -28,7 +28,7 @@ <% else %> <% end %> @@ -42,11 +42,3 @@
          - \ No newline at end of file diff --git a/app/views/poll/_show_MCQ.html.erb b/app/views/poll/_show_MCQ.html.erb index f13cf17d3..69aefb5f0 100644 --- a/app/views/poll/_show_MCQ.html.erb +++ b/app/views/poll/_show_MCQ.html.erb @@ -1,10 +1,7 @@ -
          -
          - - 第<%= poll_question.question_number%>题： - +
          +
          + 第<%= poll_question.question_number%>题： <%= poll_question.question_title %> - [多选题] <%if poll_question.is_necessary == 1%> * <%end%> @@ -12,18 +9,25 @@ <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id), method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> - +
          -
          -
          +
          +
          <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %> <% end %> @@ -33,12 +37,4 @@
          -
          - \ No newline at end of file diff --git a/app/views/poll/_show_mulit.html.erb b/app/views/poll/_show_mulit.html.erb index 6c98b8257..61bb76f41 100644 --- a/app/views/poll/_show_mulit.html.erb +++ b/app/views/poll/_show_mulit.html.erb @@ -1,33 +1,23 @@ -
          -
          -
          - - 第<%= poll_question.question_number%>题： - - <%= poll_question.question_title %> - [多行主观] - <%if poll_question.is_necessary == 1%> - * - <%end%> -
          - <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id), - method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> - - -
          -
          - -
          +
          +
          + 第<%= poll_question.question_number%>题： + <%= poll_question.question_title %> + <%if poll_question.is_necessary == 1%> + * + <%end%>
          + <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id), + method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> + + +
          + <% poll_question.poll_answers.reorder("answer_position").each_with_index do |poll_answer, i| %> +
          +

          <%= i + 1 %>.<%= poll_answer.answer_text%>

          + +
          + <% end %>
          -
          - \ No newline at end of file diff --git a/app/views/poll/_show_single.html.erb b/app/views/poll/_show_single.html.erb index 68b93d244..41b269d30 100644 --- a/app/views/poll/_show_single.html.erb +++ b/app/views/poll/_show_single.html.erb @@ -1,10 +1,7 @@ -
          -
          - - 第<%= poll_question.question_number%>题： - +
          +
          + 第<%= poll_question.question_number%>题： <%= poll_question.question_title %> - [单行主观] <%if poll_question.is_necessary == 1%> * <%end%> @@ -12,20 +9,12 @@ <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id), method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> - +
          - +
          -
          - \ No newline at end of file diff --git a/app/views/poll/create_poll_question.js.erb b/app/views/poll/create_poll_question.js.erb index cbb9da3da..58e1f6bff 100644 --- a/app/views/poll/create_poll_question.js.erb +++ b/app/views/poll/create_poll_question.js.erb @@ -1,30 +1,42 @@ <% if @is_insert %> - $("#poll_content").html('<%= escape_javascript(render :partial => 'poll_content', :locals => {:poll => @poll})%>'); + $("#poll_content").html('<%= escape_javascript(render :partial => 'poll_content', :locals => {:poll => @poll})%>'); <% else %> -$("#new_poll_question_new").html(""); - -$("#poll_content").append("
          " + - "
          " + - "<% if @poll_questions.question_type == 1%>" + + $("#new_poll_question_new").html(""); + <%if @poll_questions.question_type == 1%> + $("#mc_question_list").show().append("
          " + + "
          " + "<%= escape_javascript(render :partial => 'show_MC', :locals => {:poll_question => @poll_questions}) %>" + - "<% elsif @poll_questions.question_type == 2%>" + - "<%= escape_javascript(render :partial => 'show_MCQ', :locals => {:poll_question => @poll_questions}) %>" + - "<% elsif @poll_questions.question_type == 3%>" + - "<%= escape_javascript(render :partial => 'show_single', :locals => {:poll_question => @poll_questions}) %>" + - "<% elsif @poll_questions.question_type == 4%>" + - "<%= escape_javascript(render :partial => 'show_mulit', :locals => {:poll_question => @poll_questions}) %>" + - "<% end%>" + - "
          " + - "" + + "" + + "
          "); + <%elsif @poll_questions.question_type == 2%> + $("#mcq_question_list").show().append("
          " + + "
          " + + "<%= escape_javascript(render :partial => 'show_MCQ', :locals => {:poll_question => @poll_questions}) %>" + + "
          " + + "" + + "
          "); + <%elsif @poll_questions.question_type == 3%> + $("#single_question_list").show().append("
          " + + "
          " + + "<%= escape_javascript(render :partial => 'show_single', :locals => {:poll_question => @poll_questions}) %>" + + "
          " + + "" + + "
          "); + <%elsif @poll_questions.question_type == 4%> + $("#multi_question_list").show().append("
          " + + "
          " + + "<%= escape_javascript(render :partial => 'show_mulit', :locals => {:poll_question => @poll_questions}) %>" + + "
          " + + "" + - "
          "); + "
          " + + "
          "); + <% end %> <% end %> diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 79960bfba..fab4556d3 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -260,7 +260,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/ .w460{ width:460px;} .w465{width:465px !important;} .w490{width:490px;} -.w520{ width:520px;} +.w520{ width:520px !important;} .w543{ width:543px;} .w557{ width:557px;} .w570 {width:570px !important;} @@ -469,7 +469,7 @@ a:hover.grey_n_btn{ background:#717171; color:#fff;} a.green_btn{background:#28be6c;color:#fff; font-weight:normal; padding:2px 10px; text-align:center;} a:hover.green_btn{ background:#14ad5a;} .blue_btn{ background:#64bdd9; color:#fff; font-weight:normal;padding:2px 10px; text-align:center;} -a.blue_btn{background:#64bdd9;color:#fff; font-weight:normal; padding:2px 10px; text-align:center;} +a.blue_btn{background:#3b94d6;color:#fff; font-weight:normal; padding:2px 10px; text-align:center;} a:hover.blue_btn{ background:#329cbd;} .red_btn{ background:red; color:#fff; font-size:14px; font-weight:normal;padding:2px 8px; text-align:center;} a.red_btn{background:red; color:#fff;font-size:14px; font-weight:normal; padding:2px 8px; text-align:center;cursor: pointer;} From af4ace13196f7bd6ee92fbe02275409964b17cd5 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 12 Oct 2016 16:00:10 +0800 Subject: [PATCH 31/48] =?UTF-8?q?=E5=B0=86=E5=8C=BF=E8=AF=84=E5=92=8C?= =?UTF-8?q?=E5=88=86=E6=95=B0=E6=8F=90=E7=A4=BA=E5=BC=B9=E6=A1=86=E5=9C=A8?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=9B=BA=E5=AE=9A=E4=BD=8D=E7=BD=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_evaluation_un_group_member_work.html.erb | 14 ++++++++------ .../_evaluation_un_group_work.html.erb | 4 +++- .../student_work/_evaluation_un_work.html.erb | 8 ++++++-- public/stylesheets/css/courses.css | 10 +++++++++- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/app/views/student_work/_evaluation_un_group_member_work.html.erb b/app/views/student_work/_evaluation_un_group_member_work.html.erb index efd3440f7..c8cd738da 100644 --- a/app/views/student_work/_evaluation_un_group_member_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_member_work.html.erb @@ -1,7 +1,7 @@ <% is_expand = st.student_work_projects.empty? %>
          • -
            > +
            > <%= link_to(image_tag(url_to_avatar(st.user),:width =>"40",:height => "40", :style => "display:block;"),user_activities_path(st.user), :class => "fl") %> <% if !is_expand %> @@ -20,10 +20,10 @@ <% end %>
            -
            <%= st.teacher_score.nil? ? "--" : format("%.1f",st.teacher_score)%>
            -
            <%= st.teaching_asistant_score.nil? ? "--" : format("%.1f",st.teaching_asistant_score)%>
            +
            <%= st.teacher_score.nil? ? "--" : format("%.1f",st.teacher_score)%>
            +
            <%= st.teaching_asistant_score.nil? ? "--" : format("%.1f",st.teaching_asistant_score)%>
            <% if @homework.anonymous_comment == 0 %> -
            +
            <% if st.student_score.nil? %> 未参与 @@ -49,7 +49,9 @@
            <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%> <% unless score.nil?%> -
            +
            + + 作品最终评分为  <%= st.final_score%> 分
            迟交扣分 @@ -71,7 +73,7 @@
            评分
            <% end %>
            - +
          diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb index fb0efd9c8..de8360aaf 100644 --- a/app/views/student_work/_evaluation_un_group_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_work.html.erb @@ -50,7 +50,9 @@
          <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%> <% unless score.nil?%> -
          +
          + + 作品最终评分为  <%= student_work.final_score%> 分。
          迟交扣分 diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index 2a2b7faee..86b9c5845 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -77,7 +77,9 @@ (<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>) -
          +
          + + 现共有  <%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>  名学生进行了匿评，平均分为 @@ -95,7 +97,9 @@
          <% poll_question.poll_answers.each do |poll_answer| %> - +
          - + <% if poll_answer.answer_text != '' %> + + <% else %> + + + <% end %>
          <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%> <% unless score.nil?%> -
          +
          + + 作品最终评分为  <%= student_work.final_score%> 分
          迟交扣分 diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index cd6c8b9e8..01a1f103c 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -187,7 +187,7 @@ div.content{padding-top:10px;} .hworkListRow:hover {background-color:#f6f6f7;} .hworkUl li{ float:left;} .hworkListRow li{ float:left;} -.hworkTip{position:absolute; padding:3px 5px; border:1px solid #eaeaea; display:block; right:-108px; top:-15px; background-color:#ffffff; line-height:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} +.hworkTip{position:absolute; padding:3px 5px; border:1px solid #eaeaea; display:block; right:-118px; top:-15px; background-color:#ffffff; line-height:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} .hworkTip em {display:block; border-width:8px; position:absolute; bottom:4px; left:-16px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;} .hworkTip span {display:block; border-width:8px; position:absolute; bottom:4px; left:-15px; border-style:dashed solid dashed dashed; border-color:transparent #FFF transparent transparent; font-size:0; line-height:0;} .hworkList340 {width:335px; text-align:left; height:50px; line-height:50px;padding-left:5px;} @@ -246,6 +246,14 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re .HomeworkStuTitle{width: 80px;text-align: center;} .StudentName{display: table-cell;width: 115px;vertical-align: middle;text-align: left;height: 40px;} +.score-tip {width:140px; color:#666; position:absolute; padding:3px 5px; border:1px solid #eaeaea; right:-183px; top:-8px; background-color:#ffffff; line-height:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); white-space:nowrap;} +.score-tip em {display:block; border-width:8px; position:absolute; bottom:32px; left:-16px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;} +.score-tip font {display:block; border-width:8px; position:absolute; bottom:31px; left:-15px; border-style:dashed solid dashed dashed; border-color:transparent #FFF transparent transparent; font-size:0; line-height:0;} + +.anonymous-tip {width:100px;color:#666; position:absolute; padding:3px 5px; border:1px solid #eaeaea; right:-143px; top:-1px; background-color:#ffffff; line-height:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); white-space:nowrap;} +.anonymous-tip em {display:block; border-width:8px; position:absolute; bottom:25px; left:-16px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;} +.anonymous-tip font {display:block; border-width:8px; position:absolute; bottom:26px; left:-15px; border-style:dashed solid dashed dashed; border-color:transparent #FFF transparent transparent; font-size:0; line-height:0;} + /*作业信息*/ .homeworkInfo {background:#F6F6F6; padding:10px;} .homeworkDetail {line-height:18px; font-size:12px; color:#484848; overflow:hidden;} From 63a496d0d3234d134d1c26412beea60b0726d3ef Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 12 Oct 2016 17:04:16 +0800 Subject: [PATCH 32/48] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=85=A8=E6=96=87=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/show.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 7143e980b..963567ba4 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -92,7 +92,11 @@
          <%= format_time( @article.created_on)%>
          - <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>@article.id, :content=>@article.content} %> +
          +
          + <%= @article.content.to_s.html_safe %> +
          +
          <%#= link_to_attachments_course @topic, :author => false %> From e52026142ad72bc87efe009875938554659e63cd Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Wed, 12 Oct 2016 17:10:38 +0800 Subject: [PATCH 33/48] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E4=B8=8B=E4=B8=80=E9=A1=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 171 ++++++++++++++++---------- 1 file changed, 104 insertions(+), 67 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 51ede7d9f..3ac7eaf45 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -153,73 +153,7 @@ class WelcomeController < ApplicationController def search @name = params[:q] @search_type = params[:search_type] - case params[:search_type] - when 'all' - @alls = Elasticsearch::Model.search({ - query: { - multi_match: { - query: @name, - type:"most_fields", - operator: "or", - fields: ['login', 'firstname','lastname','title','name','description^0.5','filename','subject','content^0.5'] - } - }, - highlight: { - pre_tags: [''], - post_tags: [''], - fields: { - login: {}, - firstname: {}, - lastname: {}, - title:{}, - name:{}, - description:{}, - filename:{}, - subject:{}, - content:{} - } - } - },[User,Syllabus,Course,Attachment,Project,Memo] ).page(params[:page] || 1).per(20).results - when 'user' - @users = User.search(@name).page(params[:page] || 1).per(20) - when 'syllabus' - @syllabuses = Syllabus.search(@name).page(params[:page] || 1).per(20).results - when 'project' - @projects = Project.search(@name).page(params[:page] || 1).per(20).results - when 'course' - @courses = Course.search(@name).page(params[:page] || 1).per(20).results - when 'attachment' - @attachments = Attachment.search(@name).page(params[:page] || 1).per(20).results - when 'memo' - @memos = Memo.search(@name).page(params[:page] || 1).per(20).results - else - @alls = Elasticsearch::Model.search({ - query: { - multi_match: { - query: @name, - type:"most_fields", - operator: "or", - fields: ['login', 'firstname','lastname','title','name','description^0.5','filename','subject','content^0.5'] - } - }, - highlight: { - pre_tags: [''], - post_tags: [''], - fields: { - login: {}, - firstname: {}, - lastname: {}, - title:{}, - name:{}, - description:{}, - filename:{}, - subject:{}, - content:{} - } - } - },[User,Syllabus,Course,Attachment,Project,Memo] ).page(params[:page] || 1).per(20).results - - end + page = (params[:page] || 1).to_i @users_count = User.search(@name).results.total @syllabus_count = Syllabus.search(@name).results.total @@ -252,6 +186,109 @@ class WelcomeController < ApplicationController } } },[User,Syllabus,Course,Attachment,Project,Memo] ).results.total + + + case params[:search_type] + when 'all' + if (page-1)*20 > @total_count + page = 1 + params[:page] = "1" + end + @alls = Elasticsearch::Model.search({ + query: { + multi_match: { + query: @name, + type:"most_fields", + operator: "or", + fields: ['login', 'firstname','lastname','title','name','description^0.5','filename','subject','content^0.5'] + } + }, + highlight: { + pre_tags: [''], + post_tags: [''], + fields: { + login: {}, + firstname: {}, + lastname: {}, + title:{}, + name:{}, + description:{}, + filename:{}, + subject:{}, + content:{} + } + } + },[User,Syllabus,Course,Attachment,Project,Memo] ).page(page).per(20).results + when 'user' + if (page-1)*20 > @users_count + page = 1 + params[:page] = "1" + end + @users = User.search(@name).page(page).per(20) + when 'syllabus' + if (page-1)*20 > @syllabus_count + page = 1 + params[:page] = "1" + end + @syllabuses = Syllabus.search(@name).page(page).per(20).results + when 'project' + if (page-1)*20 > @project_count + page = 1 + end + @projects = Project.search(@name).page(page).per(20).results + when 'course' + if (page-1)*20 > @course_count + page = 1 + params[:page] = "1" + end + @courses = Course.search(@name).page(page).per(20).results + when 'attachment' + if (page-1)*20 > @attach_count + page = 1 + params[:page] = "1" + end + @attachments = Attachment.search(@name).page(page).per(20).results + when 'memo' + if (page-1)*20 > @memo_count + page = 1 + params[:page] = "1" + end + @memos = Memo.search(@name).page(page).per(20).results + else + if (page-1)*20 > @total_count + page = 1 + params[:page] = "1" + end + @alls = Elasticsearch::Model.search({ + query: { + multi_match: { + query: @name, + type:"most_fields", + operator: "or", + fields: ['login', 'firstname','lastname','title','name','description^0.5','filename','subject','content^0.5'] + } + }, + highlight: { + pre_tags: [''], + post_tags: [''], + fields: { + login: {}, + firstname: {}, + lastname: {}, + title:{}, + name:{}, + description:{}, + filename:{}, + subject:{}, + content:{} + } + } + },[User,Syllabus,Course,Attachment,Project,Memo] ).page(page).per(20).results + + end + + + # search_type = params[:search_type].to_sym unless search_condition.blank? # search_by = params[:search_by] # From 8459779e6fdda39b1b40edbf82f877085941dcd4 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 12 Oct 2016 17:26:53 +0800 Subject: [PATCH 34/48] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=E6=8A=98=E8=A1=8C=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index c192bd724..3ed28f418 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -125,7 +125,7 @@ <% end%>
          -
          <%= poll_answer.answer_text %> <%= poll_answer.answer_text == "" ? "其他" :poll_answer.answer_text %> <%= poll_answer.poll_votes.count %>
          diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb index 6182aedf5..76ada616c 100644 --- a/app/views/poll/_edit_head.html.erb +++ b/app/views/poll/_edit_head.html.erb @@ -1,7 +1,7 @@ <%= form_for @poll,:remote => true do |f|%>
          - +