From da9a607a5bf6f0bc0280bf989162b06e82efc51e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 6 Jun 2015 16:11:37 +0800 Subject: [PATCH 01/65] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E5=90=8E=E6=B7=BB=E5=8A=A0=E9=99=84=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E4=B8=8D=E5=88=B7=E6=83=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/add_score.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/student_work/add_score.js.erb b/app/views/student_work/add_score.js.erb index 5e6c4fe6d..0ba275d5d 100644 --- a/app/views/student_work/add_score.js.erb +++ b/app/views/student_work/add_score.js.erb @@ -2,7 +2,7 @@ $("#add_student_score_<%= @work.id%>").html("<%= escape_javascript(render :parti $('#score_<%= @work.id%>').peSlider({range: 'min'}); <% if @is_new%> - $("#score_list_<%= @work.id%>").prepend("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %>"); + $("#score_list_<%= @work.id%>").prepend("
<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %>
"); <% else %> $("#work_score_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %>"); <% end%> From 05a77caeda767d694281eea19e41f95c38a55b27 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 9 Jun 2015 12:58:54 +0800 Subject: [PATCH 02/65] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA=E9=87=8D=E5=A4=8D=E5=8F=8A=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/mailer.rb | 4 ++-- app/views/mailer/send_for_user_activities.html.erb | 2 +- app/views/mailer/send_for_user_activities.text.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 204aa109a..7411dd30f 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -127,12 +127,12 @@ class Mailer < ActionMailer::Base # @homeworks = HomeworkAttach.where("user_id=#{user.id} and (created_at between '#{date_from}' and '#{date_to}')").order("created_at desc") # 查询user在课程中发布的讨论帖子 - course_mesages = Message.find_by_sql("select me.* from messages me, boards b, members m where + course_mesages = Message.find_by_sql("select distinct me.* from messages me, boards b, members m where b.id = me.board_id and b.course_id = m.course_id and b.course_id is not Null and m.user_id = '#{user.id}' and (me.created_on between '#{date_from}' and '#{date_to}') order by created_on desc") # 查询user在项目中发布的讨论帖子 - project_messages = Message.find_by_sql("select me.* from messages me, boards b, members m where + project_messages = Message.find_by_sql("select distinct me.* from messages me, boards b, members m where b.id = me.board_id and b.project_id = m.project_id and b.project_id != '-1' and m.user_id = '#{user.id}' and (me.created_on between '#{date_from}' and '#{date_to}') order by created_on desc") # messages = Message.find_by_sql("select DISTINCT * from messages where author_id = #{user.id} and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc") diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 9723783fe..54d2db43c 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -108,7 +108,7 @@ <% end %> + + <% unless @wiki_contents.first.nil? %> + + <% end %> + <% unless @project_news.first.nil? %> <% end %> + + <% unless @project_journal_messages.first.nil? %> + + <% end %> <% end %> diff --git a/config/locales/mailers/zh.yml b/config/locales/mailers/zh.yml index 8a6aa5168..46666ee25 100644 --- a/config/locales/mailers/zh.yml +++ b/config/locales/mailers/zh.yml @@ -20,4 +20,4 @@ zh: mail_issue_sent_from: "来源：" mail_issue_from_project: "项目问题跟踪" mail_issue_attachments: "附件：" - mail_issue_reply: "我要回复" \ No newline at end of file + mail_issue_reply: "我要回复" diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index e01e2992c..42eea8dcc 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -395,7 +395,8 @@ zh: label_issue_score: issue得分 label_issue_number: issue的数量 - label_issue_journal_number: issue的留言数量 + label_issue_journal_number: issue的留言数量 + label_project_mail_feedback: 项目留言 label_news_score: 新闻得分 label_new_number: 新闻的数量 From 7bf4cfd2187c9267e30e93117d3bdc6282aa3d11 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 11 Jun 2015 10:40:55 +0800 Subject: [PATCH 20/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E7=95=99=E8=A8=80=E5=9C=A8=E6=8C=89=E5=A4=A9=E5=8F=91=E9=80=81?= =?UTF-8?q?=E4=B8=AD=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/mailer.rb | 7 +++---- app/views/mailer/send_for_user_activities.html.erb | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 887542018..610f2b4c6 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -165,12 +165,11 @@ class Mailer < ActionMailer::Base # 查询user在课程及个人中留言 @course_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT * from journals_for_messages where jour_type='Course' and user_id = #{user.id} and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc") - @user_journal_messages = user.journals_for_messages.where("m_parent_id IS NULL and (created_on between '#{date_from}' and '#{date_to}')").order('created_on DESC') + @user_journal_messages = user.journals_for_messages.where("jour_type='Principal' and (created_on between '#{date_from}' and '#{date_to}')").order('created_on DESC') # 查询user在项目中留言（用户反馈） - @project_journal_messages = JournalsForMessage.find_by_sql("select jfm.* from journals_for_messages jfm, members m, projects p - where m.user_id = '#{user.id}' and p.id = m.project_id and jfm.jour_id = p.id and jfm.user_id = m.user_id and jfm.jour_type='Project' - and (jfm.created_on between '#{date_from}' and '#{date_to}') order by created_on desc") + @project_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT * from journals_for_messages where + jour_type='Project' and user_id = #{user.id} and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc") # 查询user新建贴吧或发布帖子 @forums = Forum.find_by_sql("select DISTINCT * from forums where creator_id = #{user.id} and (created_at between '#{date_from}' and '#{date_to}') order by created_at desc") diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 4059c88b6..7776a420d 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -93,7 +93,7 @@ :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(course_journal_message.notes,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value), + <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,: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;" %> @@ -311,15 +311,15 @@ :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> ] - <%= link_to project_journal_message.project.user, user_activities_url(project_journal_message.project.user,:token => @token.value), :class => "wmail_name", + <%= link_to project_journal_message.user, user_activities_url(project_journal_message.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_send_course_journals_for_messages) %> - <%= link_to truncate(project_journal_message.project.notes,length: 30,omission: '...'), project_feedback_url(project_journal_message.project,:token => @token.value), + <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), 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;" %> - <%= format_time(project_journal_message.project.created_on) %> + <%= format_time(project_journal_message.created_on) %> <% end %>
From f956b2795384bc690d095486af4d99d334aa3033 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 11 Jun 2015 15:31:22 +0800 Subject: [PATCH 21/65] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B9=B3=E5=9D=87=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 4 ++-- app/models/member.rb | 18 ++++++++++-------- app/views/courses/_show_member_score.html.erb | 6 +++--- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index e89f621c8..518cc01c4 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -836,7 +836,7 @@ class CoursesController < ApplicationController sql_select = "" if groupid == 0 sql_select = "SELECT members.*,( - SELECT SUM(student_works.final_score) + SELECT AVG(student_works.final_score) FROM student_works,homework_commons WHERE student_works.homework_common_id = homework_commons.id AND homework_commons.course_id = #{@course.id} @@ -848,7 +848,7 @@ class CoursesController < ApplicationController WHERE members.course_id = #{@course.id} ORDER BY score #{score_sort_by}" else sql_select = "SELECT members.*,( - SELECT SUM(student_works.final_score) + SELECT AVG(student_works.final_score) FROM student_works,homework_commons WHERE student_works.homework_common_id = homework_commons.id AND homework_commons.course_id = #{@course.id} diff --git a/app/models/member.rb b/app/models/member.rb index 2936392ab..7bde36287 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -116,21 +116,23 @@ class Member < ActiveRecord::Base # 查找每个学生每个作业的评分 def student_homework_score - score_count = 0 homework_score = StudentWork.find_by_sql("SELECT homework_commons.name,student_works.final_score as score FROM student_works,homework_commons WHERE student_works.homework_common_id = homework_commons.id AND homework_commons.course_id = #{self.course_id} AND student_works.user_id = #{self.user_id}") - homework_score.each do |homework| - mem_score = 0 - if homework[:score] - mem_score = homework[:score] - end - score_count = score_count + mem_score - end + score_count = StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}").average(:final_score).try(:round, 2).to_f [homework_score, format("%0.2f", score_count)] end + + def student_work_score + StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}") + end + + def student_work_score_avg + StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}").average(:final_score).try(:round, 2).to_f + end + protected def validate_role diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb index 0d250cf14..0fd1248c6 100644 --- a/app/views/courses/_show_member_score.html.erb +++ b/app/views/courses/_show_member_score.html.erb @@ -17,17 +17,17 @@

<%= @member_score.user.name %> 历次作业积分

From b44f5ef522aec88cd617d4904f408b5bdeeb9529 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 11 Jun 2015 15:47:55 +0800 Subject: [PATCH 22/65] =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=BA=E4=BD=9C=E4=B8=9A=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/member.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/member.rb b/app/models/member.rb index 7bde36287..5b1e277d7 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -126,7 +126,7 @@ class Member < ActiveRecord::Base end def student_work_score - StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}") + StudentWork.select("homework_commons.name, student_works.final_score").joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}") end def student_work_score_avg From de3bb64fd9ffd39bfc41508dc1a638f67d764d9e Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Thu, 11 Jun 2015 16:24:09 +0800 Subject: [PATCH 23/65] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA=E6=8D=A2=E7=BC=96=E8=BE=91=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/boards/show.html.erb | 4 +- app/views/courses/_courses_jours.html.erb | 201 ++++++++++++++++-- app/views/courses/_history.html.erb | 3 +- app/views/words/_journal_reply_items.html.erb | 2 +- app/views/words/_new_respond_course.html.erb | 4 +- 5 files changed, 192 insertions(+), 22 deletions(-) diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb index 2a280fe03..d7a02e326 100644 --- a/app/views/boards/show.html.erb +++ b/app/views/boards/show.html.erb @@ -104,8 +104,8 @@ function nh_check_field(params){ result=false; } if(params.content.html()!=params.textarea.html() || params.issubmit==true){ -// params.textarea.html(params.content.html()); //用这个ie11提交到服务器居然木有值 真特么旧梦已尘风 - params.content.sync(); //但是这个貌似编辑器没内容时不会同步到textarea中 新愁不言中... + params.textarea.html(params.content.html()); + params.content.sync(); //用上面那句ie11提交到服务器居然木有值 if(params.content.isEmpty()){ params.contentmsg.html('内容不能为空'); params.contentmsg.css({color:'#ff0000'}); diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index adbbf4780..07d065901 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -1,25 +1,41 @@ + <%= javascript_include_tag "/assets/kindeditor/kindeditor" %> -
+
<%# reply_allow = JournalsForMessage.create_by_user? User.current %>

<%= l(:label_leave_message) %>

<% if !User.current.logged?%> -
- <%= l(:label_user_login_tips) %> - <%= link_to l(:label_user_login_new), signin_path %> -
-
+
+ <%= l(:label_user_login_tips) %> + <%= link_to l(:label_user_login_new), signin_path %> +
+
<% else %> - <%= form_for('new_form', :method => :post, - :url => {:controller => 'words', :action => 'leave_course_message'},:html => {:id=>'leave_message_form'}) do |f|%> - <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> - <%= f.kindeditor 'course_message',:height => '140px;',:editor_id => 'leave_message_editor',:input_html=>{:id => "leave_meassge",:style => "resize: none;", + <%= form_for('new_form', :method => :post, + :url => {:controller => 'words', :action => 'leave_course_message'},:html => {:id=>'leave_message_form'}) do |f|%> + <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> + <%#= f.kindeditor 'course_message',:height => '140px;',:editor_id => 'leave_message_editor',:input_html=>{:id => "leave_meassge",:style => "resize: none;", :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%> - 取  消 - - <%= l(:button_leave_meassge)%> - - <% end %> + +

+
+ 取  消 + + <%= l(:button_leave_meassge)%> + + <% end %> <% end %>
@@ -28,4 +44,157 @@
\ No newline at end of file + +
+ + \ No newline at end of file diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb index e7c5a7c5e..3dc9aeba5 100644 --- a/app/views/courses/_history.html.erb +++ b/app/views/courses/_history.html.erb @@ -30,8 +30,7 @@ <% end %> <% if reply_allow %> <%= link_to l(:label_bid_respond_quote),'', - {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %> - + {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %> <% end %>
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index d52f7cfe1..9d4eebd6f 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -34,7 +34,7 @@ <% end %> <% if reply_allow %> <%= link_to l(:button_reply),'', - {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %> + {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %> <% end %>
diff --git a/app/views/words/_new_respond_course.html.erb b/app/views/words/_new_respond_course.html.erb index e705b7fd3..5b27fd21f 100644 --- a/app/views/words/_new_respond_course.html.erb +++ b/app/views/words/_new_respond_course.html.erb @@ -4,12 +4,14 @@ :placeholder => l(:label_feedback_respond_content), :maxlength => 250 %> +

<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %> <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %> <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %> <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %> +
<%= submit_tag l(:button_feedback_respond), :name => nil , :class => "reply_btn"%> - + <% end %> \ No newline at end of file From a4f1edcdeeb5967f7ab6be84ba9eec94226e1644 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 11 Jun 2015 16:30:14 +0800 Subject: [PATCH 24/65] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9Awiki=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=85=B6=E5=AE=83=E6=88=90=E5=91=98=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=94=B6=E5=88=B0=EF=BC=9B=20=E9=A1=B9=E7=9B=AE=E3=80=81?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80=E5=85=B6=E5=AE=83=E6=88=90?= =?UTF-8?q?=E5=91=98=E5=8F=AF=E4=BB=A5=E6=94=B6=E5=88=B0=20=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E6=98=BE=E7=A4=BA=E9=A1=B5=E9=9D=A2=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/mailer.rb | 15 ++-- .../mailer/send_for_user_activities.html.erb | 30 +++---- .../mailer/send_for_user_activities.text.erb | 82 ++++++++++++++++--- config/locales/zh.yml | 2 + 4 files changed, 98 insertions(+), 31 deletions(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 610f2b4c6..8488fc1d0 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -103,7 +103,7 @@ class Mailer < ActionMailer::Base course_ids = courses.map {|course| course.id}.join(",") # 查询user的缺陷，项目中成员都能收到 - sql = "select * from members m, issues i where i.project_id = m.project_id and m.user_id='#{user.id}' + sql = "select DISTINCT * from members m, issues i where i.project_id = m.project_id and m.user_id='#{user.id}' and (i.created_on between '#{date_from}' and '#{date_to}') order by i.created_on desc" @issues = Issue.find_by_sql(sql) @@ -127,7 +127,7 @@ class Mailer < ActionMailer::Base # 查询user所在项目添加wiki @wiki_contents = WikiContent.find_by_sql("select DISTINCT wc.* from wikis w, members m, projects p, wiki_pages wp, wiki_contents wc where - m.user_id = '#{user.id}' and p.user_id = m.user_id and m.project_id=p.id and w.project_id = p.id and w.id = wp.wiki_id and wc.page_id = wp.id and w.project_id>0 + m.user_id = '#{user.id}' and m.project_id = p.id and w.project_id = p.id and w.id = wp.wiki_id and wc.page_id = wp.id and w.project_id>0 and (wc.updated_on between '#{date_from}' and '#{date_to}') order by updated_on desc") # 查询user在课程中发布的讨论帖子 @@ -163,13 +163,16 @@ class Mailer < ActionMailer::Base and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc") : [] # 查询user在课程及个人中留言 - @course_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT * from journals_for_messages where - jour_type='Course' and user_id = #{user.id} and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc") + @course_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT jfm.* from journals_for_messages jfm, members m, courses c + where m.user_id = '#{user.id}' and c.id = m.course_id and jfm.jour_id = c.id + and jfm.jour_type='Course' and (jfm.created_on between '#{date_from}' and '#{date_to}') order by created_on desc") + @user_journal_messages = user.journals_for_messages.where("jour_type='Principal' and (created_on between '#{date_from}' and '#{date_to}')").order('created_on DESC') # 查询user在项目中留言（用户反馈） - @project_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT * from journals_for_messages where - jour_type='Project' and user_id = #{user.id} and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc") + @project_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT jfm.* from journals_for_messages jfm, members m, projects p + where m.user_id = '#{user.id}' and p.id = m.project_id and jfm.jour_id = p.id + and jfm.jour_type='Project' and (jfm.created_on between '#{date_from}' and '#{date_to}') order by created_on desc") # 查询user新建贴吧或发布帖子 @forums = Forum.find_by_sql("select DISTINCT * from forums where creator_id = #{user.id} and (created_at between '#{date_from}' and '#{date_to}') order by created_at desc") diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 7776a420d..f30c770da 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -29,7 +29,7 @@ :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - <%= format_time(course_new.created_on) %> + <%= format_time(course_new.created_on) %> <% end %>
@@ -62,7 +62,7 @@ :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - <%= format_time(bid.created_at) %> + <%= format_time(bid.created_at) %> <% end %> <% end %> @@ -97,7 +97,7 @@ :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - <%= format_time(course_journal_message.created_on) %> + <%= format_time(course_journal_message.created_on) %> <% end %>
@@ -125,7 +125,7 @@ <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,: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;" %> - <%= format_time(course_message.created_on) %> + <%= format_time(course_message.created_on) %> <% end %>
@@ -157,7 +157,7 @@ :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - <%= format_time(attachment.created_on) %> + <%= format_time(attachment.created_on) %> <% end %>
@@ -190,7 +190,7 @@ <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(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;" %> - <%= format_time(issue.created_on) %> + <%= format_time(issue.created_on) %> <% end %> @@ -223,7 +223,7 @@ :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - <%= format_time(project_message.created_on) %> + <%= format_time(project_message.created_on) %> <% end %> @@ -250,13 +250,13 @@ ] <%= link_to wikicontent.author, user_activities_url(wikicontent.author,: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_notice) %> + <%= 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), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <% end %> - <%= format_time(wikicontent.updated_on) %> + <%= format_time(wikicontent.updated_on) %> <% end %>
@@ -281,12 +281,12 @@ ] <%= link_to project_new.author, user_activities_url(project_new.author,: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_notice) %> + <%= l(:label_project_mail_notice) %> <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new,: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;" %> - <%= format_time(project_new.created_on) %> + <%= format_time(project_new.created_on) %> <% end %>
@@ -319,7 +319,7 @@ :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - <%= format_time(project_journal_message.created_on) %> + <%= format_time(project_journal_message.created_on) %> <% end %>
@@ -352,7 +352,7 @@ :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - <%= format_time(user_journal_message.created_on) %> + <%= format_time(user_journal_message.created_on) %> <% end %> @@ -384,7 +384,7 @@ :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - <%= format_time(forum.created_at) %> + <%= format_time(forum.created_at) %> <% end %> @@ -411,7 +411,7 @@ :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - <%= format_time(memo.created_at) %> + <%= format_time(memo.created_at) %> <% end %> diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb index 1bfbca4a1..f09dcb299 100644 --- a/app/views/mailer/send_for_user_activities.text.erb +++ b/app/views/mailer/send_for_user_activities.text.erb @@ -4,7 +4,7 @@ <%= l(:label_course_overview)%> <% unless @course_news.first.nil? %> <%= l(:label_course_news) %> - (<%= @course_news.count %>) + <% @course_news.each do |course_new|%> @@ -28,7 +28,7 @@ <% end %> <% unless @bids.empty? %> - <%= l(:label_homework_overview) %><%= @bids.count %> + <%= l(:label_homework_overview) %> <% unless @bids.first.nil?%> <% @bids.each do |bid| %> ▪ @@ -58,7 +58,7 @@ <% unless @course_journal_messages.first.nil? %> - <%= l(:view_course_journals_for_messages) %> (<%= @course_journal_messages.count %>) + <%= l(:view_course_journals_for_messages) %> <% @course_journal_messages.each do |course_journal_message|%> @@ -88,7 +88,7 @@ <% unless @course_messages.first.nil? %> <%= l(:view_borad_course) %> - (<%= @course_messages.count %>) + <% @course_messages.each do |course_message|%> @@ -119,7 +119,7 @@ <% unless @attachments.first.nil? %> <%= l(:label_course_attendingcontestwork_download) %> - (<%= @attachments.count %>) + <% @attachments.each do |attachment|%> @@ -146,12 +146,12 @@ <% end %> <% end %> -<% @issues.first || @project_messages.first %> +<% @issues.first || @project_messages.first || @wiki_contents.first || @project_news.first || @project_journal_messages.first %> <%= l(:label_project_overview_new)%> <% unless @issues.first.nil? %> <%= l(:label_issue_tracking) %> - (<%= @issues.count %>) + <% @issues.each do |issue|%> ▪ @@ -179,7 +179,7 @@ <% unless @project_messages.first.nil? %> <%= l(:project_moule_boards_show) %> - (<%= @project_messages.count %>) + <% @project_messages.each do |project_message|%> ▪[ @@ -200,6 +200,68 @@ <%= format_time(project_message.created_on) %> <% end %> + <% unless @wiki_contents.first.nil? %> + + <%= l(:label_wiki) %> + + <% @wiki_contents.each do |wikicontent|%> + ▪[ + <% unless wikicontent.page.nil? %> + <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project, :token => @token.value) + %> + <% end %> + ] + <%= link_to wikicontent.author, user_activities_url(wikicontent.author,:token => @token.value) %> + <%= l(:label_project_notice) %> + <% unless wikicontent.page.nil? %> + <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki,:token => @token.value) %> + <% end %> + <%= format_time(wikicontent.updated_on) %> + + <% end %> + <% end %> + + + <% unless @project_news.first.nil? %> + + <%= l(:label_project_news) %> + + <% @project_news.each do |project_new|%> + ▪[ + + <%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value) + %> + ] + <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value) + %> + <%= l(:label_project_notice) %> + + <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new,:token => @token.value) + %> + <%= format_time(project_new.created_on) %> + + <% end %> + <% end %> + + + <% unless @project_journal_messages.first.nil? %> + <%= l(:label_project_mail_feedback) %> + + <% @project_journal_messages.each do |project_journal_message|%> + ▪[ + + <%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project, :token => @token.value) + %> + ] + + <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user,:token => @token.value) %> + <%= 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) + %> + <%= format_time(project_journal_message.created_on) %> + <% end %> + <% end %> <% end %> @@ -234,7 +296,7 @@ <% unless @forums.first.nil? %> <%= l(:label_user_forum) %> - (<%= @forums.count %>) + <% @forums.each do |forum|%> ▪ @@ -253,7 +315,7 @@ <% unless @memos.first.nil? %> <%= l(:label_user_message_forum) %> - (<%= @memos.count %>) + <% @memos.each do |memo|%> ▪ diff --git a/config/locales/zh.yml b/config/locales/zh.yml index b2160f7b0..fc0a0e6c6 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -783,6 +783,7 @@ zh: label_project_newother: "查看其他评论" label_project_newshare: "分享了" label_project_notice: "发布了通知：" + label_project_mail_notice: "发布了新闻：" label_project_issue: "发布了问题:" label_project_newadd: "添加了" label_project_unadd: "暂无项目，赶快去创建吧！" @@ -1505,6 +1506,7 @@ zh: label_news_number: 新闻的数量 label_wiki_number: wiki的数量 + label_wiki_mail_notification: 发布了wiki From 2a74509fd9ba54e946a2746c9ff98220f0934103 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 11 Jun 2015 16:33:33 +0800 Subject: [PATCH 25/65] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=A1=B9=E7=9B=AE=E6=8B=AC=E5=8F=B7=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/mailer/send_for_user_activities.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index f30c770da..1b4e2c255 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -213,7 +213,7 @@ <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - ] + ] <%= link_to project_message.author, user_activities_url(project_message.author,: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;"%> From e99206ff4a0a0213f860be92c70bad5a89e8a423 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Thu, 11 Jun 2015 17:31:47 +0800 Subject: [PATCH 26/65] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=95=99=E8=A8=80?= =?UTF-8?q?=E6=8D=A2=E7=BC=96=E8=BE=91=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_history.html.erb | 2 +- app/views/projects/_project_jours.html.erb | 174 +++++++++++++++++- app/views/words/_new_respond_course.html.erb | 5 +- app/views/words/_new_respond_project.html.erb | 9 +- 4 files changed, 181 insertions(+), 9 deletions(-) diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb index 3633ed7b5..4c29552e9 100644 --- a/app/views/projects/_history.html.erb +++ b/app/views/projects/_history.html.erb @@ -21,7 +21,7 @@ <% end %> <% if reply_allow %> <%= link_to l(:label_bid_respond_quote),'', - {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %> + {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %> <% end %> diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb index 5b1e3c065..e7aebac43 100644 --- a/app/views/projects/_project_jours.html.erb +++ b/app/views/projects/_project_jours.html.erb @@ -1,4 +1,18 @@ -
+ +<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +
<% reply_allow = JournalsForMessage.create_by_user? User.current %>

<%= l(:label_user_response) %>

<% if !User.current.logged?%> @@ -12,8 +26,10 @@ <%= form_for('new_form', :method => :post, :url => {:controller => 'words', :action => 'leave_project_message'}) do |f|%> <%= f.text_area 'project_message', :rows => 3, :cols => 65, - :placeholder => "#{l(:label_welcome_my_respond)}" %> - <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "blue_btn fr" %> + :placeholder => "#{l(:label_welcome_my_respond)}",:nhname=>'new_message_textarea' %> +

+
+ <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "blue_btn fr mt10 mb10" %> <% end %> <% end %> @@ -24,3 +40,155 @@
    <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
+ \ No newline at end of file diff --git a/app/views/words/_new_respond_course.html.erb b/app/views/words/_new_respond_course.html.erb index 5b27fd21f..a939a55d4 100644 --- a/app/views/words/_new_respond_course.html.erb +++ b/app/views/words/_new_respond_course.html.erb @@ -1,9 +1,10 @@ <%= form_tag(words_create_reply_path, :remote => true) do %> <%= text_area_tag 'user_notes', "", :class => 'w520 h50 mb5', :style => "resize: none;overflow: hidden;",:rows => 4, - :placeholder => l(:label_feedback_respond_content), + :placeholder => l(:label_feedback_respond_content)#, - :maxlength => 250 %> + #:maxlength => 250 + %>

<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %> <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %> diff --git a/app/views/words/_new_respond_project.html.erb b/app/views/words/_new_respond_project.html.erb index e705b7fd3..c3ff241b3 100644 --- a/app/views/words/_new_respond_project.html.erb +++ b/app/views/words/_new_respond_project.html.erb @@ -1,15 +1,18 @@ <%= form_tag(words_create_reply_path, :remote => true) do %> <%= text_area_tag 'user_notes', "", :class => 'w520 h50 mb5', :style => "resize: none;overflow: hidden;",:rows => 4, - :placeholder => l(:label_feedback_respond_content), - - :maxlength => 250 %> + :placeholder => l(:label_feedback_respond_content) + #,:maxlength => 250 + %> +

<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %> <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %> <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %> <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %> +
<%= submit_tag l(:button_feedback_respond), :name => nil , :class => "reply_btn"%> + <% end %> \ No newline at end of file From 6929694fb403e38f24dd2f400999a09b5464bedd Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Thu, 11 Jun 2015 18:16:23 +0800 Subject: [PATCH 27/65] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E7=95=99=E8=A8=80=E6=8D=A2=E7=BC=96=E8=BE=91=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_history.html.erb | 2 +- app/views/users/_user_jours.html.erb | 171 ++++++++++++++++++++++++++ app/views/words/_new.html.erb | 8 +- app/views/words/_new_respond.html.erb | 8 +- 4 files changed, 183 insertions(+), 6 deletions(-) diff --git a/app/views/users/_history.html.erb b/app/views/users/_history.html.erb index 9b5744251..3daa6cc7d 100644 --- a/app/views/users/_history.html.erb +++ b/app/views/users/_history.html.erb @@ -24,7 +24,7 @@ <% end %> <% if reply_allow %> <%= link_to l(:label_bid_respond_quote),'', - {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %> + {:focus => 'project_respond',:nhname=>'reply_btn', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %> <% end %> diff --git a/app/views/users/_user_jours.html.erb b/app/views/users/_user_jours.html.erb index b5badf60c..061632194 100644 --- a/app/views/users/_user_jours.html.erb +++ b/app/views/users/_user_jours.html.erb @@ -1,3 +1,17 @@ + +<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
<% reply_allow = JournalsForMessage.create_by_user? User.current %> @@ -49,3 +63,160 @@ } + +
+ diff --git a/app/views/words/_new.html.erb b/app/views/words/_new.html.erb index 561c6a953..e81368c1f 100644 --- a/app/views/words/_new.html.erb +++ b/app/views/words/_new.html.erb @@ -35,7 +35,7 @@ border: #d5dee9 1px solid; } -
+
<%= form_for('new_form', :remote => true, :method => :post, :url => {:controller => 'words', :action => 'create', @@ -51,10 +51,12 @@ <%= f.text_area 'user_message', :rows => 3, :cols => 65, :placeholder => "#{l(:label_leave_a_message)}", :style => "resize: none; width: 98%", - :class => 'noline'%> + :class => 'noline',:nhname=>'new_message_textarea'%> <%# end %> <%= f.text_field :reference_user_id, :style=>"display:none"%> - <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-right: 1%; margin-top: 1px;"%> +

+
+ <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-top: 5px;"%> <%else %>
<%= l(:label_user_login_tips) %> diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb index 33c523c33..f140030a7 100644 --- a/app/views/words/_new_respond.html.erb +++ b/app/views/words/_new_respond.html.erb @@ -1,15 +1,19 @@ <%= form_tag(words_create_reply_path, :remote => true) do %> <%= text_area_tag 'user_notes', "", :class => 'noline', :style => "resize: none;", :rows => 4, - :placeholder => l(:label_feedback_respond_content), - :maxlength => 250 %> + :placeholder => l(:label_feedback_respond_content)#, + #:maxlength => 250 + %> +

<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %> <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %> <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %> <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %> +
<%= submit_tag l(:button_feedback_respond), :name => nil , :class => "enterprise", :style => "float: right; margin-top: 1px; margin-right: 4px;margin-bottom: 5px;"%> + <% end %> \ No newline at end of file From f7e0ad9fc36fd001546dfeb03c0f7b870877e30d Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Fri, 12 Jun 2015 10:09:47 +0800 Subject: [PATCH 28/65] ... --- app/views/boards/_course_show.html.erb | 2 +- app/views/boards/_form_project.html.erb | 1 + app/views/boards/_project_show.html.erb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index 48e5a870d..5beee8601 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -253,7 +253,7 @@ }; params.get_ref_str_call=function(btn){ var div = btn.parent('div'); - var str = '
'+$('a',div).filter(':first').html()+' 写到：
'+$("input[nhname='nh_content_val']",div).val()+'
'; + var str = '
'+$('a',div).filter(':first').html()+' 写到：
'+$("input[nhname='nh_content_val']",div).val()+'
'; return str; } nh_init_board(params); diff --git a/app/views/boards/_form_project.html.erb b/app/views/boards/_form_project.html.erb index f6b41b53f..525869901 100644 --- a/app/views/boards/_form_project.html.erb +++ b/app/views/boards/_form_project.html.erb @@ -47,6 +47,7 @@
  • +
    <% unless replying %> <% end %> diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index aed6b80e5..d5a5a7882 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -238,7 +238,7 @@ }; params.get_ref_str_call=function(btn){ var div = btn.parent('div'); - var str = '
    '+$('a',div).filter(':first').html()+' 写到：
    '+$("input[nhname='nh_content_val']",div).val()+'
    '; + var str = '
    '+$('a',div).filter(':first').html()+' 写到：
    '+$("input[nhname='nh_content_val']",div).val()+'
    '; return str; } nh_init_board(params); From 3c515dd07727e075baddf38eff08ef3e8a9410a1 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Fri, 12 Jun 2015 10:52:15 +0800 Subject: [PATCH 29/65] ... --- app/views/boards/show.html.erb | 7 +++++-- app/views/courses/_courses_jours.html.erb | 7 +++++-- app/views/projects/_project_jours.html.erb | 7 +++++-- app/views/users/_user_jours.html.erb | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb index d7a02e326..196e7f097 100644 --- a/app/views/boards/show.html.erb +++ b/app/views/boards/show.html.erb @@ -185,8 +185,11 @@ function nh_init_board(params){ if(params.quote_input!=undefined)params.quote_input.empty(); }else{ if(params.type=='reply'){ - params.jumphref.attr('href','#'+params.form.attr('id')); - params.jumphref[0].click(); + params.textarea.show(); + params.textarea.focus(); + params.textarea.hide(); + //params.jumphref.attr('href','#'+params.form.attr('id')); + //params.jumphref[0].click(); }else params.inputsubject.focus(); } }); diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index 07d065901..a097a2286 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -168,8 +168,11 @@ params.cancel_btn.click(); setTimeout(function(){ if(!params.div_form.is(':hidden')){ - $("#nhjump").attr('href','#'+params.div_form.attr('id')); - $("#nhjump")[0].click(); + params.textarea.show(); + params.textarea.focus(); + params.textarea.hide(); +// $("#nhjump").attr('href','#'+params.div_form.attr('id')); +// $("#nhjump")[0].click(); } },300); params.textarea.data('init',1); diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb index e7aebac43..d530a7199 100644 --- a/app/views/projects/_project_jours.html.erb +++ b/app/views/projects/_project_jours.html.erb @@ -162,8 +162,11 @@ params.cancel_btn.click(); setTimeout(function(){ if(!params.div_form.is(':hidden')){ - $("#nhjump").attr('href','#'+params.div_form.attr('id')); - $("#nhjump")[0].click(); + params.textarea.show(); + params.textarea.focus(); + params.textarea.hide(); +// $("#nhjump").attr('href','#'+params.div_form.attr('id')); +// $("#nhjump")[0].click(); } },300); params.textarea.data('init',1); diff --git a/app/views/users/_user_jours.html.erb b/app/views/users/_user_jours.html.erb index 061632194..56b9a883b 100644 --- a/app/views/users/_user_jours.html.erb +++ b/app/views/users/_user_jours.html.erb @@ -190,8 +190,11 @@ params.cancel_btn.click(); setTimeout(function(){ if(!params.div_form.is(':hidden')){ - $("#nhjump").attr('href','#'+params.div_form.attr('id')); - $("#nhjump")[0].click(); + params.textarea.show(); + params.textarea.focus(); + params.textarea.hide(); +// $("#nhjump").attr('href','#'+params.div_form.attr('id')); +// $("#nhjump")[0].click(); } },300); params.textarea.data('init',1); From dbb6c9f54cab48b30ebeedd1a487909777b94bf4 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Fri, 12 Jun 2015 11:21:49 +0800 Subject: [PATCH 30/65] ... --- public/assets/kindeditor/kindeditor.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 74228d3ea..5ebe96a32 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -5620,7 +5620,8 @@ _plugin('core', function(K) { afterUpload : function(data) { if (data.error === 0) { var url = K.formatUrl(data.url, 'absolute'); - self.exec('insertimage', url, 'image','','','1','left'); + //self.exec('insertimage', url, 'image','','','1','left'); + self.insertHtml(''); var asset_id = data.asset_id; if ( asset_id != "" && parent.document.getElementById('asset_id') != null ) { parent.document.getElementById('asset_id').value += asset_id.toString(); From 0ca913bc8353222a7babb346eeefa7710fdd590e Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Fri, 12 Jun 2015 11:55:29 +0800 Subject: [PATCH 31/65] ... --- app/helpers/activity_notifys_helper.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/helpers/activity_notifys_helper.rb b/app/helpers/activity_notifys_helper.rb index 15fc43b54..f2069a2d3 100644 --- a/app/helpers/activity_notifys_helper.rb +++ b/app/helpers/activity_notifys_helper.rb @@ -1,7 +1,6 @@ module ActivityNotifysHelper def get_new_notify_count(container,type) - logger.info('xxoo') - query = ActivityNotify.where('activity_container_id=? and activity_container_type=? and notify_to=?',container.id,type,User.current.id); + query = ActivityNotify.where('activity_container_id=? and activity_container_type=? and notify_to=? and is_read=0',container.id,type,User.current.id); return query.count() end end \ No newline at end of file From 9938c9f83abd91bbf04e448d8535a7fa45cb577b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 12 Jun 2015 14:41:02 +0800 Subject: [PATCH 32/65] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 4fbf3ad43..0d48dc8d2 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -49,7 +49,7 @@
    <%= l :label_activity_time %> ： <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %>

    - <%= link_to_attachments_course(e) if e.is_a?(News) %> + <%= link_to_attachments_course(e) if e.class.to_s == "News" %>
    • From e8369b2f258e3c68c605fa55c954b9ed1398af5b Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Fri, 12 Jun 2015 14:49:50 +0800 Subject: [PATCH 33/65] ... --- app/views/boards/show.html.erb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb index 196e7f097..ba9583e7d 100644 --- a/app/views/boards/show.html.erb +++ b/app/views/boards/show.html.erb @@ -190,7 +190,12 @@ function nh_init_board(params){ params.textarea.hide(); //params.jumphref.attr('href','#'+params.form.attr('id')); //params.jumphref[0].click(); - }else params.inputsubject.focus(); + }else{ + params.textarea.show(); + params.textarea.focus(); + params.textarea.hide(); +// params.inputsubject.focus(); + } } }); params.textarea.data('init','1');//标记为已经初始化 From 881d66103b80578dee2101c0a259841e63b5b213 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 12 Jun 2015 14:59:06 +0800 Subject: [PATCH 34/65] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=8E=89=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mailer/send_for_user_activities.html.erb | 12 ----- .../mailer/send_for_user_activities.text.erb | 50 +++++++++---------- 2 files changed, 25 insertions(+), 37 deletions(-) diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 1b4e2c255..21549be21 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -10,7 +10,6 @@
      <%= l(:label_course_news) %> - <% @course_news.each do |course_new|%>
    • @@ -41,7 +40,6 @@
        <%= l(:label_homework_overview) %> - <% unless @bids.first.nil?%> <% @bids.each do |bid| %> @@ -76,7 +74,6 @@
          <%= l(:view_course_journals_for_messages) %> - <% @course_journal_messages.each do |course_journal_message|%> @@ -109,7 +106,6 @@
            <%= l(:view_borad_course) %> - <% @course_messages.each do |course_message|%>
          • @@ -137,7 +133,6 @@
              <%= l(:label_course_attendingcontestwork_download) %> - <% @attachments.each do |attachment|%>
            • @@ -174,7 +169,6 @@
                <%= l(:label_issue_tracking) %> - <% @issues.each do |issue|%>
              • @@ -203,7 +197,6 @@
                  <%= l(:project_moule_boards_show) %> - <% @project_messages.each do |project_message|%>
                • @@ -236,7 +229,6 @@
                    <%= l(:label_wiki) %> - <% @wiki_contents.each do |wikicontent|%>
                  • @@ -268,7 +260,6 @@
                      <%= l(:label_project_news) %> - <% @project_news.each do |project_new|%>
                    • @@ -298,7 +289,6 @@
                        <%= l(:label_project_mail_feedback) %> - <% @project_journal_messages.each do |project_journal_message|%> @@ -336,7 +326,6 @@
                          <%= l(:label_user_message) %> - <% @user_journal_messages.each do |user_journal_message|%> @@ -395,7 +384,6 @@
                            <%= l(:label_user_message_forum) %> - <% @memos.each do |memo|%> diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb index f09dcb299..c46e96f03 100644 --- a/app/views/mailer/send_for_user_activities.text.erb +++ b/app/views/mailer/send_for_user_activities.text.erb @@ -15,13 +15,13 @@ <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value)%> ] - <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value) + <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value) %> <%= l(:label_project_notice) %> <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value) - - + + %> <%= format_time(course_new.created_on) %> <% end %> @@ -35,7 +35,7 @@ [ <%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course, :token => @token.value) - + %> ] @@ -44,8 +44,8 @@ <%= l(:label_course_homework) %> <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id,:token => @token.value) - - + + %> <%= format_time(bid.created_at) %> @@ -66,17 +66,17 @@ [ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value) - + %> ] - <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value) + <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value) %> <%= l(:label_send_course_journals_for_messages) %> <%= link_to truncate(course_journal_message.notes,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value) - - + + %> <%= format_time(course_journal_message.created_on) %> @@ -97,7 +97,7 @@ [ <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course, :token => @token.value) - + %> ] @@ -106,8 +106,8 @@ <%= l(:label_send_course_messages) %> <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value) - - + + %> <%= format_time(course_message.created_on) %> @@ -126,7 +126,7 @@ ▪[ <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value) - + %> ] @@ -135,8 +135,8 @@ <%= l(:label_course_file_upload) %> <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value) - - + + %> <%= format_time(attachment.created_on) %> @@ -158,7 +158,7 @@ [ <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value) - + %> ] @@ -167,8 +167,8 @@ <%= l(:label_project_issue) %> <%= link_to truncate(issue. subject,length: 30,omission: '...'),issue_url(issue, :token => @token.value) - - + + %> <%= format_time(issue.created_on) %> <% end %> @@ -185,7 +185,7 @@ ▪[ <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value) - + %> ] @@ -194,8 +194,8 @@ <%= l(:label_send_course_messages) %> <%= link_to truncate(project_message. subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value) - - + + %> <%= format_time(project_message.created_on) %> <% end %> @@ -277,13 +277,13 @@ ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value) - + %> <%= l(:label_show_your_message) %> <%= link_to truncate(user_journal_message.notes,length: 30,omission: '...'), feedback_url(@user,:token => @token.value) - - + + %> <%= format_time(user_journal_message.created_on) %> From 46da84cd819fe4fbd39b8bf0f14da7c27dfa8c63 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Fri, 12 Jun 2015 15:56:28 +0800 Subject: [PATCH 35/65] ... --- app/views/courses/_courses_jours.html.erb | 4 ++-- app/views/projects/_project_jours.html.erb | 2 +- app/views/users/_user_jours.html.erb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index a097a2286..e3eba9151 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -155,8 +155,8 @@ params.div_form = $(">.respond-form",params.container); params.form = $("form",params.div_form); params.textarea = $("textarea[name='user_notes']",params.div_form); - params.contentmsg = $("p[nhname='contentmsg']",params.div_form), - params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form); + params.contentmsg = $("p[nhname='contentmsg']",params.div_form); + params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form); params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form); if(params.textarea.data('init') == undefined){ params.editor = init_editor(params); diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb index d530a7199..5692afcf5 100644 --- a/app/views/projects/_project_jours.html.erb +++ b/app/views/projects/_project_jours.html.erb @@ -149,7 +149,7 @@ params.div_form = $(">.respond-form",params.container); params.form = $("form",params.div_form); params.textarea = $("textarea[name='user_notes']",params.div_form); - params.contentmsg = $("p[nhname='contentmsg']",params.div_form), + params.contentmsg = $("p[nhname='contentmsg']",params.div_form); params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form); params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form); if(params.textarea.data('init') == undefined){ diff --git a/app/views/users/_user_jours.html.erb b/app/views/users/_user_jours.html.erb index 56b9a883b..a2f6f8cb4 100644 --- a/app/views/users/_user_jours.html.erb +++ b/app/views/users/_user_jours.html.erb @@ -177,8 +177,8 @@ params.div_form = $(">.respond-form",params.container); params.form = $("form",params.div_form); params.textarea = $("textarea[name='user_notes']",params.div_form); - params.contentmsg = $("p[nhname='contentmsg']",params.div_form), - params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form); + params.contentmsg = $("p[nhname='contentmsg']",params.div_form); + params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form); params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form); if(params.textarea.data('init') == undefined){ params.editor = init_editor(params); From 6d8f0e728d49cd99aa8179ea0eae89cc80a4708d Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 12 Jun 2015 16:26:24 +0800 Subject: [PATCH 36/65] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=20=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E3=80=81=E9=80=9A=E7=9F=A5=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E7=89=88=E7=BC=96=E8=BE=91=E5=99=A8=E7=9B=B8=E5=85=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homework_common/_homework_common_form.html.erb | 14 ++++++++------ app/views/news/_course_form.html.erb | 8 ++++++-- .../kindeditor/themes/default/default.css | 1 + .../assets/kindeditor/themes/default/default.css | 1 + public/stylesheets/public.css | 1 + 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/views/homework_common/_homework_common_form.html.erb b/app/views/homework_common/_homework_common_form.html.erb index e3ef0d237..28aa490de 100644 --- a/app/views/homework_common/_homework_common_form.html.erb +++ b/app/views/homework_common/_homework_common_form.html.erb @@ -11,12 +11,14 @@
                          • - <% if edit_mode %> - <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %> - <% else %> - <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> - <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor' %> - <% end %> +
                            + <% if edit_mode %> + <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %> + <% else %> + <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> + <%= f.kindeditor :description,:editor_id => 'homework_description_editor' %> + <% end %> +
                          • diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb index 32c8e368e..1769c98f3 100644 --- a/app/views/news/_course_form.html.erb +++ b/app/views/news/_course_form.html.erb @@ -8,11 +8,15 @@ <% if is_new %> <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> - <%= f.kindeditor :description,:width=>'91%',:editor_id=>'news_description_editor' %> +
                            + <%= f.kindeditor :description,:editor_id=>'news_description_editor' %> +

                            <% else %> - <%= f.kindeditor :description,:width=>'91%',:editor_id=>'news_description_editor',:owner_id => @news.id,:owner_type => OwnerTypeHelper::NEWS %> +
                            + <%= f.kindeditor :description,:editor_id=>'news_description_editor',:owner_id => @news.id,:owner_type => OwnerTypeHelper::NEWS %> +

                            <% end %> diff --git a/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css b/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css index 428b6c8b5..0d322283a 100644 --- a/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css +++ b/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css @@ -421,6 +421,7 @@ overflow: hidden; margin: 0; padding: 0; + max-width: 100%; } /* toolbar */ .ke-toolbar { diff --git a/public/assets/kindeditor/themes/default/default.css b/public/assets/kindeditor/themes/default/default.css index 5de213f37..c5a84c186 100644 --- a/public/assets/kindeditor/themes/default/default.css +++ b/public/assets/kindeditor/themes/default/default.css @@ -432,6 +432,7 @@ } /* container */ .ke-container { + max-width: 100%; display: block; border: 1px solid #CCCCCC; background-color: #FFF; diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 4bfc1ef99..0ed497127 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -440,3 +440,4 @@ img{max-width: 100%;} .attachments {clear: both;} .is_public_checkbox{margin-left: 15px;margin-right: 10px;} .author_name{color: #3ca5c6 !important;} +.ke-container-default{max-width: 100%;} From e138292f2a9a01762a5b3b0647645a270fe0eaae Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Fri, 12 Jun 2015 16:31:29 +0800 Subject: [PATCH 37/65] ... --- app/views/courses/_courses_jours.html.erb | 6 ++++-- app/views/courses/_history.html.erb | 3 ++- app/views/projects/_history.html.erb | 3 ++- app/views/projects/_project_jours.html.erb | 6 ++++-- app/views/users/_history.html.erb | 3 ++- app/views/users/_user_jours.html.erb | 6 ++++-- app/views/words/_journal_reply_items.html.erb | 3 ++- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index e3eba9151..28dfbe786 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -49,6 +49,7 @@ -<%= error_messages_for 'bid' %> - -

                            <%= l(:label_bids_form_contest_new_description) %>

                            -

                            <%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :placeholder => "#{l(:label_contest_name)}" %>

                            - -

                            <%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT, :placeholder => "#{l(:label_contest_description)}" %>

                            - -

                            <%= f.text_field :password, :size => 60, :style => "width:488px;margin-left: 10px;" %>

                            - -

                            - <%= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %> - - -

                            - -

                            <%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;", :readonly => true, :placeholder => "#{l(:label_deadline)}" %><%= calendar_for('bid_deadline')%>

                            From 94877bb353d2cc8f818d7378c170f867c0834baa Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 12 Jun 2015 16:48:43 +0800 Subject: [PATCH 43/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_revisions.html.erb | 97 +++++++++--------- app/views/repositories/show.html.erb | 110 +++++++++++---------- 2 files changed, 104 insertions(+), 103 deletions(-) diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb index a0a960b6c..891952559 100644 --- a/app/views/repositories/_revisions.html.erb +++ b/app/views/repositories/_revisions.html.erb @@ -1,54 +1,53 @@ <% show_revision_graph = ( @repository.supports_revision_graph? && path.blank? ) %> <%= if show_revision_graph && revisions && revisions.any? - indexed_commits, graph_space = index_commits(revisions, @repository.branches) do |scmid| - url_for( - :controller => 'repositories', - :action => 'revision', - :id => project, - :repository_id => @repository.identifier_param, - :rev => scmid) - end - render :partial => 'revision_graph', - :locals => { - :commits => indexed_commits, - :space => graph_space - } -end %> + indexed_commits, graph_space = index_commits(revisions, @repository.branches) do |scmid| + url_for( + :controller => 'repositories', + :action => 'revision', + :id => project, + :repository_id => @repository.identifier_param, + :rev => scmid) + end + render :partial => 'revision_graph', + :locals => { + :commits => indexed_commits, + :space => graph_space + } + end %> <%= form_tag( - {:controller => 'repositories', :action => 'diff', :id => project, - :repository_id => @repository.identifier_param, :path => to_path_param(path)}, - :method => :get - ) do %> - - - - - - - - - - -<% show_diff = revisions.size > 1 %> -<% line_num = 1 %> -<% revisions.each do |changeset| %> - -<% id_style = (show_revision_graph ? "padding-left:#{(graph_space + 1) * 20}px" : nil) %> -<%= content_tag(:td, :class => 'id', :style => id_style) do %> - <%= link_to_revision(changeset, @repository) %> -<% end %> - - - - - - -<% line_num += 1 %> -<% end %> - -
                            #<%= l(:label_date) %><%= l(:field_author) %><%= l(:field_comments) %>
                            <%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('#cbto-#{line_num+1}').attr('checked',true);") if show_diff && (line_num < revisions.size) %><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('#cb-#{line_num}').attr('checked')) {$('#cb-#{line_num-1}').attr('checked',true);}") if show_diff && (line_num > 1) %><%= format_time(changeset.committed_on) %><%= h truncate(changeset.author.to_s, :length => 30) %><%= textilizable(truncate_at_line_break(changeset.comments)) %>
                            -

                            + {:controller => 'repositories', :action => 'diff', :id => project, + :repository_id => @repository.identifier_param, :path => to_path_param(path)}, + :method => :get + ) do %> + + + + + + + + + + + <% show_diff = revisions.size > 1 %> + <% line_num = 1 %> + <% revisions.each do |changeset| %> + + <% id_style = (show_revision_graph ? "padding-left:#{(graph_space + 1) * 20}px" : nil) %> + <%= content_tag(:td, :class => 'id', :style => id_style) do %> + <%= link_to_revision(changeset, @repository) %> + <% end %> + + + + + + + <% line_num += 1 %> + <% end %> + +
                            #<%= l(:label_date) %><%= l(:field_author) %><%= l(:field_comments) %>
                            <%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('#cbto-#{line_num+1}').attr('checked',true);") if show_diff && (line_num < revisions.size) %><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('#cb-#{line_num}').attr('checked')) {$('#cb-#{line_num-1}').attr('checked',true);}") if show_diff && (line_num > 1) %><%= format_time(changeset.committed_on) %><%= h truncate(changeset.author.to_s, :length => 30) %><%= textilizable(truncate_at_line_break(changeset.comments)) %>
                            +

                            <%= submit_tag(l(:label_view_diff), :name => nil, :class=>"c_blue") if show_diff %> -

                            - +

                            <% end %> diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 1cb5942bf..a128f917a 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -5,9 +5,8 @@
                            <%= render :partial => 'breadcrumbs', - :locals => {:path => @path, :kind => 'dir', :revision => @rev} %> + :locals => {:path => @path, :kind => 'dir', :revision => @rev} %> <%= render :partial => 'navigation' %> -
                            @@ -25,8 +24,8 @@ link_to h(repo.name), {:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil}, - :class => 'repository' + (repo == @repository ? ' selected' : ''), - :class => "mb10 break_word c_orange" }.join(' | ').html_safe %>) + :class => 'repository' + (repo == @repository ? ' selected' : ''), + :class => "mb10 break_word c_orange" }.join(' | ').html_safe %>)

    @@ -36,7 +35,7 @@

    项目代码请设置好正确的编码方式（utf-8），否则中文会出现乱码。

    通过cmd命令提示符进入代码对应文件夹的根目录，假设当前用户的登录名为user，版本库名称为demo，需要操作的版本库分支为branch。 - 如果是首次提交代码，执行如下命令：

    + 如果是首次提交代码，执行如下命令：

    git init

    @@ -53,7 +52,7 @@

    git push -u origin branch:branch

    - +

    已经有本地库，还没有配置远程地址，打开命令行执行如下：

    @@ -68,7 +67,7 @@

    git push -u origin branch:branch

    - +

    已有远程地址，创建一个远程分支，并切换到该分支，打开命令行执行如下：

    @@ -81,7 +80,7 @@

    git push origin branch_name

    - +

    从网上获取别人的开源版本库，转交到trustie网站上，打开命令行执行如下：

    @@ -101,56 +100,59 @@

    李海提供

    - <% if !@entries.nil? && authorize_for('repositories', 'browse') %> - <%= render :partial => 'dir_list' %> - <% end %> - - <%= render_properties(@properties) %> - <% if authorize_for('repositories', 'revisions') %> - <% if @changesets && !@changesets.empty? %> -

    - <%= l(:label_latest_revision_plural) %> -

    - <%= render :partial => 'revisions', - :locals => {:project => @project, :path => @path, - :revisions => @changesets, :entry => nil} %> + +<% if !@entries.nil? && authorize_for('repositories', 'browse') %> + <%= render :partial => 'dir_list' %> +<% end %> +<%= render_properties(@properties) %> + + +<% if authorize_for('repositories', 'revisions') %> + <%# if @changesets && !@changesets.empty? %> +

    + <%= l(:label_latest_revision_plural) %> +

    + <%= render :partial => 'revisions', + :locals => {:project => @project, :path => @path, + :revisions => @changesets, :entry => nil} %> + <%# end %> + +

    + <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0) + sep = '' %> + <% if @repository.supports_all_revisions? && @path.blank? %> + <%= link_to l(:label_view_all_revisions), {:action => 'revisions', :id => @project, + :repository_id => @repository.identifier_param}, + :class => "orange_u_btn" %> + <% sep = '|' %> <% end %> -

    - <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0) - sep = '' %> - <% if @repository.supports_all_revisions? && @path.blank? %> - <%= link_to l(:label_view_all_revisions), {:action => 'revisions', :id => @project, - :repository_id => @repository.identifier_param}, - :class => "orange_u_btn" %> - <% sep = '|' %> - <% end %> - <% if @repository.supports_directory_revisions? && (has_branches || !@path.blank? || !@rev.blank?) %> - <%= sep %> - <%= link_to l(:label_view_revisions), - {:action => 'changes', - :path => to_path_param(@path), - :id => @project, - :repository_id => @repository.identifier_param, - :rev => @rev}, - :class => "orange_u_btn" %> - <% end %> -

    - <% if @repository.supports_all_revisions? %> - <% content_for :header_tags do %> - <%= auto_discovery_link_tag( - :atom, params.merge( - {:format => 'atom', :action => 'revisions', - :id => @project, :page => nil, :key => User.current.rss_key})) %> - <% end %> + <% if @repository.supports_directory_revisions? && (has_branches || !@path.blank? || !@rev.blank?) %> + <%= sep %> + <%= link_to l(:label_view_revisions), + {:action => 'changes', + :path => to_path_param(@path), + :id => @project, + :repository_id => @repository.identifier_param, + :rev => @rev}, + :class => "orange_u_btn" %> <% end %> - <% end %> +

    + <% if @repository.supports_all_revisions? %> + <% content_for :header_tags do %> + <%= auto_discovery_link_tag( + :atom, params.merge( + {:format => 'atom', :action => 'revisions', + :id => @project, :page => nil, :key => User.current.rss_key})) %> + <% end %> + <% end %> +<% end %> - -

    查看如何提交代码： - <%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "c_blue") %> - <%= link_to('English', en_usage_path, :class => "c_blue") %> + +

    查看如何提交代码： + <%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "c_blue") %> + <%= link_to('English', en_usage_path, :class => "c_blue") %> -

    +
    <% content_for :header_tags do %> <%= stylesheet_link_tag "scm" %> From 482df88d70d3ff1f6fba15f17cc6d8b2fcce2829 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Fri, 12 Jun 2015 16:52:49 +0800 Subject: [PATCH 44/65] ... --- app/views/projects/_history.html.erb | 3 ++- app/views/users/_history.html.erb | 3 ++- app/views/words/_journal_reply_items.html.erb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb index d85906a2c..54dda7b28 100644 --- a/app/views/projects/_history.html.erb +++ b/app/views/projects/_history.html.erb @@ -9,7 +9,8 @@ <%= link_to journal.user, user_path(journal.user), :class => 'c_blue fb fl mb10', :target => "_blank" %> <%= format_time(journal.created_on) %>
    -

    <%= textilizable journal.notes%>

    + +

    <%=journal.notes.html_safe%>

    <% ids = 'project_respond_form_'+ journal.id.to_s%> diff --git a/app/views/users/_history.html.erb b/app/views/users/_history.html.erb index 8902b7dfc..d69b6b25b 100644 --- a/app/views/users/_history.html.erb +++ b/app/views/users/_history.html.erb @@ -11,7 +11,8 @@ <%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%><%= format_time(journal.created_on) %>
    -

    <%= textilizable journal.notes%>

    + +

    <%=journal.notes.html_safe%>

    <% ids = 'project_respond_form_'+ journal.id.to_s%> diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index af8be7197..7c8dd7f64 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -22,7 +22,7 @@ <% end %>

    - <%= reply.notes %> + <%= reply.notes.html_safe %>

    <%= format_time reply.created_on %> From 2a2b93c97df190329af0e710ab0f3dea2d59d304 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 12 Jun 2015 16:58:43 +0800 Subject: [PATCH 45/65] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A4=9A=E8=A1=8C=E4=B8=BB=E8=A7=82=E7=9A=84?= =?UTF-8?q?=E7=AD=94=E6=A1=88=E6=9C=89html=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index 73650a782..a222314ab 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -464,7 +464,7 @@ class PollController < ApplicationController sheet1[count_row + 1,0] = l(:label_poll_subtotal) sheet1[count_row + 2,0] = l(:label_poll_proportion) poll_question.poll_answers.each_with_index do |poll_answer,i| - sheet1[count_row, i + 1] = poll_answer.answer_text + sheet1[count_row, i + 1] = poll_answer.answer_text.gsub(/<\/?.*?>/,"").gsub(/ /," ") sheet1[count_row + 1, i + 1] = poll_answer.poll_votes.count sheet1[count_row + 2, i + 1] = statistics_result_percentage(poll_answer.poll_votes.count, total_answer(poll_question.id)).to_s + "%" end @@ -477,7 +477,7 @@ class PollController < ApplicationController sheet1[count_row,1] = poll_question.question_title count_row += 1 poll_question.poll_votes.each do |poll_vote| - sheet1[count_row,0] = poll_vote.vote_text + sheet1[count_row,0] = poll_vote.vote_text.gsub(/<\/?.*?>/,"").gsub(/ /," ") count_row += 1 end count_row += 1 From cd7bb85f2f777807576a1e6d4035080625aad22e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 12 Jun 2015 17:25:39 +0800 Subject: [PATCH 46/65] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A4=9A=E4=BA=86=E4=B8=80=E4=B8=AAc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/stores/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/stores/index.html.erb b/app/views/stores/index.html.erb index 84116a561..6fab364b5 100644 --- a/app/views/stores/index.html.erb +++ b/app/views/stores/index.html.erb @@ -35,7 +35,7 @@ <%= c1.downloads %>
    - <%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>c + <%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>
    <% end -%> From 5d88de3e6e87de3ca659a405ffddb5ad6593def6 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 12 Jun 2015 17:26:36 +0800 Subject: [PATCH 47/65] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=EF=BC=9A=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E9=A1=B9=E7=9B=AE=E5=AF=B9=E9=BD=90=E5=8F=8A=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applied_project/applied_join_project.js.erb | 1 + app/views/projects/_join_project.html.erb | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/views/applied_project/applied_join_project.js.erb b/app/views/applied_project/applied_join_project.js.erb index ab5cdd484..491b8aa0f 100644 --- a/app/views/applied_project/applied_join_project.js.erb +++ b/app/views/applied_project/applied_join_project.js.erb @@ -1,3 +1,4 @@ +// @status: 0 该项目不存在；1 不重复加入；2 成功加入； 3 已是项目成员；其它 加入失败 <% if @status == 0%> alert("<%= l('project.join.tips.notexist') %>"); <% elsif @status == 1%> diff --git a/app/views/projects/_join_project.html.erb b/app/views/projects/_join_project.html.erb index 1498830c5..53c149f82 100644 --- a/app/views/projects/_join_project.html.erb +++ b/app/views/projects/_join_project.html.erb @@ -21,7 +21,7 @@ .C_form{ margin:20px 0 0 60px;} .C_form ul li{ font-size:14px; color:#3f3a39; line-height:30px; padding-left: 60px;} .C_form ul li input{ margin-left:20px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; padding: 0 !important; } - .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:150px;} + .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:140px;} .width190{ width:190px; height:26px; border-color:#e1e1e1;} .C_form a{ font-size:12px; color:#15bccf; float:left; display:block; height:40px; width:200px; margin-top:25px;} .C_form a:hover{ text-decoration:underline;} @@ -52,25 +52,25 @@
    <%= form_tag({:controller => 'applied_project', - :action => 'applied_join_project'}, - :remote => true, - :method => :post, - :id => 'new-watcher-form') do %> + :action => 'applied_join_project'}, + :remote => true, + :method => :post, + :id => 'new-watcher-form') do %> From ab64b38cee7fdc03f13aaf0082f3dfee9eda7af7 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Fri, 12 Jun 2015 17:26:40 +0800 Subject: [PATCH 48/65] =?UTF-8?q?=E7=95=99=E8=A8=80=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E6=B8=85=E9=99=A4=E7=BC=96=E8=BE=91=E6=A1=86?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_jours.html.erb | 4 ++++ app/views/words/_new.html.erb | 1 + app/views/words/create.js.erb | 3 +++ 3 files changed, 8 insertions(+) diff --git a/app/views/users/_user_jours.html.erb b/app/views/users/_user_jours.html.erb index 3d7496fb2..ee8d14841 100644 --- a/app/views/users/_user_jours.html.erb +++ b/app/views/users/_user_jours.html.erb @@ -213,9 +213,13 @@ params.textarea = $("textarea[nhname='new_message_textarea']",params.div_form); params.contentmsg = $("p[nhname='contentmsg']",params.div_form); params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form); + params.cancel_btn = $("#new_message_cancel_btn"); if(params.textarea.data('init') == undefined){ params.editor = init_editor(params); init_form(params); + params.cancel_btn.click(function(){ + nh_reset_form(params); + }); // $("a[nhname='cancel_btn']",params.div_form).click(function(){ // nh_reset_form(params); // }); diff --git a/app/views/words/_new.html.erb b/app/views/words/_new.html.erb index e81368c1f..0c624ce3d 100644 --- a/app/views/words/_new.html.erb +++ b/app/views/words/_new.html.erb @@ -57,6 +57,7 @@

    <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-top: 5px;"%> + <%else %>
    <%= l(:label_user_login_tips) %> diff --git a/app/views/words/create.js.erb b/app/views/words/create.js.erb index 4bf7fb244..16f26d5f7 100644 --- a/app/views/words/create.js.erb +++ b/app/views/words/create.js.erb @@ -3,4 +3,7 @@ $('#history').html('<%= escape_javascript(render(:partial => 'users/history',:lo $('#jour_count').html('<%= @obj_count%>') $('#pre_show').html('<%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>'); $('#new_form_user_message').val(""); +if($('#new_message_cancel_btn') != undefined && $('#new_message_cancel_btn').length!=0){ + $('#new_message_cancel_btn').click(); +} $('#new_form_reference_user_id').val(""); \ No newline at end of file From d9157965e9625c6075beed094b0008bfa584d8d8 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Fri, 12 Jun 2015 17:49:06 +0800 Subject: [PATCH 49/65] ... --- app/views/layouts/base_projects.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index faf73918d..044714a34 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -107,7 +107,7 @@
    <% if User.current.member_of?(@project) %> - +
    • <%= link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %>
      • <% if User.current.allowed_to?(:manage_members, @project) %> From 2acab1719eaa5f9cd85ebfc97b89987bb6acc22f Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 12 Jun 2015 17:50:05 +0800 Subject: [PATCH 50/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=8A=E9=9D=A2=E8=A2=AB=E6=88=AA=E5=8F=96?= =?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/attachments/_project_file_links.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb index fe0e9ab97..b6d934c64 100644 --- a/app/views/attachments/_project_file_links.html.erb +++ b/app/views/attachments/_project_file_links.html.erb @@ -29,7 +29,7 @@ <% is_float ||= false %> <% for attachment in attachments %>
      -

      +

      <%if is_float%>

      <% end%> From a600d936305340e0a19368445163be8bccfe828b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 13 Jun 2015 09:23:04 +0800 Subject: [PATCH 51/65] 111 --- app/views/layouts/base_projects.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index faf73918d..734a0e2e8 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -107,7 +107,9 @@
      <% if User.current.member_of?(@project) %> - +
      • <%= link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %>
        • <% if User.current.allowed_to?(:manage_members, @project) %> From b42d5e36671ce54f265a637a0f4c2601cbf5cf83 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Sat, 13 Jun 2015 09:23:26 +0800 Subject: [PATCH 52/65] ... --- public/assets/kindeditor/kindeditor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 5ebe96a32..a728d4f85 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -5620,8 +5620,8 @@ _plugin('core', function(K) { afterUpload : function(data) { if (data.error === 0) { var url = K.formatUrl(data.url, 'absolute'); - //self.exec('insertimage', url, 'image','','','1','left'); - self.insertHtml(''); + self.exec('insertimage', url, 'image','','','1','left'); + //self.insertHtml(''); var asset_id = data.asset_id; if ( asset_id != "" && parent.document.getElementById('asset_id') != null ) { parent.document.getElementById('asset_id').value += asset_id.toString(); From 0f96fd81c10bf1b36eea9e1b0a45bfec54483920 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Sat, 13 Jun 2015 09:35:22 +0800 Subject: [PATCH 53/65] ... --- public/assets/kindeditor/kindeditor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index a728d4f85..b2c13c3f7 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -5620,8 +5620,8 @@ _plugin('core', function(K) { afterUpload : function(data) { if (data.error === 0) { var url = K.formatUrl(data.url, 'absolute'); - self.exec('insertimage', url, 'image','','','1','left'); - //self.insertHtml(''); + //self.exec('insertimage', url, 'image','','','1','left'); + self.insertHtml(''); var asset_id = data.asset_id; if ( asset_id != "" && parent.document.getElementById('asset_id') != null ) { parent.document.getElementById('asset_id').value += asset_id.toString(); From a7086c9208a1643ef6f40ffac43db24ee0fa7806 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 13 Jun 2015 09:37:45 +0800 Subject: [PATCH 54/65] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E2=80=9C?= =?UTF-8?q?=E6=94=B6=E8=B5=B7git=E8=AF=B4=E9=9D=A2=E2=80=9D=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E7=BB=8F=E8=BF=87=E5=8F=98=E6=88=90=E6=89=8B=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index a128f917a..474ac638f 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -29,7 +29,7 @@

      -
      展开Git操作指南
      +
      展开Git操作指南

      From 29b2018a5a60ca260ed97f19c4f42d43ce64244c Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Sat, 13 Jun 2015 09:41:35 +0800 Subject: [PATCH 55/65] =?UTF-8?q?bug#2779:=E6=90=9C=E7=B4=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8E=E6=B2=A1=E6=9C=89=E5=86=92=E5=8F=B7=EF=BC=8C=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=90=8E=E5=8F=88=E6=9C=89=E5=86=92=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BA=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=86=92=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_user_show.html.erb b/app/views/users/_user_show.html.erb index 3bea6d420..8e3d27666 100644 --- a/app/views/users/_user_show.html.erb +++ b/app/views/users/_user_show.html.erb @@ -42,7 +42,7 @@ <%# memberships = user.memberships.all(:conditions => cond) %> <% user_courses = user_courses_list(user) %> <%= l(:label_x_course_contribute_to, :count => user_courses.count) %> - <%= "：" unless user_courses.empty? %> + <%#= "：" unless user_courses.empty? %> <% for course in user_courses %> <%# if course.name != nil %> <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.host_course} %><%= (user_courses.last == course) ? '' : '，' %> From 17294ec7ae5efc8224b9400e9f03382f8c2399be Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 13 Jun 2015 09:53:46 +0800 Subject: [PATCH 56/65] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=EF=BC=9A=E5=8A=A0=E5=85=A5=E5=A4=B1=E8=B4=A5=E4=B8=8D=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/applied_project/applied_join_project.js.erb | 1 + app/views/projects/_join_project.html.erb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/applied_project/applied_join_project.js.erb b/app/views/applied_project/applied_join_project.js.erb index 491b8aa0f..846d2a61d 100644 --- a/app/views/applied_project/applied_join_project.js.erb +++ b/app/views/applied_project/applied_join_project.js.erb @@ -5,6 +5,7 @@ alert("<%= l('project.join.tips.repeat') %>"); <% elsif @status == 2%> alert("<%= l('project.join.tips.success') %>"); + hideModal($("#popbox")); <% elsif @status == 3%> alert("<%= l('project.join.tips.has') %>"); <%else%> diff --git a/app/views/projects/_join_project.html.erb b/app/views/projects/_join_project.html.erb index 53c149f82..c650035f8 100644 --- a/app/views/projects/_join_project.html.erb +++ b/app/views/projects/_join_project.html.erb @@ -31,7 +31,6 @@ \ No newline at end of file From 06009934d8426f6a1122152387831315c32943cb Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 13 Jun 2015 15:17:59 +0800 Subject: [PATCH 65/65] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=BC=96=E8=BE=91=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/news/_project_form.html.erb | 2 +- app/views/news/_project_show.html.erb | 58 --------------------------- public/javascripts/project.js | 7 +++- 3 files changed, 7 insertions(+), 60 deletions(-) diff --git a/app/views/news/_project_form.html.erb b/app/views/news/_project_form.html.erb index 33613e5a7..b9698497d 100644 --- a/app/views/news/_project_form.html.erb +++ b/app/views/news/_project_form.html.erb @@ -28,7 +28,7 @@ <%= link_to l(:button_create), "javascript:void(0)", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fl c_white' %> <%= link_to l(:button_cancel), project_news_index_path(@project), :onclick => '$("#add-news").hide()', :class => 'blue_btn grey_btn fl c_white' %> <% else %> - <%= link_to l(:button_save), "javascript:void(0)", :onclick => "submitNews();",:onmouseover => 'this.focus()',:class => 'blue_btn fl c_white' %> + <%= link_to l(:button_save), "javascript:void(0)", :onclick => "submitNews();",:onmouseover => 'this.focus()',:class => 'blue_btn fl c_white'%> <%= link_to l(:button_cancel), news_path(@news), :class => 'blue_btn grey_btn fl c_white' %> <% end %>
      diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb index f95192d64..3ffbe6554 100644 --- a/app/views/news/_project_show.html.erb +++ b/app/views/news/_project_show.html.erb @@ -1,64 +1,6 @@

      <%= l(:label_news) %>

      - <% if authorize_for('news', 'edit') %>