+ <% if @org_logo_attchment.blank? || !User.current.logged? %>
+
- 杩熶氦鎵ｅ垎锛歿{act.homework_common_detail.late_penalty}}鍒 鍖胯瘎寮鍚椂闂达細{{act.homework_common_detail.evaluation_start}}
- 缂鸿瘎鎵ｅ垎锛歿{act.homework_common_detail.absence_penalty}}鍒/浣滃搧 鍖胯瘎鍏抽棴鏃堕棿锛歿{act.homework_common_detail.evaluation_end}}
+ 杩熶氦鎵ｅ垎锛歿{act.homework_common_detail.late_penalty}}鍒 鍖胯瘎寮鍚椂闂达細{{act.homework_common_detail.evaluation_start}}
+ 缂鸿瘎鎵ｅ垎锛歿{act.homework_common_detail.absence_penalty}}鍒/浣滃搧 鍖胯瘎鍏抽棴鏃堕棿锛歿{act.homework_common_detail.evaluation_end}}
@@ -215,5 +216,6 @@
var postContent = $("#message_description_<%= @article.id %>").html();
postContent = postContent.replace(/ /g," ");
$("#message_description_<%= @article.id %>").html(postContent);
+ autoUrl('message_description_<%= @article.id %>');
});
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index f0b082860..dd818fe72 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -43,8 +43,8 @@
<% count=activity.children.count%>
<% end %>
- 鍙戝笘鏃堕棿锛<%= format_time(activity.created_on) %>
- 鏇存柊鏃堕棿锛<%= format_time(activity.updated_on) %>
+ 鍙戝竷锛<%= format_time(activity.created_on) %>
+ 鏇存柊锛<%= format_time(activity.updated_on) %>
<%= count>0 ? "#{count}" :"0" %> 鍥炲 diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb index 27b3863b0..80c2ef5cc 100644 --- a/app/views/courses/_show_member_score.html.erb +++ b/app/views/courses/_show_member_score.html.erb @@ -8,19 +8,19 @@ .tscore_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto; text-align: center; padding-top:5px;} - .tscore_box{ width:350px; margin:15px auto;} + .tscore_box{ width:370px; margin:15px auto;} .tscore_box li{ height:25px;}
<%= @member_score.user.name %> 鍘嗘浣滀笟绉垎
--
+
- 浣滀笟鍚嶇О寰楀垎 - <% @member_score.homework_common_list.each do |homework_common| %> + <% @member_score.homework_common_list.each_with_index do |homework_common, index| %>
-
<% final_score = @member_score.homework_common_score(homework_common).first%>
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index 8be245958..66bc8ff9a 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -120,6 +120,7 @@
@@ -214,5 +215,6 @@ postContent=postContent.replace(/ /g," "); $(this).html(postContent); }); + autoUrl('message_description_<%= @article.id %>'); }); \ No newline at end of file diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb index ad3ce7a3e..66b68e895 100644 --- a/app/views/files/_org_subfield_list.html.erb +++ b/app/views/files/_org_subfield_list.html.erb @@ -8,7 +8,7 @@ <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>-+<%# 濡傛灉鏈夊巻鍙茬増鏈垯鎻愪緵鍘嗗彶鐗堟湰涓嬭浇 %> <% if file.attachment_histories.count == 0 %> <%= link_to file.is_public? ? truncate(file.filename, length: 45) : truncate(file.filename,length: 35, omission: '...'), diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb index 2ee726d77..831dc0e68 100644 --- a/app/views/files/_project_list.html.erb +++ b/app/views/files/_project_list.html.erb @@ -7,7 +7,7 @@ <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>-+<%# 濡傛灉鏈夊巻鍙茬増鏈垯鎻愪緵鍘嗗彶鐗堟湰涓嬭浇 %> <% if file.attachment_histories.count == 0 %> <%= link_to truncate(file.filename,length: 35, omission: '...'), diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb index 20ffb1e50..2a03723ca 100644 --- a/app/views/files/_resource_detail.html.erb +++ b/app/views/files/_resource_detail.html.erb @@ -5,7 +5,7 @@ <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>-+<%# 濡傛灉鏈夊巻鍙茬増鏈垯鎻愪緵鍘嗗彶鐗堟湰涓嬭浇 %> <% if file.attachment_histories.count == 0 %> <%= link_to truncate(file.filename,length: 35, omission: '...'), diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb index 08c030f90..ed90453ac 100644 --- a/app/views/forums/_show_topics.html.erb +++ b/app/views/forums/_show_topics.html.erb @@ -1,6 +1,12 @@<% if memos.any? %> <% memos.each do |topic| %> +@@ -16,7 +22,7 @@ <%= get_praise_num(topic)%>-<%= topic.content.html_safe%> +<%= topic.content.html_safe%><% author = topic.last_reply.try(:author)%> diff --git a/app/views/issues/_detail.html.erb b/app/views/issues/_detail.html.erb index 92021f728..03c420c99 100644 --- a/app/views/issues/_detail.html.erb +++ b/app/views/issues/_detail.html.erb @@ -28,7 +28,7 @@ <%= render :partial => 'action_menu' %> <% if @issue.description? || @issue.attachments.any? -%> -++ + \ No newline at end of file diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb index 4c8dfa1d9..197cd9c02 100644 --- a/app/views/issues/_issue_replies.html.erb +++ b/app/views/issues/_issue_replies.html.erb @@ -3,6 +3,7 @@ <% replies_all_i=replies_all_i + 1 %> @@ -11,7 +12,7 @@ <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "鐢ㄦ埛澶村儚" %><% if @issue.description? %> <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %> <%= textAreailizable @issue, :description, :attachments => @issue.attachments %> @@ -43,4 +43,11 @@ <%= render :partial => 'issues/attributes_show' %> -\ No newline at end of file +-+<% if reply.try(:user).try(:realname) == ' ' %> <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 9b481fac5..799aaa42b 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -46,7 +46,7 @@ scrollPic.speed = 10; //绉诲姩閫熷害(鍗曚綅姣锛岃秺灏忚秺蹇) scrollPic.space = 10; //姣忔绉诲姩鍍忕礌(鍗曚綅px锛岃秺澶ц秺蹇) - scrollPic.autoPlay = true; //鑷姩鎾斁 + scrollPic.autoPlay = false; //鑷姩鎾斁 scrollPic.autoPlayTime = 3; //鑷姩鎾斁闂撮殧鏃堕棿(绉) scrollPic.initialize(); //鍒濆鍖 @@ -60,13 +60,12 @@- <%= render :partial => 'organizations/org_logined_header' %> diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 83b90dc93..3524de0c8 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -94,12 +94,12 @@ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>-@@ -147,6 +148,7 @@ postContent=postContent.replace(/ /g," "); $(this).html(postContent); }); + autoUrl('activity_description_<%= @memo.id %>'); description_show_hide(<%= @memo.id %>); }); \ No newline at end of file diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index 33c9d7f8d..443440455 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -109,6 +109,7 @@<%= reply.author.name%><%= format_date(reply.created_at) %>+<%= reply.author.name%><%= format_date(reply.created_at) %><%= reply.content.html_safe%>@@ -188,5 +189,6 @@ postContent=postContent.replace(/ /g," "); $(this).html(postContent); }); + autoUrl('message_description_<%= @topic.id %>'); }); diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb index 4d5af61dd..145afcfd7 100644 --- a/app/views/messages/_org_subfield_show.html.erb +++ b/app/views/messages/_org_subfield_show.html.erb @@ -138,6 +138,7 @@@@ -210,5 +211,6 @@ postContent=postContent.replace(/ /g," "); $(this).html(postContent); }); + autoUrl('message_description_<%= @topic.id %>'); }); diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index 10046bce2..35b3f8a3c 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -165,6 +165,7 @@@@ -245,5 +246,6 @@ postContent=postContent.replace(/ /g," "); $(this).html(postContent); }); + autoUrl('message_description_<%= @topic.id %>'); }); diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb index 46346eb71..5908c7593 100644 --- a/app/views/news/_course_show.html.erb +++ b/app/views/news/_course_show.html.erb @@ -115,6 +115,7 @@@@ -210,5 +211,6 @@ postContent=postContent.replace(/ /g," "); $(this).html(postContent); }); + autoUrl('message_description_<%= @news.id %>'); }); diff --git a/app/views/news/_organization_show.html.erb b/app/views/news/_organization_show.html.erb index 640854164..7eecf43ab 100644 --- a/app/views/news/_organization_show.html.erb +++ b/app/views/news/_organization_show.html.erb @@ -97,6 +97,7 @@@@ -185,5 +186,6 @@ postContent=postContent.replace(/ /g," "); $(this).html(postContent); }); + autoUrl('message_description_<%= @news.id %>'); }); diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb index 6b91c98ed..6b3824222 100644 --- a/app/views/news/_project_show.html.erb +++ b/app/views/news/_project_show.html.erb @@ -107,6 +107,7 @@@@ -195,5 +196,6 @@ postContent=postContent.replace(/ /g," "); $(this).html(postContent); }); + autoUrl('message_description_<%= @news.id %>'); }); diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb index 787bd3185..1e830d7bc 100644 --- a/app/views/org_document_comments/destroy.js.erb +++ b/app/views/org_document_comments/destroy.js.erb @@ -1,6 +1,6 @@ //location.reload(); <% if params[:detail_page] %> - window.location.href = '<%= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>'; + window.location.href = '<%= org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @sub_domain.id)%>'; <% else %> window.location.reload(); <% end %> \ No newline at end of file diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index f5b186197..e2967a9ae 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -84,6 +84,7 @@ <% user = User.find(reply.creator_id) %> @@ -158,6 +159,7 @@ postContent=postContent.replace(/ /g," "); $(this).html(postContent); }); + autoUrl('intro_content_<%= @document.id %>'); }); function expand_reply(container, btnid) { var target = $(container); diff --git a/app/views/organizations/_org_course_create.html.erb b/app/views/organizations/_org_course_create.html.erb index a09246dc7..97bc0e353 100644 --- a/app/views/organizations/_org_course_create.html.erb +++ b/app/views/organizations/_org_course_create.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.teacher} %>-+<% if activity.try(:teacher).try(:realname) == ' ' %> <%= link_to activity.try(:teacher), user_url_in_org(activity.tea_id), :class => "newsBlue mr15" %> <% else %> @@ -39,4 +39,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index b4ca46959..d3fe36fe3 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -6,7 +6,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>-+<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %> <% else %> @@ -210,9 +210,9 @@<% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_url_in_org(project.id),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚" %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_url_in_org(project.id),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚" %> <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚") %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚") %> <% end %> <% com_time = project.project_score.commit_time %> <% time=project.updated_on %> @@ -315,6 +315,7 @@ <% replies_all_i = replies_all_i + 1 %> diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb index 56dafed08..e68745f7a 100644 --- a/app/views/organizations/_org_course_message.html.erb +++ b/app/views/organizations/_org_course_message.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -100,6 +100,7 @@ <% replies_all_i=replies_all_i+1 %> @@ -108,7 +109,7 @@ <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% if reply.try(:author).try(:realname) == ' ' %> <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb index a6183e891..acf0f0377 100644 --- a/app/views/organizations/_org_course_news.html.erb +++ b/app/views/organizations/_org_course_news.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if @ctivity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -69,6 +69,7 @@ <% replies_all_i = replies_all_i + 1 %> @@ -77,7 +78,7 @@ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% end %> <% end %> diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb index fc6cc6ee0..61bc5bc7f 100644 --- a/app/views/organizations/_org_subfield_message.html.erb +++ b/app/views/organizations/_org_subfield_message.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %><% if comment.try(:author).try(:realname) == ' ' %> <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/organizations/_org_course_poll.html.erb b/app/views/organizations/_org_course_poll.html.erb index cb390f7f5..2958df0ca 100644 --- a/app/views/organizations/_org_course_poll.html.erb +++ b/app/views/organizations/_org_course_poll.html.erb @@ -9,7 +9,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>-@@ -263,7 +262,7 @@+<% else %><% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %> <% else %> diff --git a/app/views/organizations/_org_logined_header.html.erb b/app/views/organizations/_org_logined_header.html.erb index 22cf920e9..74e313f6a 100644 --- a/app/views/organizations/_org_logined_header.html.erb +++ b/app/views/organizations/_org_logined_header.html.erb @@ -1,37 +1,31 @@ <% if User.current.logged? %> -<% elsif act.org_act_type == "News" %> <% activity = News.find(act.org_act_id) %> @@ -217,7 +216,7 @@-<% elsif act.org_act_type == "Message" %> <% activity = Message.find(act.org_act_id) %> @@ -137,7 +136,7 @@- + +<% else %> -- + <% end %> diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb index 98c1e2df3..9ca10c91d 100644 --- a/app/views/organizations/_org_project_issue.html.erb +++ b/app/views/organizations/_org_project_issue.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-<% end %> <% end %> @@ -119,7 +118,7 @@+<% elsif act.org_act_type == "Poll" %> <% activity = Poll.find(act.org_act_id) %> @@ -88,7 +87,7 @@<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -80,6 +80,7 @@ <% replies_all_i=replies_all_i + 1 %> @@ -88,7 +89,7 @@ <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_url_in_org(reply.user_id), :alt => "鐢ㄦ埛澶村儚" %>--+<% elsif act.org_act_type == "News" %> <% activity = News.find(act.org_act_id) %> @@ -63,7 +62,7 @@<% if reply.try(:user).try(:realname) == ' ' %> <%= link_to reply.try(:user), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/organizations/_org_subfield_leftM1.html.erb b/app/views/organizations/_org_subfield_leftM1.html.erb index e7481ce0a..ed3bcba7e 100644 --- a/app/views/organizations/_org_subfield_leftM1.html.erb +++ b/app/views/organizations/_org_subfield_leftM1.html.erb @@ -1,4 +1,3 @@ - <% if is_default_field?(field) %> <% case field.name %> <% when 'course' %> @@ -26,7 +25,7 @@<% elsif act.org_act_type == "Message" %> <% activity = Message.find(act.org_act_id) %> @@ -44,7 +43,7 @@-<%= activity.description.to_s.html_safe %><%=link_to "鏌ョ湅鍏ㄦ枃>>", activity.name.to_s, student_work_index_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>+<%=link_to "鏌ョ湅鍏ㄦ枃>>", student_work_index_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>-<%= activity.content.to_s.html_safe %><%=link_to "鏌ョ湅鍏ㄦ枃>>", activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>+<%=link_to "鏌ョ湅鍏ㄦ枃>>", board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %><%= activity.description.to_s.html_safe %><%=link_to "鏌ョ湅鍏ㄦ枃>>", activity.title.to_s, news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>+<%=link_to "鏌ョ湅鍏ㄦ枃>>", news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>-<%= activity.polls_description.to_s.html_safe %><%=link_to "鏌ョ湅鍏ㄦ枃>>", poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class => "sn-link-grey2 sn-fr" %>+<%=link_to "鏌ョ湅鍏ㄦ枃>>", Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class => "sn-link-grey2 sn-fr" %>-<%= activity.description.to_s.html_safe %><%=link_to "鏌ョ湅鍏ㄦ枃>>", activity.subject.to_s, issue_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>+<%=link_to "鏌ョ湅鍏ㄦ枃>>", issue_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>-<%= activity.content.to_s.html_safe %><%=link_to "鏌ョ湅鍏ㄦ枃>>", activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>+<%=link_to "鏌ョ湅鍏ㄦ枃>>", board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>-<%= content.to_s.html_safe %><%=link_to "鏌ョ湅鍏ㄦ枃>>", message.parent_id.nil? ? message.subject.to_s.html_safe : message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>+<%=link_to "鏌ョ湅鍏ㄦ枃>>", board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>@@ -239,9 +238,9 @@<% if message.parent_id.nil? %> - <%=link_to "鏌ョ湅鍏ㄦ枃>>", message.subject.to_s.html_safe, board_message_path(message.board,message), :target => "_blank", :class => "sn-link-grey2 sn-fr" %> + <%=link_to "鏌ョ湅鍏ㄦ枃>>", board_message_path(message.board,message), :target => "_blank", :class => "sn-link-grey2 sn-fr" %> <% else %> - <%=link_to "鏌ョ湅鍏ㄦ枃>>", message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => "_blank", :class => "sn-link-grey2 sn-fr" %> + <%=link_to "鏌ョ湅鍏ㄦ枃>>", board_message_path(message.board,activity), :target => "_blank", :class => "sn-link-grey2 sn-fr" %> <% end %>-<%= news.description.to_s.html_safe %><%=link_to "鏌ョ湅鍏ㄦ枃>>", news.title.to_s, news_path(news), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>+<%=link_to "鏌ョ湅鍏ㄦ枃>>", news_path(news), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -105,6 +105,7 @@ <% replies_all_i=replies_all_i+1 %> @@ -113,7 +114,7 @@ <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% if reply.try(:author).try(:realname) == ' ' %> <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb index daa81e96c..5d6c38542 100644 --- a/app/views/organizations/_org_subfield_news.html.erb +++ b/app/views/organizations/_org_subfield_news.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -89,6 +89,7 @@ <% replies_all_i = replies_all_i + 1 %> @@ -97,7 +98,7 @@ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% if comment.try(:author).try(:realname) == ' ' %> <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/organizations/_project_create.html.erb b/app/views/organizations/_project_create.html.erb index ef59d154e..9a4f00a9a 100644 --- a/app/views/organizations/_project_create.html.erb +++ b/app/views/organizations/_project_create.html.erb @@ -7,7 +7,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>-+<% if user.try(:realname) == ' ' %> <%= link_to user, user_url_in_org(user.id), :class => "newsBlue mr15" %> <% else %> @@ -41,4 +41,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb index 26cf3b318..e1b000c70 100644 --- a/app/views/organizations/_project_message.html.erb +++ b/app/views/organizations/_project_message.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -79,6 +79,7 @@ <% replies_all_i=replies_all_i+1 %> @@ -87,7 +88,7 @@ <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "鐢ㄦ埛澶村儚" %>-+diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 2caeee726..0c8af8471 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -109,9 +109,14 @@<% if reply.try(:author).try(:realname) == ' ' %> <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb index 63eb1808b..ecb5ebb25 100644 --- a/app/views/organizations/_show_home_page.html.erb +++ b/app/views/organizations/_show_home_page.html.erb @@ -59,6 +59,7 @@ postContent=postContent.replace(/ /g," "); $(this).html(postContent); }); + autoUrl('intro_content_<%= document.id %>'); function expand_reply(container, btnid) { var target = $(container); var btn = $(btnid); diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 6012dd0d4..e8f531206 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -88,6 +88,12 @@<% unless comment.content.blank? %> -
-
<% reply_id = 0 %>
<% comments_for_doc.each do |comment| %>
+
<% reply_id += 1 %>
-
<%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "鐢ㄦ埛澶村儚"), user_url_in_org(comment.creator_id) %>@@ -104,7 +110,7 @@
<%= comment.content.html_safe %>+<%= comment.content.html_safe %><% end %>娣诲姞鎴愬憳
- <%= form_tag url_for(:controller => 'org_member',:action => 'create',:org=>@organization),:id=>'org_member_add_form',:remote=>true do |f|%> + <%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id=>'org_member_add_form',:remote=>true do |f|%> - <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %> + <%# if @organization.secdomain_name.nil? %> + <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %> + <%# else %> + <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %> + <%# end %> +<%= find_user_not_in_current_org_by_name(@project) %>diff --git a/app/views/organizations/teachers.html.erb b/app/views/organizations/teachers.html.erb index c368adef7..dac36f7a5 100644 --- a/app/views/organizations/teachers.html.erb +++ b/app/views/organizations/teachers.html.erb @@ -9,8 +9,7 @@- <%= form_tag( url_for(:controller => 'organizations', :action => 'teachers', :type => @type), - :remote => true , :method => 'get', :id => 'resource_search_form') do %> + <%= form_tag(url_for(:controller => 'organizations', :action => 'teachers', :type => @type), :remote => true , :method => 'get', :id => 'resource_search_form') do %> <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %> diff --git a/app/views/projects/_attachment_acts.html.erb b/app/views/projects/_attachment_acts.html.erb index de0820bff..0ecfa9be7 100644 --- a/app/views/projects/_attachment_acts.html.erb +++ b/app/views/projects/_attachment_acts.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> diff --git a/app/views/projects/_project_create.html.erb b/app/views/projects/_project_create.html.erb index bd118418d..2e7a919d1 100644 --- a/app/views/projects/_project_create.html.erb +++ b/app/views/projects/_project_create.html.erb @@ -7,7 +7,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>-+<% if user.try(:realname) == ' ' %> <%= link_to user, user_path(user), :class => "newsBlue mr15" %> <% else %> @@ -41,4 +41,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb index 8756ff26f..6d97b252d 100644 --- a/app/views/projects/_project_news.html.erb +++ b/app/views/projects/_project_news.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -69,6 +69,7 @@ <% replies_all_i = replies_all_i + 1 %> @@ -77,7 +78,7 @@ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% if comment.try(:author).try(:realname) == ' ' %> <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> <% else %> @@ -125,4 +126,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 276283e97..43be57760 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -1,7 +1,7 @@ <%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>- + ZIP涓嬭浇<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb index 8e7d87302..96e43af46 100644 --- a/app/views/student_work/index.html.erb +++ b/app/views/student_work/index.html.erb @@ -69,16 +69,21 @@- <% if @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status < 2 %> -鎻愪氦鎴鏃堕棿锛<%= @homework.end_time %> 23:59- <% elsif @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status >= 2 && @homework.anonymous_comment == 0 %> -鍖胯瘎鎴鏃堕棿锛<%= @homework.homework_detail_manual.evaluation_end %> 23:59- <% end %> - <% if @homework.homework_detail_manual.comment_status == 0 %> -鍙戝竷鏃堕棿锛<%= @homework.publish_time %> 00:00+ <% if @homework.end_time && @homework.publish_time %> + <% if @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status < 2 %> +鎻愪氦鎴鏃堕棿锛<%= @homework.end_time %> 23:59+ <% elsif @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status >= 2 && @homework.anonymous_comment == 0 %> +鍖胯瘎鎴鏃堕棿锛<%= @homework.homework_detail_manual.evaluation_end %> 23:59+ <% end %> + <% if @homework.homework_detail_manual.comment_status == 0 %> +鍙戝竷鏃堕棿锛<%= @homework.publish_time %> 00:00+ <% end %> <% end %> <% if @homework.homework_detail_manual%> <% if @homework.homework_detail_manual.comment_status == 1%> diff --git a/app/views/sub_document_comments/show.html.erb b/app/views/sub_document_comments/show.html.erb index 3155c178b..fc35d00cb 100644 --- a/app/views/sub_document_comments/show.html.erb +++ b/app/views/sub_document_comments/show.html.erb @@ -97,6 +97,7 @@ <% user = User.find(reply.creator_id) %> @@ -164,6 +165,7 @@ postContent=postContent.replace(/ /g," "); $(this).html(postContent); }); + autoUrl('intro_content_<%= @document.id %>'); var replyCount = $(".homepagePostReplyContainer").size(); if (replyCount >3){ for(var i= 3; i < replyCount+1; i++){ diff --git a/app/views/users/_apply_for_resource.html.erb b/app/views/users/_apply_for_resource.html.erb new file mode 100644 index 000000000..1a0df801b --- /dev/null +++ b/app/views/users/_apply_for_resource.html.erb @@ -0,0 +1,16 @@ ++\ No newline at end of file diff --git a/app/views/users/_apply_resource.html.erb b/app/views/users/_apply_resource.html.erb new file mode 100644 index 000000000..2f5732030 --- /dev/null +++ b/app/views/users/_apply_resource.html.erb @@ -0,0 +1,28 @@ ++++ <% if state == 2 %> + 璇锋眰宸插彂閫佽嚦<%= attachment.author.show_name %>锛屽笇鏈涗粬鍚屾剰涓庝綘鍒嗕韩锛氾級 + <% elsif state == 3 %> + 鎮ㄥ凡鍙戦佽繃鍒嗕韩璇锋眰锛岃鍕块噸澶嶅彂閫併 + <% end %> +
++ + 纭 瀹 + ++++ \ No newline at end of file diff --git a/app/views/users/_apply_resource_course_message.html.erb b/app/views/users/_apply_resource_course_message.html.erb new file mode 100644 index 000000000..fd493daf2 --- /dev/null +++ b/app/views/users/_apply_resource_course_message.html.erb @@ -0,0 +1,38 @@ ++ <%= form_tag(apply_for_resource_user_path(:id => User.current.id, :attachment_id => attachment.id), :multipart => true, :remote => true, :name=>"apply_for_homework_form", :id=>'apply_for_homework_form') do %> ++鐢宠鍒嗕韩
++ 鐢宠璇存槑锛堝繀閫夛級锛 + +
+ ++ + 纭 瀹 + ++ <% end %> +- + +
+- + <%= link_to ma.course_message.user.show_name, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> + ">鐢宠寮曠敤璧勬簮锛 +
+- + <% content = ma.course_message.content.nil? ? '' : '锛'+ ma.course_message.content.to_s %> + <% show_content = ma.course_message.user.show_name + "鐢宠寮曠敤璧勬簮\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %> + <% if ma.course_message.container_type == "Course" %> + <%= link_to show_content, course_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> + <% elsif ma.course_message.container_type == "Project" %> + <%= link_to show_content, project_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> + <% elsif ma.course_message.container_type == "OrgSubfield" %> + <%= link_to show_content, org_subfield_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> + <% else %> + "> + <%= show_content %> + + <% end %> +
+ +- + + <% if ma.apply_result == 0 || ma.apply_result.nil? %> + <%= link_to '鍚屾剰', deal_with_apply_resource_user_path(User.current, :agree => 'Y', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %> | + <%= link_to '鎷掔粷', deal_with_apply_resource_user_path(User.current, :agree => 'N', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %> + <% elsif ma.apply_result == 1 %> + 鎮ㄥ凡缁忓悓鎰忎簡璇ョ敵璇 + <% elsif ma.apply_result == 2 %> + 鎮ㄥ凡缁忔嫆缁濅簡璇ョ敵璇 + <%end %> + +
+- <%= time_tag(ma.created_at).html_safe %>
\ No newline at end of file diff --git a/app/views/users/_apply_resource_course_message_reply.html.erb b/app/views/users/_apply_resource_course_message_reply.html.erb new file mode 100644 index 000000000..2aff99c17 --- /dev/null +++ b/app/views/users/_apply_resource_course_message_reply.html.erb @@ -0,0 +1,34 @@ +-
+
- + <% owner = User.find(ma.course_message.apply_user_id) %> + + +
- + <%= link_to owner.show_name, user_path(owner), :class => "newsBlue homepageNewsPublisher" %> + "><%= ma.apply_result == 2 ? '鍚屾剰' : '鎷掔粷'%>寮曠敤璧勬簮锛 + +
- + <% link_str = ma.apply_result == 2 ? + '鎮ㄧ敵璇峰紩鐢ㄨ祫婧"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"鐨勭敵璇峰凡閫氳繃' + : + '鎮ㄧ敵璇峰紩鐢ㄨ祫婧"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"鐨勭敵璇疯濠夋嫆' %> + <% if ma.course_message.container_type == "Course" %> + <%= link_to link_str, course_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> + <% elsif ma.course_message.container_type == "Project" %> + <%= link_to link_str, project_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> + <% elsif ma.course_message.container_type == "OrgSubfield" %> + <%= link_to link_str, org_subfield_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> + <% else %> + "> + <%= link_str %> + + <% end %> + + + <%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> + + +
- <%= time_tag(ma.created_at).html_safe %> +
-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -43,4 +43,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb index c92d117ee..bf23d9a97 100644 --- a/app/views/users/_course_boardlist.html.erb +++ b/app/views/users/_course_boardlist.html.erb @@ -45,8 +45,8 @@<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %>
- 鍙戝笘鏃堕棿锛<%= format_time(activity.created_on) %> - 鏇存柊鏃堕棿锛<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %> + 鍙戝笘锛<%= format_time(activity.created_on) %> + 鏇存柊锛<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %> <% count=0 %> <% if activity.parent %> <% count=activity.parent.children.count%> diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb index 6b2234337..83c703905 100644 --- a/app/views/users/_course_create.html.erb +++ b/app/views/users/_course_create.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.teacher} %>-+<% if activity.try(:teacher).try(:realname) == ' ' %> <%= link_to activity.try(:teacher), user_path(activity.tea_id), :class => "newsBlue mr15" %> <% else %> @@ -39,4 +39,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 28f0f99db..3721244ed 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -6,7 +6,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>-+<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %> <% else %> @@ -216,9 +216,9 @@<% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚" %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚" %> <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚") %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚") %> <% end %> <% com_time = project.project_score.commit_time %> <% time=project.updated_on %> @@ -321,6 +321,7 @@ <% replies_all_i = replies_all_i + 1 %> diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb index 1d0c4cba5..aeb7f5e5d 100644 --- a/app/views/users/_course_journalsformessage.html.erb +++ b/app/views/users/_course_journalsformessage.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>-+<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> @@ -56,6 +56,7 @@ <% replies_all_i = replies_all_i + 1 %> diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 2f790b19b..8b6056309 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %> <% else %> @@ -117,6 +117,7 @@ <% replies_all_i=replies_all_i+1 %> @@ -125,7 +126,7 @@ <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "鐢ㄦ埛澶村儚" %>-+<% if reply.try(:author).try(:realname) == ' ' %> <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> <% else %> @@ -179,4 +180,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 403a922ed..19d62b14e 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if @ctivity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -94,6 +94,7 @@ <% replies_all_i = replies_all_i + 1 %> @@ -102,7 +103,7 @@ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% if comment.try(:author).try(:realname) == ' ' %> <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/users/_course_newslist.html.erb b/app/views/users/_course_newslist.html.erb index ff99e116e..0e5805112 100644 --- a/app/views/users/_course_newslist.html.erb +++ b/app/views/users/_course_newslist.html.erb @@ -33,8 +33,8 @@<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100} %>
- 鍙戝竷鏃堕棿锛<%= format_time(activity.created_on) %> - 鏇存柊鏃堕棿锛<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %> + 鍙戝竷锛<%= format_time(activity.created_on) %> + 鏇存柊锛<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %> <% count=0 %> <% count=activity.comments.count %><%= count>0 ? "#{count}" : "0" %>鍥炲|<%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %>璧
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index dab970cdf..4fbb55321 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -9,7 +9,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>-+<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> diff --git a/app/views/users/_intro_content.html.erb b/app/views/users/_intro_content.html.erb index c18e520ba..04babe100 100644 --- a/app/views/users/_intro_content.html.erb +++ b/app/views/users/_intro_content.html.erb @@ -1,6 +1,6 @@ -+\ No newline at end of file diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb index 795432008..ed4f8cfb8 100644 --- a/app/views/users/_project_attachment.html.erb +++ b/app/views/users/_project_attachment.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>- <%= content.to_s.html_safe%> + <%= content.to_s.html_safe %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -43,4 +43,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb index 55f576db1..25fd675fb 100644 --- a/app/views/users/_project_boardlist.html.erb +++ b/app/views/users/_project_boardlist.html.erb @@ -45,8 +45,8 @@<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %>
- 鍙戝笘鏃堕棿锛<%= format_time(activity.created_on) %> - 鏇存柊鏃堕棿锛<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %> + 鍙戝笘锛<%= format_time(activity.created_on) %> + 鏇存柊锛<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %> <% count=0 %> <% if activity.parent %> <% count=activity.parent.children.count%> diff --git a/app/views/users/_project_create.html.erb b/app/views/users/_project_create.html.erb index 83bfe3f04..644918ccc 100644 --- a/app/views/users/_project_create.html.erb +++ b/app/views/users/_project_create.html.erb @@ -7,7 +7,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>-+<% if user.try(:realname) == ' ' %> <%= link_to user, user_path(user), :class => "newsBlue mr15" %> <% else %> @@ -41,4 +41,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/users/_project_document.html.erb b/app/views/users/_project_document.html.erb index eb3ff2122..5427bd112 100644 --- a/app/views/users/_project_document.html.erb +++ b/app/views/users/_project_document.html.erb @@ -3,7 +3,7 @@
-灏规暀鎺 TO + diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index daa7c71c2..4b13850de 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -100,4 +100,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb index 5020f67d3..5323b76b6 100644 --- a/app/views/users/_project_issue_reply.html.erb +++ b/app/views/users/_project_issue_reply.html.erb @@ -29,6 +29,7 @@ <% replies_all_i=replies_all_i + 1 %> @@ -37,7 +38,7 @@ <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% if reply.try(:user).try(:realname) == ' ' %> <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/users/_project_journal.html.erb b/app/views/users/_project_journal.html.erb index 7cf487211..1efbf1c7d 100644 --- a/app/views/users/_project_journal.html.erb +++ b/app/views/users/_project_journal.html.erb @@ -3,7 +3,7 @@-灏规暀鎺 TO + diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 0a41dbbf5..b6e3f9a94 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -112,6 +112,7 @@ <% replies_all_i=replies_all_i+1 %> @@ -120,7 +121,7 @@ <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% if reply.try(:author).try(:realname) == ' ' %> <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb index 7f5d185e5..55e2182b5 100644 --- a/app/views/users/_project_news.html.erb +++ b/app/views/users/_project_news.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if @ctivity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -91,6 +91,7 @@ <% replies_all_i = replies_all_i + 1 %> @@ -99,7 +100,7 @@ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% if comment.try(:author).try(:realname) == ' ' %> <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb index b8551f7c5..9dc530c72 100644 --- a/app/views/users/_resources_list.html.erb +++ b/app/views/users/_resources_list.html.erb @@ -6,11 +6,38 @@ <% attachments.each do |attach| %>- - + <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 && !attach_show_allow(attach) %> + + <% else %> + + <% end %> -
-
+ <% if attach.is_public == 0 && !attach_show_allow(attach) && attach.get_apply_resource_status(attach.id, attach.author_id) != "2" %>
+
+ <% else %>
+ <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
+ <% end %>
+ <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current %>
+
+ <% end %>
+
+ - + <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && !attach_show_allow(attach) %> + <% ah = attach.get_status_by_attach(User.current.id) %> + <% if ah.nil? %> + <%= link_to("璇锋眰鍒嗕韩", apply_resource_user_path(User.current.id, :attachment_id => attach.id), :class => 'green_btn_share c_white', :remote => true) %> + <% elsif ah == 1 %> + 绛夊緟鍥炲 + <% elsif ah == 2 %> + 鍙紩鐢 + <% elsif ah == 3 %> + 宸叉嫆缁 + <% end %> + <% else %> + -- + <% end %>
- <%= format_date(attach.created_on) %>
- <%= attach.quotes.nil? ? 0 : attach.quotes %> @@ -20,6 +47,9 @@
- <%= get_resource_type(attach.container_type)%> + + +
-+<% if @ctivity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -16,13 +16,13 @@@@ -75,6 +75,7 @@ <% replies_all_i = replies_all_i + 1 %> @@ -83,7 +84,7 @@ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "鐢ㄦ埛澶村儚" %><%= link_to activity.title.to_s, user_blog_blog_comment_path(:user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id,:in_act => true), :class => "postGrey" %> + <% if activity.locked%> + + <% end%> + <% if activity.sticky == 1%> + 缃《 + <% end%>- <% if activity.sticky == 1%> - 缃《 - <% end%> - <% if activity.locked%> - - <% end%>-+<% if comment.try(:author).try(:realname) == ' ' %> <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb index 8ef0faa9e..5e3f48963 100644 --- a/app/views/users/_user_course_list.html.erb +++ b/app/views/users/_user_course_list.html.erb @@ -28,12 +28,10 @@- + + 鏇存柊锛<%= format_time(course.updated_on) %> - 鍒涘缓鏃堕棿锛<%= format_time(course.created_at) %> - - 鏇存柊鏃堕棿锛<%= format_time(course.updated_on) %> - - 寮璇惧鏈: <%= current_time_and_term course %> + 瀛︽湡: <%= current_time_and_term course %> <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %> <% homework_num = course.homework_commons.count %> diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index c0578c042..f81fbabf5 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -5,7 +5,7 @@ <%=link_to image_tag(url_to_avatar(homework_common.user),width:"50px", height: "50px"), user_activities_path(homework_common.user.id)%>
-diff --git a/public/javascripts/application.js b/public/javascripts/application.js index b09a8a811..aec0af070 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1045,6 +1045,7 @@ function showNormalImage(id) { $(image).attr('src',_src); return; } + //鏃犳牸寮忕殑鍥剧墖涓嶈鐐瑰嚮鏄剧ず澶у浘锛屾樉绀虹殑璇濅細鏈夐棶棰 var tmpsrc = image.attr('src'); if (tmpsrc.indexOf('.gif') >= 0 || tmpsrc.indexOf('.jpg') >= 0 || tmpsrc.indexOf('.jpeg') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.bmp') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.BMP') >= 0 || tmpsrc.indexOf('.JPEG') >= 0 || tmpsrc.indexOf('.JPG') >= 0 || tmpsrc.indexOf('.PNG') >= 0 || tmpsrc.indexOf('.GIF') >= 0) { var element = $("").attr("href", image.attr('src')); @@ -1286,3 +1287,75 @@ function description_showwords_ellipsis(id,num){ $("#intro_content_"+id).show(); } + +//by yk 寮规 value锛歨tml浠ｇ爜鎴栬烦杞叾浠栭〉闈唬鐮 tWidth = 580 tTop=30 tLeft=50 +function pop_up_box(value,tWidth,tTop,tLeft){ + + if(!tWidth){ + var tWidth = 580; + } + + if(!tTop){ + var tTop = 30; + } + + if(!tLeft){ + var tLeft = 50; + } + + $("#ajax-modal").html(value); + showModal('ajax-modal', tWidth + "px"); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", tTop+"%").css("left", tLeft+"%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + + function hideModal(){ + $('#ajax-modal').hide(); + } +} + +//yk 鑷姩璇嗗埆URL 骞跺姞涓婇摼鎺 +function autoUrl(id){ + if ($("#"+id).children().length > 0 ){ + $("#"+id+" p,#"+ id +" span,#"+id+" em,#"+id+" h1,#"+id+" h2,#"+id+" h3,#"+id+" h4,#"+id+" strong,#"+id+" b,#"+id+" font,#"+id+" i").each(function(){ + if ($(this).children().length == 0){ + var html = $(this).text(); + html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.銆俔)+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?/g,function(full) { + //娌℃湁://鐨勯兘鍔犱笂http:// + var reStr = full; + if (full.length > 0){ + if (full.indexOf("://") >= 0){ + reStr = ""+full+""; + } + else{ + reStr = ""+full+""; + } + } + return reStr ; + }); + $(this).html(html); + } + }); + } + else{ + var html = $("#"+id).text(); + html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.銆俔)+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?/g,function(full) { + //娌℃湁://鐨勯兘鍔犱笂http:// + var reStr = full; + if (full.length > 0){ + if (full.indexOf("://") >= 0){ + reStr = ""+full+""; + } + else{ + reStr = ""+full+""; + } + } + return reStr ; + }); + $("#"+id).html(html); + } +} + + diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js index 391774f0b..45d8de48b 100644 --- a/public/javascripts/homework.js +++ b/public/javascripts/homework.js @@ -11,11 +11,14 @@ $(function(){ var title = $('#program-title').val(); if (!src) { - alert('璇疯緭鍏ユ纭殑浠ｇ爜'); + var htmlvalue = "+<%= link_to homework_common.user.show_name, user_activities_path(homework_common.user_id), :class => "newsBlue mr15"%> TO <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%> @@ -224,9 +224,9 @@diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html index 24ed8c9fc..7968ba5d7 100644 --- a/public/assets/wechat/project_discussion.html +++ b/public/assets/wechat/project_discussion.html @@ -44,7 +44,7 @@<% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"椤圭洰澶村儚" %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"椤圭洰澶村儚" %> <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"椤圭洰澶村儚") %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"椤圭洰澶村儚") %> <% end %> <% com_time = project.project_score.commit_time %> <% time=project.updated_on %> @@ -331,6 +331,7 @@ <% replies_all_i = replies_all_i + 1 %> diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb index 38770421d..efae73a3d 100644 --- a/app/views/users/_user_import_resource_list.html.erb +++ b/app/views/users/_user_import_resource_list.html.erb @@ -6,8 +6,22 @@- <%= get_resource_type(attach.container_type)%> diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb index 944477e88..47d5145ac 100644 --- a/app/views/users/_user_journalsformessage.html.erb +++ b/app/views/users/_user_journalsformessage.html.erb @@ -86,6 +86,12 @@
-
@@ -115,7 +121,7 @@ <% end %>
--
<% fetch_user_leaveWord_reply(activity).reorder("created_on desc").each do |comment| %>
+
<% replies_all_i = replies_all_i + 1 %>
+diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index d4fbeb234..60d5b6ed8 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -234,6 +234,18 @@ <%= render :partial => 'apply_homework_course_message', :locals => {:ma => ma} %><%= comment.notes.html_safe %>-
+ <%= render :partial => 'apply_resource_course_message', :locals => {:ma => ma} %>
+
-
+ <%= render :partial => 'apply_resource_course_message_reply', :locals => {:ma => ma} %>
+
- diff --git a/app/views/users/_user_project_list.html.erb b/app/views/users/_user_project_list.html.erb index 1526da58f..6124b82d8 100644 --- a/app/views/users/_user_project_list.html.erb +++ b/app/views/users/_user_project_list.html.erb @@ -27,8 +27,8 @@
-
- 鍒涘缓鏃堕棿锛<%= format_time(project.created_on) %>
- 鏇存柊鏃堕棿锛<%= format_time(project.updated_at) %>
+
+ 鏇存柊锛<%= format_time(project.updated_at) %>
<%= project.project_score.issue_num %>闂| <%= project.project_score.attach_num %>璧勬簮
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 58829386c..52a61a7b0 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -1,5 +1,7 @@
- ++ + 鍒犻櫎+ <%= render :partial => "show_new_upload", :locals => {:type => @type, :status => @status} %> +<%= render :partial => 'users/resource_search_form',:locals => {:user => @user, :type => @type, :order => @order, :sort => @score, :status => @status} %>@@ -17,12 +19,13 @@- 鍏ㄩ 鍒犻櫎-@@ -212,7 +215,7 @@ document.oncontextmenu = function() {return true;} line.children().css("background-color",'white'); id = line.children().last().html(); - user_id = line.children().eq(5).html(); + user_id = line.children().eq(6).html(); if(user_id === '<%= User.current.id %>') { res_name = line.children().eq(1).children().attr('title'); res_link = line.children().eq(1).html(); diff --git a/app/views/users/_user_resource_tip_list.html.erb b/app/views/users/_user_resource_tip_list.html.erb index 5d5876ac8..67fe292ee 100644 --- a/app/views/users/_user_resource_tip_list.html.erb +++ b/app/views/users/_user_resource_tip_list.html.erb @@ -1,6 +1,7 @@- 鍙戦佽嚦 -+ + +閫夋嫨 0 涓祫婧- 璧勬簮鍚嶇О +
- 鎿嶄綔
- <%= link_to "涓婁紶鏃堕棿", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %> <% if @order == "created_on" %> diff --git a/app/views/users/_user_resource_type_filter.html.erb b/app/views/users/_user_resource_type_filter.html.erb index 6e5ed51c3..d2aa29eed 100644 --- a/app/views/users/_user_resource_type_filter.html.erb +++ b/app/views/users/_user_resource_type_filter.html.erb @@ -17,7 +17,7 @@ <%#= link_to '鐢ㄦ埛璧勬簮' ,user_resource_user_path(:id=>@user.id,:type=>5), id="resource_type_user", :remote=>true,:method => 'get', :class=>'resourcesTypeUser resourcesGrey' %>
-
闄勪欢
<%#= link_to '闄勪欢' ,user_resource_user_path(:id=>@user.id,:type=>4), id="resource_type_file", :remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb
index 8db83aefc..880bd2877 100644
--- a/app/views/users/add_exist_file_to_course.js.erb
+++ b/app/views/users/add_exist_file_to_course.js.erb
@@ -1,7 +1,10 @@
<% if @flag == true%>
-$("#search_div").html('<%= escape_javascript( render :partial => 'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
+$("#search_div").html('<%= escape_javascript( render :partial => 'resource_search_form',:locals => {:user => @user, :type => @type} ) %>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
+$("#user_resource_type_filter").html('<%= escape_javascript( render :partial => 'user_resource_type_filter' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#upload_private_resource").html('<%= escape_javascript( render :partial => 'show_new_upload' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
$("#res_count").html(0);
$("#checkboxAll").attr('checked',false);
$("#res_all_count").html(<%= @atta_count%>);
diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb
index 4c24f4932..5690a0f88 100644
--- a/app/views/users/add_exist_file_to_project.js.erb
+++ b/app/views/users/add_exist_file_to_project.js.erb
@@ -1,7 +1,10 @@
<% if @flag == true%>
$("#search_div").html('<%= escape_javascript( render :partial => 'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
+$("#user_resource_type_filter").html('<%= escape_javascript( render :partial => 'user_resource_type_filter' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#upload_private_resource").html('<%= escape_javascript( render :partial => 'show_new_upload' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
$("#res_count").html(0);
$("#checkboxAll").attr('checked',false);
$("#res_all_count").html(<%= @atta_count%>);
diff --git a/app/views/users/apply_for_resource.js.erb b/app/views/users/apply_for_resource.js.erb
new file mode 100644
index 000000000..7debbcba2
--- /dev/null
+++ b/app/views/users/apply_for_resource.js.erb
@@ -0,0 +1,15 @@
+<% if @state == 1 %>
+hideModal();
+alert("鎮ㄨ繕鏈櫥褰曪紝璇峰厛鐧诲綍");
+<% elsif @state == 2 %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/apply_for_resource', :locals => {:attachment => @attachment, :state => @state}) %>');
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("" +
+ "
");
+$('#ajax-modal').parent().css("top","30%").css("left","37%").css("position","fixed").css("border","3px solid #269ac9");
+$("#resource_apply_status_<%= @attachment.id %>").html("绛夊緟鍥炲");
+<% elsif @state == 3 %>
+hideModal();
+alert("鎮ㄥ凡鐢宠杩囪璧勬簮");
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/apply_resource.js.erb b/app/views/users/apply_resource.js.erb
new file mode 100644
index 000000000..14a795fe5
--- /dev/null
+++ b/app/views/users/apply_resource.js.erb
@@ -0,0 +1,10 @@
+<% if @state == 1 %>
+alert("鎮ㄨ繕鏈櫥褰");
+<% elsif @state == 2 %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/apply_resource', :locals => {:attachment => @attachment}) %>');
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("" +
+ "");
+$('#ajax-modal').parent().css("top","30%").css("left","37%").css("position","fixed").css("border","3px solid #269ac9");
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/deal_with_apply_resource.js.erb b/app/views/users/deal_with_apply_resource.js.erb
new file mode 100644
index 000000000..dbf07217c
--- /dev/null
+++ b/app/views/users/deal_with_apply_resource.js.erb
@@ -0,0 +1 @@
+$("#apply_resource_message_<%= @msg.id %>").html('<%= escape_javascript(render :partial => 'users/apply_resource_course_message', :locals => {:ma => @msg}) %>');
\ No newline at end of file
diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index 6405ba496..4a7e5cee3 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -92,6 +92,15 @@
璇蜂娇鐢 <%= @homework.language_name %> 璇█缂栧啓 + <% if @homework.language.to_i == 1 %> + 缂栬瘧鍣ㄤ俊鎭細gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) + <% elsif @homework.language.to_i == 2 %> + 缂栬瘧鍣ㄤ俊鎭細gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) + <% elsif @homework.language.to_i == 3 %> + 缂栬瘧鍣ㄤ俊鎭細Python version "2.6.6" + <% elsif @homework.language.to_i == 4 %> + 缂栬瘧鍣ㄤ俊鎭細java version "1.7.0_85" OpenJDK Runtime Environment + <% end %> style="display-hidden" id="data-language">diff --git a/app/views/users/user_commit_homework.html.erb b/app/views/users/user_commit_homework.html.erb index 6df6f2115..1d1d0ef14 100644 --- a/app/views/users/user_commit_homework.html.erb +++ b/app/views/users/user_commit_homework.html.erb @@ -75,6 +75,15 @@diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html index 0bc87214b..29660e4fd 100644 --- a/public/assets/wechat/jour_message_detail.html +++ b/public/assets/wechat/jour_message_detail.html @@ -36,7 +36,7 @@璇蜂娇鐢 <%= @homework.language_name %> 璇█缂栧啓 + <% if @homework.language.to_i == 1 %> + 缂栬瘧鍣ㄤ俊鎭細gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) + <% elsif @homework.language.to_i == 2 %> + 缂栬瘧鍣ㄤ俊鎭細gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) + <% elsif @homework.language.to_i == 3 %> + 缂栬瘧鍣ㄤ俊鎭細Python version "2.6.6" + <% elsif @homework.language.to_i == 4 %> + 缂栬瘧鍣ㄤ俊鎭細java version "1.7.0_85" OpenJDK Runtime Environment + <% end %><%= f.text_area :name, id: 'program-title', class:"InputBox W700", placeholder:"璇锋鎷綘鐨勪唬鐮佺殑鍔熻兘" %> diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 80167db56..0bd5724c1 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -55,7 +55,10 @@diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html index f61d803dd..950cbe18e 100644 --- a/public/assets/wechat/issue_detail.html +++ b/public/assets/wechat/issue_detail.html @@ -10,7 +10,7 @@- 鎴戠殑璧勬簮
-- + 绉佹湁璧勬簮 +
+<%= render :partial => 'user_resource_type_filter' %> diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb index 2fa0035b2..758b8c2f0 100644 --- a/app/views/users/user_resource.js.erb +++ b/app/views/users/user_resource.js.erb @@ -2,6 +2,7 @@ $("#search_div").html('<%= escape_javascript( render :partial => 'resource_searc $("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>'); $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' , :locals => { :attachments => @attachments}) %>'); $("#user_resource_type_filter").html('<%= escape_javascript( render :partial => 'user_resource_type_filter' , :locals => {:user => @user, :type => @type, :status => @status}) %>'); +$("#upload_private_resource").html('<%= escape_javascript( render :partial => 'show_new_upload' , :locals => {:user => @user, :type => @type, :status => @status}) %>'); $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); $("#res_count").html(0); $("#checkboxAll").attr('checked',false); diff --git a/app/views/users/user_system_messages.html.erb b/app/views/users/user_system_messages.html.erb index 86ae56cc8..57c6eb573 100644 --- a/app/views/users/user_system_messages.html.erb +++ b/app/views/users/user_system_messages.html.erb @@ -7,7 +7,7 @@ <%= image_tag("/images/trustie_logo1.png", :width => "50", :height => "50") %>-+diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html index fec0c4cff..1af5e185d 100644 --- a/public/assets/wechat/homework_detail.html +++ b/public/assets/wechat/homework_detail.html @@ -16,10 +16,10 @@Trustie骞冲彴 鍙戝竷浜嗙郴缁熸秷鎭細diff --git a/config/application.rb b/config/application.rb index eb5fdc43d..6f5542a1e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -53,6 +53,11 @@ module RedmineApp # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" + #disable [deprecated] I18n.enforce_available_locales will default to true in the future. + # If you really want to skip validation of your locale you can set I18n.enforce_available_locales = false + # to avoid this message. + #I18n.config.enforce_available_locales = false + # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password] diff --git a/config/menu.yml b/config/menu.yml index d129f7aff..3951f836b 100644 --- a/config/menu.yml +++ b/config/menu.yml @@ -5,7 +5,7 @@ button: url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect" - type: "click" - name: "鎰忚杩旈" + name: "鎰忚鍙嶉" key: "FEEDBACK" - name: "鏇村" diff --git a/config/routes.rb b/config/routes.rb index a123c460b..2863d49a4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -561,6 +561,7 @@ RedmineApp::Application.routes.draw do match 'apply_homework', :to => 'users#apply_homework', :via => :get match 'user_homeworks', :to => 'users#user_homeworks', :via => :get match 'student_homeworks', :to => 'users#student_homeworks', :via => :get + get 'apply_resource' get 'user_import_homeworks' get 'user_search_homeworks' get 'choose_user_course' @@ -622,6 +623,7 @@ RedmineApp::Application.routes.draw do post 'import_resources_to_homework' get 'dealwith_apply_request' get 'dealwith_apply_homework' + get 'deal_with_apply_resource' get 'store_selected_resource' get 'user_organizations' get 'search_user_orgs' @@ -630,6 +632,7 @@ RedmineApp::Application.routes.draw do get 'user_ref_homework_search' get 'show_homework_detail' post 'apply_for_homework' + post 'apply_for_resource' # end end #resources :blogs diff --git a/db/migrate/20160517091224_create_apply_resources.rb b/db/migrate/20160517091224_create_apply_resources.rb new file mode 100644 index 000000000..8e2516966 --- /dev/null +++ b/db/migrate/20160517091224_create_apply_resources.rb @@ -0,0 +1,11 @@ +class CreateApplyResources < ActiveRecord::Migration + def change + create_table :apply_resources do |t| + t.integer :status + t.integer :user_id + t.integer :attachment_id + + t.timestamps + end + end +end diff --git a/db/migrate/20160518031514_add_column_to_apply_resource.rb b/db/migrate/20160518031514_add_column_to_apply_resource.rb new file mode 100644 index 000000000..164bad7b7 --- /dev/null +++ b/db/migrate/20160518031514_add_column_to_apply_resource.rb @@ -0,0 +1,6 @@ +class AddColumnToApplyResource < ActiveRecord::Migration + def change + add_column :apply_resources, :container_id, :integer + add_column :apply_resources, :container_type, :string + end +end diff --git a/db/migrate/20160518060243_add_column_content_to_apply_resource.rb b/db/migrate/20160518060243_add_column_content_to_apply_resource.rb new file mode 100644 index 000000000..e741527e0 --- /dev/null +++ b/db/migrate/20160518060243_add_column_content_to_apply_resource.rb @@ -0,0 +1,6 @@ +class AddColumnContentToApplyResource < ActiveRecord::Migration + def change + add_column :apply_resources, :content, :text + add_column :apply_resources, :apply_user_id, :integer + end +end diff --git a/lib/rails_kindeditor/config/routes.rb b/lib/rails_kindeditor/config/routes.rb index 86b888ad3..e205376d9 100644 --- a/lib/rails_kindeditor/config/routes.rb +++ b/lib/rails_kindeditor/config/routes.rb @@ -2,6 +2,6 @@ Rails.application.routes.draw do namespace :kindeditor do post "/upload" => "assets#create" get "/filemanager" => "assets#list" - get "/uploadpic" => "assets#uploadpic" + post "/uploadpic" => "assets#uploadpic" end end \ No newline at end of file diff --git a/lib/wechat/bin/wechat b/lib/wechat/bin/wechat old mode 100644 new mode 100755 diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 9ae1300e7..a8c17345b 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -2539,7 +2539,7 @@ function _nativeCommand(doc, key, val) { function _nativeCommandValue(doc, key) { var val = ''; try { - val = doc.queryCommandValue(key); + val = doc.query_nativeCommand(self.doc, name, val);Value(key); } catch (e) {} if (typeof val !== 'string') { val = ''; @@ -5694,7 +5694,9 @@ _plugin('core', function(K) { } } else { //alert(data.message); - alert("浠呮敮鎸佸涓嬪浘鐗囨牸寮:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF"); +// alert("浠呮敮鎸佸涓嬪浘鐗囨牸寮:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF"); + var htmlvalue = "浠呮敮鎸佸涓嬪浘鐗囨牸寮:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF!"; + pop_up_box(htmlvalue,580,30,50); } }, afterError : function(str) { diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js index 8831ba300..97d5e33c5 100644 --- a/public/assets/kindeditor/pasteimg.js +++ b/public/assets/kindeditor/pasteimg.js @@ -370,6 +370,9 @@ function df(myself) { else sstr += that.attr("src") + "|"; } + else if (that.attr("src").indexOf("data:image") >= 0){ + that.parents().removeAttr("href"); //鍒犻櫎鎵鏈夌埗鑺傜偣鐨刪ref + } } }); uploadpic(sstr,myself); @@ -397,7 +400,7 @@ function uploadpic(piclist,myself) { $.ajax({ url: "/kindeditor/uploadpic", data:{"pic":piclist}, - type: "GET", + type: "POST", beforeSend: function () { // $("#ajax-indicator span").text("鍥剧墖涓婁紶涓绋嶇瓑..."); keShadow(myself); @@ -416,9 +419,11 @@ function uploadpic(piclist,myself) { that.attr("src", str[tIndex]); that.attr("data-ke-src", str[tIndex]); + //澶嶅埗杩囨潵甯︾殑閾炬帴class绛夐兘瑕佸幓鎺 鍜岃棰戝浘鐗囨湁鍏崇郴 that.removeAttr("class"); that.parent().removeAttr("class"); - that.parent().removeAttr("href"); + that.parents().removeAttr("href"); //鍒犻櫎鎵鏈夌埗鑺傜偣鐨刪ref +// that.parent().removeAttr("href"); that.parent().removeAttr("data-ke-src"); tIndex = tIndex + 1; } diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css index b9c8252e8..65c75d6ea 100644 --- a/public/assets/kindeditor/plugins/code/previewcode.css +++ b/public/assets/kindeditor/plugins/code/previewcode.css @@ -51,5 +51,6 @@ span.at {color:#269ac9;} span.at a{color:#269ac9;text-decoration: none;} /*yk*/ -.ke-content ol li{list-style-type: decimal;margin-left: 20px;} -.ke-content ul li{list-style-type: disc;margin-left: 20px;} \ No newline at end of file +.ke-content ol li{list-style-type: decimal;} +.ke-content ul li{list-style-type: disc;} +.ke-content ol,.ke-content ul{margin-top:0;margin-bottom: 0;} \ No newline at end of file diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index f0f8e9c92..b4e582336 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -17,18 +17,18 @@ - + 鐐瑰嚮灞曞紑 {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}{{act.praise_count}}{{act.praise_count}}@@ -46,7 +46,7 @@ - +@@ -54,8 +54,8 @@ {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}{{act.praise_count}}{{act.praise_count}}@@ -73,7 +73,7 @@ - +@@ -81,8 +81,8 @@ {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}{{act.praise_count}}{{act.praise_count}}@@ -98,8 +98,8 @@@@ -116,7 +116,7 @@ - +- - + +鐘舵侊細{{act.issue_detail.issue_status}} 浼樺厛绾э細{{act.issue_detail.issue_priority}}
@@ -126,8 +126,8 @@ {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}{{act.praise_count}}{{act.praise_count}}@@ -146,7 +146,7 @@ - +@@ -154,8 +154,8 @@ {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}{{act.praise_count}}{{act.praise_count}}@@ -170,8 +170,8 @@@@ -195,8 +195,8 @@ 鐐瑰嚮灞曞紑 {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}- - + +{{act.praise_count}}{{act.praise_count}}@@ -215,15 +215,15 @@ - +鐐瑰嚮灞曞紑 {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}{{act.praise_count}}{{act.praise_count}}diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html index c1133f955..514a2c94e 100644 --- a/public/assets/wechat/blog_detail.html +++ b/public/assets/wechat/blog_detail.html @@ -3,7 +3,7 @@diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html index 3b7965733..c426f2794 100644 --- a/public/assets/wechat/course_notice.html +++ b/public/assets/wechat/course_notice.html @@ -44,7 +44,7 @@-+diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html index e36fb3e27..d8c50364d 100644 --- a/public/assets/wechat/course_discussion.html +++ b/public/assets/wechat/course_discussion.html @@ -44,7 +44,7 @@- +- +- 杩熶氦鎵ｅ垎锛歿{homework.late_penalty}}鍒{{homework.publish_time}} @@ -50,7 +50,7 @@
- 缂鸿瘎鎵ｅ垎锛歿{homework.absence_penalty}}鍒/浣滃搧
- 鍖胯瘎寮鍚椂闂达細{{homework.evaluation_start}}
- 鍖胯瘎鍏抽棴鏃堕棿锛歿{homework.evaluation_end}} + 杩熶氦鎵ｅ垎锛歿{homework.late_penalty}}鍒
+ 缂鸿瘎鎵ｅ垎锛歿{homework.absence_penalty}}鍒/浣滃搧
+ 鍖胯瘎寮鍚椂闂达細{{homework.evaluation_start}}
+ 鍖胯瘎鍏抽棴鏃堕棿锛歿{homework.evaluation_end}}- +鏉 婧愶細 -{{issue.project_name}} | 椤圭洰缂洪櫡 +{{issue.project_name}} | 椤圭洰闂 @@ -48,7 +48,7 @@- +- +
- <% if @type != "6" %> + <% unless (@type == "6" || @type == "2") %>- +璇疯緭鍏ユ纭殑浠ｇ爜!"; + pop_up_box(htmlvalue,580,30,50); + return false; } if (!title) { - alert('璇疯緭鍏ユ爣棰'); + var htmlvalue = "璇疯緭鍏ユ爣棰!"; + pop_up_box(htmlvalue,580,30,50); return false; } return true; @@ -33,31 +36,6 @@ $(function(){ $('#test-program-btn').show(); return; } - /* - $.post( - '/student_work/program_test_ex', - {homework: homework_id, student_work_id: student_work_id, src: src, title: title, is_test: is_test}, - function(data,status){ - tested = true; - console.log(data); - if(data.index <=0){ - data.index = $('.ProResultTop').length+1; - } - - if (typeof cb == 'function') {cb(data); return;} - - var html=bt('t:result-list',data); - $('.ProResult').prepend(html); - - if (data.status==0 && is_test != 'true') { - var r=confirm("绛旈姝ｇ‘锛屾槸鍚︾珛鍒绘彁浜?"); - if (r) { - $(".HomeWorkCon form").submit(); - } - } - } - ); - */ //鍏堟祴璇曚竴娆″苟杩斿洖娴嬭瘯闆嗕釜鏁板強缁撴灉鍐嶅垽鏂槸鍚﹂渶瑕佺户缁繘琛屾祴璇 var test_post = function(i, testid){ $.post( @@ -66,6 +44,22 @@ $(function(){ src: src, title: title, is_test: is_test,tIndex:i, testid: testid}, function(data,status){ + if (data.status==-4 || data.status==-5 ){ + //寮规 + var root_path = getRootPath(); + var forums_1_path = root_path + "/forums/1" + var htmlvalue = "鎮ㄧ殑绋嬪簭寮曞彂浜嗕笉鐭ュ悕寮傚父锛岃鍦ㄥ叕鍏辫创鍚ф彁浜ゆ偍鐨勪唬鐮佽繘琛屾剰瑙佸弽棣堬紝鎴戜滑澶勭悊鍚庝細绔嬪嵆鑱旂郴鎮紝璋㈣阿锛"; + pop_up_box(htmlvalue,580,30,50); + + $('#test-program-btn').show(); + return; + } + else if (data.status==-3){ + var htmlvalue = "瀵逛笉璧,鏈嶅姟鍣ㄧ箒蹇欒绋嶅悗鍐嶈瘯!"; + pop_up_box(htmlvalue,580,30,50); + $('#test-program-btn').show(); + return; + } var tSeq = data.tseq; var tCount = data.tcount; console.log("tSeq="+tSeq); @@ -81,10 +75,8 @@ $(function(){ if (data.status==0 && is_test != 'true') { if (typeof cb == 'function') {cb(data);$('#test-program-btn').show(); return;} - var r=confirm("绛旈姝ｇ‘锛屾槸鍚︾珛鍒绘彁浜?"); - if (r) { - $(".HomeWorkCon form").submit(); - } + var htmlvalue = "绛旈姝ｇ‘锛屾槸鍚︾珛鍒绘彁浜?"; + pop_up_box(htmlvalue,580,30,50); $('#test-program-btn').show(); return; } @@ -100,9 +92,11 @@ $(function(){ } ).fail(function(xhr, status){ if(status == 'timeout'){ - alert("鎮ㄧ殑绛旀瓒呮椂浜, 璇锋鏌ヤ唬鐮佹槸鍚﹀瓨鍦ㄦ寰幆鐨勯敊璇."); + var htmlvalue = "鎮ㄧ殑绛旀瓒呮椂浜, 璇锋鏌ヤ唬鐮佹槸鍚﹀瓨鍦ㄦ寰幆鐨勯敊璇!"; + pop_up_box(htmlvalue,580,30,50); } else { - alert("瀵逛笉璧,鏈嶅姟鍣ㄧ箒蹇欒绋嶅悗鍐嶈瘯!"); + var htmlvalue = "瀵逛笉璧,鏈嶅姟鍣ㄧ箒蹇欒绋嶅悗鍐嶈瘯!"; + pop_up_box(htmlvalue,580,30,50); } $('#test-program-btn').show(); return; @@ -120,20 +114,21 @@ $(function(){ return; } if($('.ProResult .ProResultTop').length<=0){ - var r=confirm("娴嬭瘯鍚庢墠鑳芥彁浜わ紝鏄惁绔嬪埢娴嬭瘯?"); - if (r) { + var htmlvalue = "娴嬭瘯鍚庢墠鑳芥彁浜わ紝鏄惁绔嬪埢娴嬭瘯?"; + pop_up_box(htmlvalue,580,30,50); + $("#code-test-button").on('click',function(){ test_program(); - } + hideModal(); + }); return; } - if (!tested) { test_program(function(data){ if (data.status!=0) { - var r=confirm("娴嬭瘯涓嶉氳繃锛屾槸鍚﹀己鍒舵彁浜?"); - if (!r) { - return; - } + var htmlvalue = "娴嬭瘯涓嶉氳繃锛屾槸鍚﹀己鍒舵彁浜?"; + pop_up_box(htmlvalue,580,30,50); + return; + }; $(".HomeWorkCon form").submit(); }); diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js index 16fa8cf03..da314c5f5 100644 --- a/public/javascripts/wechat/app.js +++ b/public/javascripts/wechat/app.js @@ -128,12 +128,15 @@ app.factory('common', function($http, auth, $routeParams){ openid: auth.openid() }; + data.disabled = true; + $http({ method: 'POST', url: apiUrl+ "new_comment/"+id, data: userInfo }).then(function successCallback(response) { alert("鎻愪氦鎴愬姛"); + data.disabled = false; if(typeof cb === 'function'){ cb(); } @@ -416,7 +419,6 @@ app.directive('textAutoHeight', function($timeout){ $timeout(function(){ var e = element.parent().children().eq(5); var height = e[0].scrollHeight; - var offsetHeight = e[0].offsetHeight; if(height>90){ element.css('display', 'block'); element.on('click', function(){ diff --git a/public/plugin_assets/redmine_code_review/javascripts/code_review.js b/public/plugin_assets/redmine_code_review/javascripts/code_review.js index 4f4d81691..625f376c9 100644 --- a/public/plugin_assets/redmine_code_review/javascripts/code_review.js +++ b/public/plugin_assets/redmine_code_review/javascripts/code_review.js @@ -1,354 +1,354 @@ -/* -# Code Review plugin for Redmine -# Copyright (C) 2009-2013 Haruyuki Iida -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -var topZindex = 1000; -var action_type = ''; -var rev = ''; -var rev_to = ''; -var path = ''; -var urlprefix = ''; -var review_form_dialog = null; -var add_form_title = null; -var review_dialog_title = null; -var repository_id = null; -var filenames = []; - -var ReviewCount = function(total, open, progress){ - this.total = total; - this.open = open; - this.closed = total - open; - this.progress = progress -}; - -var CodeReview = function(id) { - this.id = id; - this.path = ''; - this.line = 0; - this.url = ''; - this.is_closed = false; -}; - -var review_counts = new Array(); -var code_reviews_map = new Array(); -var code_reviews_dialog_map = new Array(); - -function UpdateRepositoryView(title) { - var header = $("table.changesets thead tr:first"); - var th = $(''); - th.html(title); - header.append(th); - $('tr.changeset td.id a').each(function(i){ - var revision = this.getAttribute("href"); - revision = revision.substr(revision.lastIndexOf("/") + 1); - var review = review_counts['revision_' + revision]; - var td = $(' ',{ - 'class':'progress' - }); - td.html(review.progress); - $(this.parentNode.parentNode).append(td); - }); - } -//add function $.down -if(! $.fn.down) -(function($) { - $.fn.down = function() { - var el = this[0] && this[0].firstChild; - while (el && el.nodeType != 1) - el = el.nextSibling; - return $(el); - }; -})(jQuery); - -function UpdateRevisionView() { - $('li.change').each(function(){ - var li = $(this); - if (li.hasClass('folder')) return; - - var a = li.down('a'); - if (a.size() == 0) return; - var path = a.attr('href').replace(urlprefix, '').replace(/\?.*$/, ''); - - var reviewlist = code_reviews_map[path]; - if (reviewlist == null) return; - - var ul = $(' '); + th.html(title); + header.append(th); + $('tr.changeset td.id a').each(function(i){ + var revision = this.getAttribute("href"); + revision = revision.substr(revision.lastIndexOf("/") + 1); + var review = review_counts['revision_' + revision]; + var td = $(' ',{ + 'class':'progress' + }); + td.html(review.progress); + $(this.parentNode.parentNode).append(td); + }); + } +//add function $.down +if(! $.fn.down) +(function($) { + $.fn.down = function() { + var el = this[0] && this[0].firstChild; + while (el && el.nodeType != 1) + el = el.nextSibling; + return $(el); + }; +})(jQuery); + +function UpdateRevisionView() { + $('li.change').each(function(){ + var li = $(this); + if (li.hasClass('folder')) return; + + var a = li.down('a'); + if (a.size() == 0) return; + var path = a.attr('href').replace(urlprefix, '').replace(/\?.*$/, ''); + + var reviewlist = code_reviews_map[path]; + if (reviewlist == null) return; + + var ul = $(' -