From 546ffde4983333f1c4a1f8086cfef3f90bfcd329 Mon Sep 17 00:00:00 2001 From: whimlex Date: Mon, 20 Jul 2015 09:09:04 +0800 Subject: [PATCH 01/34] commit --- db/schema.rb | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 78dfb5eee..70a3fb2c1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,12 +11,14 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150702073308) do +ActiveRecord::Schema.define(:version => 20150715162300) do create_table "activities", :force => true do |t| - t.integer "act_id", :null => false - t.string "act_type", :null => false - t.integer "user_id", :null => false + t.integer "act_id", :null => false + t.string "act_type", :null => false + t.integer "user_id", :null => false + t.integer "activity_container_id" + t.string "activity_container_type", :default => "" end add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type" @@ -721,16 +723,6 @@ ActiveRecord::Schema.define(:version => 20150702073308) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_details_copy", :force => true do |t| - t.integer "journal_id", :default => 0, :null => false - t.string "property", :limit => 30, :default => "", :null => false - t.string "prop_key", :limit => 30, :default => "", :null => false - t.text "old_value" - t.text "value" - end - - add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" @@ -1340,7 +1332,7 @@ ActiveRecord::Schema.define(:version => 20150702073308) do end create_table "user_extensions", :force => true do |t| - t.integer "user_id", :null => false + t.integer "user_id", :null => false t.date "birthday" t.string "brief_introduction" t.integer "gender" @@ -1348,8 +1340,8 @@ ActiveRecord::Schema.define(:version => 20150702073308) do t.string "occupation" t.integer "work_experience" t.integer "zip_code" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "technical_title" t.integer "identity" t.string "student_id" @@ -1357,6 +1349,7 @@ ActiveRecord::Schema.define(:version => 20150702073308) do t.string "student_realname" t.string "location_city" t.integer "school_id" + t.string "description", :default => "" end create_table "user_grades", :force => true do |t| @@ -1462,6 +1455,17 @@ ActiveRecord::Schema.define(:version => 20150702073308) do add_index "versions", ["project_id"], :name => "versions_project_id" add_index "versions", ["sharing"], :name => "index_versions_on_sharing" + create_table "visitors", :force => true do |t| + t.integer "user_id" + t.integer "master_id" + t.datetime "updated_on" + t.datetime "created_on" + end + + add_index "visitors", ["master_id"], :name => "index_visitors_master_id" + add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on" + add_index "visitors", ["user_id"], :name => "index_visitors_user_id" + create_table "watchers", :force => true do |t| t.string "watchable_type", :default => "", :null => false t.integer "watchable_id", :default => 0, :null => false From d20368aa38d06c2841ee67192c4cc20309b9ea78 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 9 Oct 2015 14:33:26 +0800 Subject: [PATCH 02/34] =?UTF-8?q?=E5=B0=86=E6=B6=88=E6=81=AF=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=94=B1=E4=B8=80=E8=A1=8C=E5=88=86=E8=87=B3=E4=B8=A4?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 56 +++++++++++++++----------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 84d5ec1bf..813c13509 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -2,30 +2,38 @@
<%= title_for_message(params[:type]) %>
    • <%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey" %>
      • -
    • <%= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey" %>
    • <%= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey" %>
      • - - +
    • <%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey" %>
    • <%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %>
      • +
    • <%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey" %>
      • <%# 系统贴吧 %>
    • <%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey" %>
      • - <%# 系统消息 %> -
    • @@ -40,7 +34,7 @@
    - <% if @message_alls.count >0 || @user_system_messages.count >0 %> + <% if (!@message_alls.nil? && @message_alls.count >0) || (!@user_system_messages.nil? && @user_system_messages.count >0) %> <% if params[:type].nil? || params[:type] == "unviewed" %>
    有 <%= unviewed_message(@user) %> 条未读 From 6ad1ee36e2f0b878c9eddc5739589e7aeb72179c Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 9 Oct 2015 15:56:14 +0800 Subject: [PATCH 05/34] =?UTF-8?q?=E5=B0=86=E2=80=9C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E2=80=9D=E7=AE=80=E5=8C=96=E4=B8=BA?= =?UTF-8?q?=E2=80=9C=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E4=B8=8E=E5=85=B6=E4=BB=96=E5=88=97=E8=A1=A8=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 25900e737..958d5cf53 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -19,7 +19,7 @@
    • <%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey" %>
      • -
    • <%= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey" %>
      • +
    • <%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey" %>
    • <%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey" %>
    • <%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %>
      • From 2518305959e7cb74cf3be288ef1bc192b7459df3 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 9 Oct 2015 16:12:02 +0800 Subject: [PATCH 06/34] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BF=AE=E6=94=B9=EF=BC=9B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 12 ++++-------- app/views/admin/projects.html.erb | 10 +++++++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index a8a302045..90974b376 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -659,14 +659,10 @@ class ProjectsController < ApplicationController # Delete @project def destroy @project_to_destroy = @project - if api_request? || params[:confirm] - @project_to_destroy.destroy - respond_to do |format| - format.html { redirect_to admin_projects_url } - format.api { render_api_ok } - end - else - render :layout => "base_projects" + @project_to_destroy.destroy + respond_to do |format| + format.html { redirect_to admin_projects_url } + format.api { render_api_ok } end # hide project in layout @project = nil diff --git a/app/views/admin/projects.html.erb b/app/views/admin/projects.html.erb index f5b7955bf..3f6ee36f0 100644 --- a/app/views/admin/projects.html.erb +++ b/app/views/admin/projects.html.erb @@ -65,7 +65,7 @@ <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock') unless project.archived? %> <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if project.archived? && (project.parent.nil? || !project.parent.archived?) %> <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %> - <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del') %> + <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del', :onClick=>"delcfm()" ) %> <% end %> @@ -74,3 +74,11 @@
    • <% html_title(l(:label_project_plural)) -%> + + \ No newline at end of file From 171d30e11261cf697b6768b20caa1e59d2e46076 Mon Sep 17 00:00:00 2001 From: whimlex Date: Sat, 10 Oct 2015 09:02:09 +0800 Subject: [PATCH 07/34] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_project_issue.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index 2c429a93f..02d1940a6 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -10,7 +10,7 @@ <% else %> <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> <% end %> TO - <%= link_to activity.project.name.to_s+" | 项目缺陷", project_issues_path(activity.project), :class => "newsBlue ml15"%> + <%= link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
    <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %> From 467a6c4fbaf5def1d1b13d70446d76f04c02f1fc Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 10 Oct 2015 09:54:13 +0800 Subject: [PATCH 08/34] =?UTF-8?q?=E9=A1=B9=E7=9B=AEtag=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_course_list.html.erb | 3 ++- app/views/files/_project_file_list.html.erb | 3 ++- app/views/tags/_tag_list.html.erb | 4 ++-- app/views/tags/_tag_new.html.erb | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index e31eea960..bad93f4ae 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -55,7 +55,8 @@
    - <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %> + + <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name,:container_type=>'1'} %> <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
    diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb index 9f9e86cff..6e2623c4b 100644 --- a/app/views/files/_project_file_list.html.erb +++ b/app/views/files/_project_file_list.html.erb @@ -44,7 +44,8 @@
    - <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %> + + <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:container_type=>'2'} %> <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
    diff --git a/app/views/tags/_tag_list.html.erb b/app/views/tags/_tag_list.html.erb index bc4a5b54e..3b46480c2 100644 --- a/app/views/tags/_tag_list.html.erb +++ b/app/views/tags/_tag_list.html.erb @@ -2,8 +2,8 @@ <% if @tags.size > 0 %> <% @tags.each do |tag| %> - <%#= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %> - <%= tag %> + <%#= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %> + <%= tag %> <% case object_flag %> <% when '10' %> diff --git a/app/views/tags/_tag_new.html.erb b/app/views/tags/_tag_new.html.erb index bbedaff78..e416776e6 100644 --- a/app/views/tags/_tag_new.html.erb +++ b/app/views/tags/_tag_new.html.erb @@ -22,7 +22,7 @@ <% elsif object_flag == '6' %>
    <% tag_name ||= ""%> - <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag,:select_tag_name => tag_name} %> + <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag,:select_tag_name => tag_name,:container_type=>container_type} %>
    diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index e044f9d51..27bb66bbb 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -545,6 +545,8 @@ blockquote { .member_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;} .member_search_btn:hover{ background:#0da1b2; border:1px solid #0da1b2;} a.member_btn{ padding:5px; background:#15bccf; color:#fff;} +a.project_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;} +a.project_member_btn_right{ padding:2px 5px; background:#15bccf; color:#fff;} a:hover.member_btn{ background:#329cbd;} .pro_table{ text-align:center; color:#333; margin-bottom:20px;} .pro_table tr td{ height:30px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index dc2fecbba..90651f362 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -114,6 +114,7 @@ h4{ font-size:14px; color:#3b3b3b;} .mb10{ margin-bottom:10px !important;} .mb20{ margin-bottom:20px;} .pl15{ padding-left:15px;} +.pt5{ padding-top:5px;} .w20{ width:20px;} .w40{width: 40px;} .w45{ width: 45px;} From 1de6e24bfbc4956d680316ae5675ab550456fa83 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 10 Oct 2015 10:04:32 +0800 Subject: [PATCH 10/34] =?UTF-8?q?tag=E6=95=B0=E7=9B=AE=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=96=B9=E5=BC=8F=E7=9A=84=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_tag_yun.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/files/_tag_yun.html.erb b/app/views/files/_tag_yun.html.erb index f60a5fb9e..bdf581baa 100644 --- a/app/views/files/_tag_yun.html.erb +++ b/app/views/files/_tag_yun.html.erb @@ -6,12 +6,12 @@ <% tag_list.each do |k,v|%> <% if tag_name && tag_name == k%> - <%= k%>×<%= v%> + <%= k%>(<%= v%>) <% else%> <%= k%>×<%= v%> + ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>(<%= v%>)     <% end%> <% end%> <% end%> \ No newline at end of file From 11abbca1cf1dc3eb51b94b167ac285ef66f5d62f Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 10 Oct 2015 10:16:50 +0800 Subject: [PATCH 11/34] =?UTF-8?q?tag=5Flist=E4=BB=A3=E7=A0=81=E7=9A=84?= =?UTF-8?q?=E5=85=AC=E7=94=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_course_list.html.erb | 2 +- app/views/files/_project_file_list.html.erb | 2 +- app/views/tags/_tag_list.html.erb | 4 ++-- app/views/tags/_tag_new.html.erb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index bad93f4ae..9e88cb2fd 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -56,7 +56,7 @@
    - <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name,:container_type=>'1'} %> + <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %> <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
    diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb index 6e2623c4b..6dc5b6753 100644 --- a/app/views/files/_project_file_list.html.erb +++ b/app/views/files/_project_file_list.html.erb @@ -45,7 +45,7 @@
    - <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:container_type=>'2'} %> + <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %> <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
    diff --git a/app/views/tags/_tag_list.html.erb b/app/views/tags/_tag_list.html.erb index 3b46480c2..14b6a0597 100644 --- a/app/views/tags/_tag_list.html.erb +++ b/app/views/tags/_tag_list.html.erb @@ -2,8 +2,8 @@ <% if @tags.size > 0 %> <% @tags.each do |tag| %> - <%#= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %> - <%= tag %> + <%#= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %> + <%= tag %> <% case object_flag %> <% when '10' %> diff --git a/app/views/tags/_tag_new.html.erb b/app/views/tags/_tag_new.html.erb index e416776e6..bbedaff78 100644 --- a/app/views/tags/_tag_new.html.erb +++ b/app/views/tags/_tag_new.html.erb @@ -22,7 +22,7 @@ <% elsif object_flag == '6' %>
    <% tag_name ||= ""%> - <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag,:select_tag_name => tag_name,:container_type=>container_type} %> + <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag,:select_tag_name => tag_name} %>
    - <% if (!@message_alls.nil? && @message_alls.count >0) || (!@user_system_messages.nil? && @user_system_messages.count >0) %> + <% if (!@message_alls.nil? && @message_alls.count >0) %> <% if params[:type].nil? || params[:type] == "unviewed" %>
    有 <%= unviewed_message(@user) %> 条未读 From c365f32a17f597db753f39be539bd7df5ffc7ce7 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 10 Oct 2015 14:00:12 +0800 Subject: [PATCH 18/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=9C=89=E4=BA=9B=E9=82=AE=E4=BB=B6=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mailer/send_for_user_activities.html.erb | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 3f761fbd4..23cbe6176 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -224,13 +224,15 @@ <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_project_issue_update) %> - <% if issues_journal.notes.blank? || issues_journal.notes.nil? %> - <%= link_to truncate(issues_journal.issue.subject.html_safe, length: 30,omission: '...'),issue_url(issues_journal.issue, :token => @token.value), - :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - <% else %> - <%= link_to truncate(issues_journal.notes.html_safe, length: 30,omission: '...'),issue_url(issues_journal.issue, :token => @token.value), - :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - <% end %> + <%= link_to truncate(issues_journal.issue.subject, length:30,omission:'...'),issue_url(issues_journal.issue, :token => @token.value), + :style => "color:#2E8DD7;float:left;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;", + :onmouseover =>"message_titile_show($(this),event)", + :onmouseout => "message_titile_hide($(this))" + %> +
    +
    更新内容：
    +
    <%= issues_journal.notes.html_safe %>
    +
    <%= format_time(issues_journal.created_on) %> <% end %> @@ -290,9 +292,9 @@ :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_wiki_mail_notification) %> <% unless wikicontent.page.nil? %> - <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki,:token => @token.value), + <%= link_to wikicontent.text.gsub("

    ","").gsub("

    ","").gsub("
    ","").html_safe, project_wiki_url(wikicontent.page.wiki,:token => @token.value), :class => 'wmail_info', - :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> + :style => "color:#2E8DD7;float:left; max-width:400px;height:23px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <% end %> <%= format_time(wikicontent.updated_on) %> @@ -520,3 +522,15 @@
    + + From a9456ca82f4083304a63540b462a6ccdb34cc419 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 10 Oct 2015 14:14:36 +0800 Subject: [PATCH 19/34] =?UTF-8?q?=E8=AE=A9=E9=A1=B9=E7=9B=AE=E7=95=99?= =?UTF-8?q?=E8=A8=80=E7=9A=84=E5=86=85=E5=AE=B9=E4=BB=A5html=E5=BD=A2?= =?UTF-8?q?=E5=BC=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/mailer/send_for_user_activities.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 23cbe6176..3c462be08 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -407,9 +407,9 @@ :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_send_course_journals_for_messages) %> - <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project,:token => @token.value), + <%= link_to project_journal_message.notes.gsub("

    ","").gsub("

    ","").gsub("
    ","").html_safe, project_feedback_url(project_journal_message.project,:token => @token.value), :class => 'wmail_info', - :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" + :style => "color:#2E8DD7;float:left; max-width:400px; max-height:30px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <%= format_time(project_journal_message.created_on) %> From 3957ca5dc25240992a9e16d2439d1490e6d05bd8 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 10 Oct 2015 14:30:23 +0800 Subject: [PATCH 20/34] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E8=AE=A9=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80=E4=BB=A5html?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/mailer/send_for_user_activities.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 3c462be08..ae5604099 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -439,9 +439,9 @@ :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <%= l(:label_show_your_message) %> - <%= link_to truncate(user_journal_message.notes,length: 30,omission: '...'),feedback_url(@user,:token => @token.value), + <%= link_to user_journal_message.notes.gsub("

    ","").gsub("

    ","").gsub("
    ","").html_safe,feedback_url(@user,:token => @token.value), :class => 'wmail_info', - :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" + :style => "color:#2E8DD7;float:left; max-width:400px; max-height:30px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <%= format_time(user_journal_message.created_on) %> From 3955075d03d469382dc17757f5ba497bc140c7fe Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 10 Oct 2015 15:00:49 +0800 Subject: [PATCH 21/34] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80=E5=89=8D=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E7=A9=BA=E8=A1=8C=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_userfeedaback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb index 672dfda64..23a0774c3 100644 --- a/app/views/users/_user_message_userfeedaback.html.erb +++ b/app/views/users/_user_message_userfeedaback.html.erb @@ -9,7 +9,7 @@ "><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %>
  • - <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", + <%= link_to ma.journals_for_message.notes.gsub("

    ","").gsub("

    ","").gsub("
    ","").html_safe, feedback_path(ma.journals_for_message.jour_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
    • From d80dffb31c0cf57453b06018aa9bd78710f8ddd3 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 10 Oct 2015 15:12:04 +0800 Subject: [PATCH 22/34] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E9=87=8C=E6=89=8D=E7=94=A8=E5=88=B0=E4=BA=86tag=20=E4=BA=91?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_tag_yun.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/files/_tag_yun.html.erb b/app/views/files/_tag_yun.html.erb index bdf581baa..4889e538d 100644 --- a/app/views/files/_tag_yun.html.erb +++ b/app/views/files/_tag_yun.html.erb @@ -1,7 +1,9 @@ +<% if course %> 全部 +<% end %> <% unless tag_list.nil?%> <% tag_list.each do |k,v|%> <% if tag_name && tag_name == k%> From 3d993304e31b1d0573c534c96444b9dc654ccc01 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 10 Oct 2015 15:27:13 +0800 Subject: [PATCH 23/34] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E4=B8=80=E4=BA=9B=E4=BB=A3=E7=A0=81?= =?UTF-8?q?bug;=202.=E8=B0=83=E6=95=B4=E6=B6=88=E6=81=AF=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=8D=95=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 10 +++++----- app/views/users/user_messages.html.erb | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index fee28f761..07066f6dc 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -99,17 +99,17 @@

    课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)

    作业标题：<%= ma.course_message.name %>

    -

    提交截止：<%= ma.course_message.end_time %>@nbsp; 24点

    -

    匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点

    +

    提交截止：<%= ma.course_message.end_time %>  24点

    +

    匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %> @ 24点

    迟交扣分：<%= ma.course_message.late_penalty %>分

    请同学们抓紧时间提交自己的作品，谢谢！

    <% else %>

    <%= User.current.lastname + User.current.firstname %>老师您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：

    课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)

    作业标题：<%= ma.course_message.name %>

    -

    提交截止：<%= ma.course_message.end_time %>@nbsp;@nbsp;24点

    -

    匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>@nbsp;@nbsp;24点

    -

    匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点

    +

    提交截止：<%= ma.course_message.end_time %>  24点

    +

    匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点

    +

    匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点

    迟交扣分：<%= ma.course_message.late_penalty %>分

    缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分

    您可以修改作业内容、评分规则、匿评过程等，谢谢！

    diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index d0f7bb9bb..6f583f76d 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -2,9 +2,9 @@
    <%= title_for_message(params[:type]) %>