+ <% if @org_logo_attchment.blank? || !User.current.logged? %>
+ 
+ <% 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}}
+ 杩熶氦鎵ｅ垎锛歿{act.homework_common_detail.late_penalty}}鍒 鍖胯瘎寮鍚椂闂达細{{act.homework_common_detail.evaluation_start}}
+ 缂鸿瘎鎵ｅ垎锛歿{act.homework_common_detail.absence_penalty}}鍒/浣滃搧 鍖胯瘎鍏抽棴鏃堕棿锛歿{act.homework_common_detail.evaluation_end}}
+
<%# 濡傛灉鏈夊巻鍙茬増鏈垯鎻愪緵鍘嗗彶鐗堟湰涓嬭浇 %>
<% 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%>
+
<% end%>
- <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homeworks,:page => 0,:is_in_course => 1,:course_id => @course.id} %>
-
- <%= topic.content.html_safe%>
<% author = topic.last_reply.try(:author)%>
diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb
new file mode 100644
index 000000000..9b11017e8
--- /dev/null
+++ b/app/views/homework_common/_homework_index_list.html.erb
@@ -0,0 +1,8 @@
+<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => homework_commons,:page => 0,:is_in_course => 1,:course_id => course_id} %>
+
+
+
\ No newline at end of file
diff --git a/app/views/homework_common/_homework_search_form.html.erb b/app/views/homework_common/_homework_search_form.html.erb
index f71cec9a5..250d72467 100644
--- a/app/views/homework_common/_homework_search_form.html.erb
+++ b/app/views/homework_common/_homework_search_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag( url_for(:controller => 'courses',:action => 'homework_search',:id=>course.id),
+<%= form_tag( homework_common_index_url_in_org(course.id),
:remote=>true ,:method => 'get',:class=>'resourcesSearchloadBox',:id=>'resource_search_form') do %>
<%= submit_tag '',:class=>'homepageSearchIcon',:onfocus=>'this.blur();',:style=>'border-style:none' %>
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 29cff8933..35f4658f9 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -71,13 +71,8 @@
<% end%>
-
+ <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
-
diff --git a/app/views/homework_common/index.js.erb b/app/views/homework_common/index.js.erb
index 7a038eb5c..4a9ec6ad3 100644
--- a/app/views/homework_common/index.js.erb
+++ b/app/views/homework_common/index.js.erb
@@ -1 +1,4 @@
-$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial => 'users/user_homework_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id} )%>");
\ No newline at end of file
+/*
+$("#user_show_more_homework").replaceWith("<%#= escape_javascript( render :partial => 'users/user_homework_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id} )%>");*/
+
+$("#homework_index_list").html("<%=escape_javascript(render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks,:course_id => @course.id}) %>");
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? -%>
- -
- <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-
+ <%= render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks,:course_id => @course.id} %>
+
+
+
\ 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 @@
@@ -109,6 +105,7 @@
- <%= 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..746881bdc 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -95,11 +95,7 @@
<%= reply.author.name%><%= format_date(reply.created_at) %>
+ <%= reply.author.name%><%= format_date(reply.created_at) %>
<%= reply.content.html_safe%>
鍥炲
<%= @reply_count>0 ? "锛#{@reply_count}锛" : "" %> 鈻
- <% if @topic.author == User.current %>
- 璧<%= get_praise_num(@topic) > 0 ? "锛#{get_praise_num(@topic)}锛" : "" %>
- <% else %>
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>@topic, :user_activity_id=>@topic.id,:type=>"activity"}%>
- <% end %>
@@ -130,11 +127,7 @@
<%= format_time(reply.created_on) %>
- <% if reply.author == User.current %>
- 璧<%= get_praise_num(reply) > 0 ? "锛#{get_praise_num(reply)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
<%= link_to(
l(:button_reply),
@@ -188,5 +181,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..39990e215 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -151,11 +151,7 @@
@@ -165,6 +161,7 @@
鍥炲
<%= @reply_count>0 ? "锛#{@reply_count}锛" : "" %> 鈻
- <% if @topic.author == User.current %>
- 璧<%= get_praise_num(@topic) > 0 ? "锛#{get_praise_num(@topic)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@topic, :user_activity_id=>@topic.id,:type=>"activity"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@topic, :user_activity_id=>@topic.id,:type=>"activity"}%>
@@ -186,11 +183,7 @@
<%= format_time(reply.created_on) %>
- <% if reply.author == User.current %>
- 璧<%= get_praise_num(reply) > 0 ? "锛#{get_praise_num(reply)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
<%= link_to(
l(:button_reply),
@@ -245,5 +238,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..fc877d809 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -101,11 +101,7 @@
@@ -115,6 +111,7 @@
鍥炲
<%= @comments.count>0 ? "锛#{@comments.count}锛" : "" %> 鈻
- <% if @news.author == User.current %>
- 璧<%= get_praise_num(@news) > 0 ? "锛#{get_praise_num(@news)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@news, :user_activity_id=>@news.id,:type=>"activity"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@news, :user_activity_id=>@news.id,:type=>"activity"}%>
@@ -136,11 +133,7 @@
<%= format_time(reply.created_on) %>
- <% if reply.author == User.current %>
- 璧<%= get_praise_num(reply) > 0 ? "锛#{get_praise_num(reply)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
<%= link_to_if_authorized_course(
l(:button_delete),
@@ -210,5 +203,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..4fc9482d4 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -71,11 +71,7 @@
@@ -84,6 +80,7 @@
<% user = User.find(reply.creator_id) %>
@@ -99,11 +96,7 @@
鍥炲
<%= count>0 ? "锛#{count}锛" : "" %> 鈻
- <% if @document.creator_id.to_i == User.current.id.to_i %>
- 璧<%= get_praise_num(@document) > 0 ? "锛#{get_praise_num(@document)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@document, :user_activity_id=>@document.id,:type=>"activity"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@document, :user_activity_id=>@document.id,:type=>"activity"}%>
<%= format_time(reply.created_at) %>
- <% if reply.creator_id.to_i == User.current.id.to_i %>
- 璧<%= get_praise_num(reply) > 0 ? "锛#{get_praise_num(reply)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
<%= link_to(
@@ -158,6 +151,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..bcbeca778 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 %>
@@ -290,12 +290,8 @@
锔
<%= count>0 ? "锛#{count}锛" : "" %> 鈻
- <% if activity.user == User.current %>
- 璧<%= get_praise_num(activity) > 0 ? "锛#{get_praise_num(activity)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
-
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+
<%if count>3 %>
@@ -315,6 +311,7 @@
<% replies_all_i = replies_all_i + 1 %>
@@ -358,11 +355,7 @@
- <% if comment.user == User.current %>
- 璧<%= get_praise_num(comment) > 0 ? "锛#{get_praise_num(comment)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
<%= link_to(
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 56dafed08..03e986716 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 %>
@@ -74,11 +74,7 @@
鍥炲
<%= count>0 ? "锛#{count}锛" : "" %> 鈻
- <% if activity.author == User.current %>
- 璧<%= get_praise_num(activity) > 0 ? "锛#{get_praise_num(activity)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
<%#=format_date(activity.updated_on)%>
@@ -100,6 +96,7 @@
<% replies_all_i=replies_all_i+1 %>
@@ -108,7 +105,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 %>
@@ -116,11 +113,7 @@
<% end %>
<%= format_time(reply.created_on) %>
- <% if reply.author == User.current %>
- 璧<%= get_praise_num(reply) > 0 ? "锛#{get_praise_num(reply)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index a6183e891..8c260c21c 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 %>
@@ -44,12 +44,8 @@
鍥炲
<%= count>0 ? "锛#{count}锛" : "" %> 鈻
- <% if activity.author == User.current %>
- 璧<%= get_praise_num(activity) > 0 ? "锛#{get_praise_num(activity)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
-
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+
<%#= format_date(activity.updated_on) %>
<%if count>3 %>
@@ -69,6 +65,7 @@
<% replies_all_i = replies_all_i + 1 %>
@@ -77,7 +74,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..bcc43610e 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 %>
@@ -85,11 +82,7 @@
<% end %>
<%= format_time(comment.created_on) %>
- <% if comment.author == User.current %>
- 璧<%= get_praise_num(comment) > 0 ? "锛#{get_praise_num(comment)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
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 %>
-
-
+
+
-
-
-
- <%= link_to "#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"澶村儚", :id => "nh_user_logo")}".html_safe, user_activities_path(User.current.id) %> - <%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '鐢ㄦ埛澶村儚', :target => '_blank', :class => "fr user-img" %> -
-
-
- - <%= link_to "淇敼璧勬枡", my_account_path, :class => "menuGrey"%> - -
- - <%= link_to "鎴戠殑缁勭粐", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%> - -
- - <%= link_to "鏂板缓缁勭粐", new_organization_path, :class => "menuGrey"%> - - -
- - <%= link_to "閫鍑", logout_url_without_domain, :class => "menuGrey", :method => "post"%> - -
+--
+
-
+ <%= link_to "#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"澶村儚", :id => "nh_user_logo")}".html_safe, user_activities_path(User.current.id) %> + <%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '鐢ㄦ埛澶村儚', :target => '_blank', :class => "fr user-img" %> +
-
+
- + <%= link_to "淇敼璧勬枡", my_account_path, :class => "menuGrey"%> + +
- + <%= link_to "鎴戠殑缁勭粐", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%> + +
- + <%= link_to "鏂板缓缁勭粐", new_organization_path, :class => "menuGrey"%> + + +
- + <%= link_to "閫鍑", logout_url_without_domain, :class => "menuGrey", :method => "post"%>
-
+
<% end %>
diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb
index 98c1e2df3..94eb2820a 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 %>
@@ -55,11 +55,7 @@
鍥炲
<%= count>0 ? "锛#{count}锛" : "" %> 鈻
- <% if activity.author == User.current %>
- 璧<%= get_praise_num(activity) > 0 ? "锛#{get_praise_num(activity)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
<%#= format_date(activity.updated_on) %>
@@ -80,6 +76,7 @@
<% replies_all_i=replies_all_i + 1 %>
@@ -88,7 +85,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 %>
@@ -96,11 +93,7 @@
<% end %>
<%= format_time(reply.created_on) %>
- <% if reply.user == User.current %>
- 璧<%= get_praise_num(reply) > 0 ? "锛#{get_praise_num(reply)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
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 %>
@@ -84,11 +84,7 @@
鍥炲
<%= count>0 ? "锛#{count}锛" : "" %> 鈻
- <% if activity.author == User.current %>
- 璧<%= get_praise_num(activity) > 0 ? "锛#{get_praise_num(activity)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
<%if count>3 %>
@@ -105,6 +101,7 @@
<% replies_all_i=replies_all_i+1 %>
@@ -113,7 +110,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 %>
@@ -121,11 +118,7 @@
<% end %>
<%= format_time(reply.created_on) %>
- <% if reply.author == User.current %>
- 璧<%= get_praise_num(reply) > 0 ? "锛#{get_praise_num(reply)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index daa81e96c..662a965e9 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 %>
@@ -64,11 +64,7 @@
鍥炲
<%= count>0 ? "锛#{count}锛" : "" %> 鈻
- <% if activity.author == User.current %>
- 璧<%= get_praise_num(activity) > 0 ? "锛#{get_praise_num(activity)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
<%#= format_date(activity.updated_on) %>
@@ -89,6 +85,7 @@
<% replies_all_i = replies_all_i + 1 %>
@@ -97,7 +94,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 %>
@@ -105,11 +102,7 @@
<% end %>
<%= format_time(comment.created_on) %>
- <% if comment.author == User.current %>
- 璧<%= get_praise_num(comment) > 0 ? "锛#{get_praise_num(comment)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
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..4407d86bd 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 %>
@@ -57,11 +57,7 @@
鍥炲
<%= count>0 ? "锛#{count}锛" : "" %> 鈻
- <% if activity.author == User.current %>
- 璧<%= get_praise_num(activity) > 0 ? "锛#{get_praise_num(activity)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
<%#=format_date(activity.updated_on)%>
@@ -79,6 +75,7 @@
<% replies_all_i=replies_all_i+1 %>
@@ -87,7 +84,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 %>
@@ -95,11 +92,7 @@
<% end %>
<%= format_time(reply.created_on) %>
- <% if reply.author == User.current %>
- 璧<%= get_praise_num(reply) > 0 ? "锛#{get_praise_num(reply)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
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..3042ca9ae 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -69,11 +69,7 @@
<% unless comment.content.blank? %>
- 鍥炲
<%= count>0 ? "锛#{count}锛" : "" %> 鈻
- <% if document.creator_id.to_i == User.current.id.to_i %>
- 璧<%= get_praise_num(document) > 0 ? "锛#{get_praise_num(document)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>
<% if count > 3 %>
@@ -88,6 +84,12 @@
-
<% 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) %>@@ -96,15 +98,11 @@ <%= link_to User.find(comment.creator_id), user_url_in_org(comment.creator_id), :class => "newsBlue mr10 f14" %> <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %> - <% if comment.creator_id.to_i == User.current.id.to_i %> - 璧<%= get_praise_num(comment) > 0 ? "锛#{get_praise_num(comment)}锛" : "" %> - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
<%= 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/_history.html.erb b/app/views/projects/_history.html.erb
index b31445fdc..88cf8f344 100644
--- a/app/views/projects/_history.html.erb
+++ b/app/views/projects/_history.html.erb
@@ -14,6 +14,9 @@
<% ids = 'project_respond_form_'+ journal.id.to_s%>
+
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
+
<% if journal.user == User.current|| User.current.admin? %>
<%= link_to(l(:label_bid_respond_delete),
{:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
@@ -26,7 +29,6 @@
<%= link_to l(:label_bid_respond_quote),'javascript:;', {:nhname=>"reply_btn"} %>
<% end %>
-
<% ids = 'project_respond_form_'+ journal.id.to_s%>
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..7baf93e4f 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 %>
@@ -44,11 +44,7 @@
鍥炲
<%= count>0 ? "锛#{count}锛" : "" %> 鈻
- <% if activity.author == User.current %>
- 璧<%= get_praise_num(activity) > 0 ? "锛#{get_praise_num(activity)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
<%#= format_date(activity.updated_on) %>
@@ -69,6 +65,7 @@
<% replies_all_i = replies_all_i + 1 %>
@@ -77,7 +74,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 %>
@@ -85,11 +82,7 @@
<% end %>
<%= format_time(comment.created_on) %>
- <% if comment.author == User.current %>
- 璧<%= get_praise_num(comment) > 0 ? "锛#{get_praise_num(comment)}锛" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
- <% end %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
@@ -125,4 +118,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/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index bcb7f853f..89ded10b3 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -2,8 +2,8 @@
搴忓彿
- 浣滃搧鍚嶇О
<% if @homework.homework_type != 3 %>
+ 浣滃搧鍚嶇О
濮撳悕
@@ -11,9 +11,12 @@
瀛﹀彿
<% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+ 浣滃搧鍚嶇О
鍏宠仈椤圭洰
+ <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
+ 浣滃搧鍚嶇О
<% end %>
鏃堕棿
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 1c8de2923..1a3220df6 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,25 +1,28 @@
-
+
-
+
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 @@
鏉 婧愶細
- {{issue.project_name}} | 椤圭洰缂洪櫡
+ {{issue.project_name}} | 椤圭洰闂
-
+
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 @@
-
+
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 = "
-
+
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css
index e3df3e0a4..2f83cfd46 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css
@@ -1,121 +1,121 @@
-.overlay_darkX {
- background-color: #85BBEF;
- filter:alpha(opacity=60);
- -moz-opacity: 0.6;
- opacity: 0.6;
-}
-
-.darkX_nw {
- background: transparent url(darkX/titlebar-left-focused.png) no-repeat 0 0;
- width:6px;
- height:21px;
-}
-.darkX_n {
- background: transparent url(darkX/titlebar-mid-focused.png) repeat-x 0 0;
- height:21px;
-}
-.darkX_ne {
- background: transparent url(darkX/titlebar-right-focused.png) no-repeat 0 0;
- width:6px;
- height:21px;
-}
-.darkX_w {
- background: transparent url(darkX/frame-left-focused.png) repeat-y top left;
- width:3px;
-}
-
-.darkX_e {
- background: transparent url(darkX/frame-right-focused.png) repeat-y top right;
- width:3px;
-}
-
-.darkX_sw {
- background: transparent url(darkX/frame-bottom-left-focused.png) no-repeat 0 0;
- width:5px;
- height:3px;
-}
-.darkX_s {
- background: transparent url(darkX/frame-bottom-mid-focused.png) repeat-x 0 0;
- height:3px;
-}
-.darkX_se, .darkX_sizer {
- background: transparent url(darkX/frame-bottom-right-focused.png) no-repeat 0 0;
- width:5px;
- height:3px;
-}
-
-.darkX_sizer {
- cursor:se-resize;
-}
-
-.darkX_close {
- width: 21px;
- height: 21px;
- background: transparent url(darkX/button-close-focused.png) no-repeat 0 0;
- position:absolute;
- top:0px;
- right:5px;
- cursor:pointer;
- z-index:1000;
-}
-
-.darkX_minimize {
- width: 21px;
- height: 21px;
- background: transparent url(darkX/button-minimize-focused.png) no-repeat 0 0;
- position:absolute;
- top:0px;
- right:26px;
- cursor:pointer;
- z-index:1000;
-}
-
-.darkX_maximize {
- width: 21px;
- height: 21px;
- background: transparent url(darkX/button-maximize-focused.png) no-repeat 0 0;
- position:absolute;
- top:0px;
- right:47px;
- cursor:pointer;
- z-index:1000;
-}
-
-
-.darkX_title {
- float:left;
- height:14px;
- font-size:12px;
- text-align:center;
- margin-top:2px;
- width:100%;
- color:#FFF;
-}
-
-.darkX_content {
- overflow:auto;
- color: #E6DF2A;
- font-family: Tahoma, Arial, sans-serif;
- font-size: 14px;
- background:#5E5148;
-}
-
-
-/* FOR IE */
-* html .darkX_minimize {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-minimize-focused.png", sizingMethod="crop");
-}
-
-* html .darkX_maximize {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-maximize-focused.png", sizingMethod="scale");
-}
-
-* html .darkX_close {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-close-focused.png", sizingMethod="crop");
-}
+.overlay_darkX {
+ background-color: #85BBEF;
+ filter:alpha(opacity=60);
+ -moz-opacity: 0.6;
+ opacity: 0.6;
+}
+
+.darkX_nw {
+ background: transparent url(darkX/titlebar-left-focused.png) no-repeat 0 0;
+ width:6px;
+ height:21px;
+}
+.darkX_n {
+ background: transparent url(darkX/titlebar-mid-focused.png) repeat-x 0 0;
+ height:21px;
+}
+.darkX_ne {
+ background: transparent url(darkX/titlebar-right-focused.png) no-repeat 0 0;
+ width:6px;
+ height:21px;
+}
+.darkX_w {
+ background: transparent url(darkX/frame-left-focused.png) repeat-y top left;
+ width:3px;
+}
+
+.darkX_e {
+ background: transparent url(darkX/frame-right-focused.png) repeat-y top right;
+ width:3px;
+}
+
+.darkX_sw {
+ background: transparent url(darkX/frame-bottom-left-focused.png) no-repeat 0 0;
+ width:5px;
+ height:3px;
+}
+.darkX_s {
+ background: transparent url(darkX/frame-bottom-mid-focused.png) repeat-x 0 0;
+ height:3px;
+}
+.darkX_se, .darkX_sizer {
+ background: transparent url(darkX/frame-bottom-right-focused.png) no-repeat 0 0;
+ width:5px;
+ height:3px;
+}
+
+.darkX_sizer {
+ cursor:se-resize;
+}
+
+.darkX_close {
+ width: 21px;
+ height: 21px;
+ background: transparent url(darkX/button-close-focused.png) no-repeat 0 0;
+ position:absolute;
+ top:0px;
+ right:5px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.darkX_minimize {
+ width: 21px;
+ height: 21px;
+ background: transparent url(darkX/button-minimize-focused.png) no-repeat 0 0;
+ position:absolute;
+ top:0px;
+ right:26px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.darkX_maximize {
+ width: 21px;
+ height: 21px;
+ background: transparent url(darkX/button-maximize-focused.png) no-repeat 0 0;
+ position:absolute;
+ top:0px;
+ right:47px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+
+.darkX_title {
+ float:left;
+ height:14px;
+ font-size:12px;
+ text-align:center;
+ margin-top:2px;
+ width:100%;
+ color:#FFF;
+}
+
+.darkX_content {
+ overflow:auto;
+ color: #E6DF2A;
+ font-family: Tahoma, Arial, sans-serif;
+ font-size: 14px;
+ background:#5E5148;
+}
+
+
+/* FOR IE */
+* html .darkX_minimize {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-minimize-focused.png", sizingMethod="crop");
+}
+
+* html .darkX_maximize {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-maximize-focused.png", sizingMethod="scale");
+}
+
+* html .darkX_close {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-close-focused.png", sizingMethod="crop");
+}
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css
index d7981e9ca..69e3b7fc2 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css
@@ -1,25 +1,25 @@
-div.inspector div.inspectable {
- padding: 0.25em 0 0.25em 1em;
- background-color: Gray;
- color: white;
- border: outset 2px white;
- cursor: pointer;
-}
-
-div.inspector div.child {
- margin: 0 0 0 1em;
-}
-
-#debug_window_content { /* DIV container for debug sizing*/
- width:250px;
- height:100px;
- background-color:#000;
-}
-
-#debug { /* DIV container for debug contents*/
- padding:3px;
- color:#0f0;
- font-family:monaco, Tahoma, Verdana, Arial, Helvetica, sans-serif;
- font-size:10px;
-}
-
+div.inspector div.inspectable {
+ padding: 0.25em 0 0.25em 1em;
+ background-color: Gray;
+ color: white;
+ border: outset 2px white;
+ cursor: pointer;
+}
+
+div.inspector div.child {
+ margin: 0 0 0 1em;
+}
+
+#debug_window_content { /* DIV container for debug sizing*/
+ width:250px;
+ height:100px;
+ background-color:#000;
+}
+
+#debug { /* DIV container for debug contents*/
+ padding:3px;
+ color:#0f0;
+ font-family:monaco, Tahoma, Verdana, Arial, Helvetica, sans-serif;
+ font-size:10px;
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css
index 591451723..6ab13789d 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css
@@ -1,155 +1,155 @@
-.overlay_dialog {
- background-color: #666666;
- filter:alpha(opacity=60);
- -moz-opacity: 0.6;
- opacity: 0.6;
-}
-
-.overlay___invisible__ {
- background-color: #666666;
- filter:alpha(opacity=0);
- -moz-opacity: 0;
- opacity: 0;
-}
-
-.dialog_nw {
- width: 9px;
- height: 23px;
- background: transparent url(default/top_left.gif) no-repeat 0 0;
-}
-
-.dialog_n {
- background: transparent url(default/top_mid.gif) repeat-x 0 0;
- height: 23px;
-}
-
-.dialog_ne {
- width: 9px;
- height: 23px;
- background: transparent url(default/top_right.gif) no-repeat 0 0;
-}
-
-.dialog_e {
- width: 2px;
- background: transparent url(default/center_right.gif) repeat-y 0 0;
-}
-
-.dialog_w {
- width: 2px;
- background: transparent url(default/center_left.gif) repeat-y 0 0;
-}
-
-.dialog_sw {
- width: 9px;
- height: 19px;
- background: transparent url(default/bottom_left.gif) no-repeat 0 0;
-}
-
-.dialog_s {
- background: transparent url(default/bottom_mid.gif) repeat-x 0 0;
- height: 19px;
-}
-
-.dialog_se {
- width: 9px;
- height: 19px;
- background: transparent url(default/bottom_right.gif) no-repeat 0 0;
-}
-
-.dialog_sizer {
- width: 9px;
- height: 19px;
- background: transparent url(default/sizer.gif) no-repeat 0 0;
- cursor:se-resize;
-}
-
-.dialog_close {
- width: 14px;
- height: 14px;
- background: transparent url(default/close.gif) no-repeat 0 0;
- position:absolute;
- top:5px;
- left:8px;
- cursor:pointer;
- z-index:2000;
-}
-
-.dialog_minimize {
- width: 14px;
- height: 15px;
- background: transparent url(default/minimize.gif) no-repeat 0 0;
- position:absolute;
- top:5px;
- left:28px;
- cursor:pointer;
- z-index:2000;
-}
-
-.dialog_maximize {
- width: 14px;
- height: 15px;
- background: transparent url(default/maximize.gif) no-repeat 0 0;
- position:absolute;
- top:5px;
- left:49px;
- cursor:pointer;
- z-index:2000;
-}
-
-.dialog_title {
- float:left;
- height:14px;
- font-family: Tahoma, Arial, sans-serif;
- font-size:12px;
- text-align:center;
- width:100%;
- color:#000;
-}
-
-.dialog_content {
- overflow:auto;
- color: #DDD;
- font-family: Tahoma, Arial, sans-serif;
- font-size: 10px;
- background-color:#123;
-}
-
-.top_draggable, .bottom_draggable {
- cursor:move;
-}
-
-.status_bar {
- font-size:12px;
-}
-.status_bar input{
- font-size:12px;
-}
-
-.wired_frame {
- display: block;
- position: absolute;
- border: 1px #000 dashed;
-}
-
-/* DO NOT CHANGE THESE VALUES*/
-.dialog {
- display: block;
- position: absolute;
-}
-
-.dialog table.table_window {
- border-collapse: collapse;
- border-spacing: 0;
- width: 100%;
- margin: 0px;
- padding:0px;
-}
-
-.dialog table.table_window td , .dialog table.table_window th {
- padding: 0;
-}
-
-.dialog .title_window {
- -moz-user-select:none;
-}
-
+.overlay_dialog {
+ background-color: #666666;
+ filter:alpha(opacity=60);
+ -moz-opacity: 0.6;
+ opacity: 0.6;
+}
+
+.overlay___invisible__ {
+ background-color: #666666;
+ filter:alpha(opacity=0);
+ -moz-opacity: 0;
+ opacity: 0;
+}
+
+.dialog_nw {
+ width: 9px;
+ height: 23px;
+ background: transparent url(default/top_left.gif) no-repeat 0 0;
+}
+
+.dialog_n {
+ background: transparent url(default/top_mid.gif) repeat-x 0 0;
+ height: 23px;
+}
+
+.dialog_ne {
+ width: 9px;
+ height: 23px;
+ background: transparent url(default/top_right.gif) no-repeat 0 0;
+}
+
+.dialog_e {
+ width: 2px;
+ background: transparent url(default/center_right.gif) repeat-y 0 0;
+}
+
+.dialog_w {
+ width: 2px;
+ background: transparent url(default/center_left.gif) repeat-y 0 0;
+}
+
+.dialog_sw {
+ width: 9px;
+ height: 19px;
+ background: transparent url(default/bottom_left.gif) no-repeat 0 0;
+}
+
+.dialog_s {
+ background: transparent url(default/bottom_mid.gif) repeat-x 0 0;
+ height: 19px;
+}
+
+.dialog_se {
+ width: 9px;
+ height: 19px;
+ background: transparent url(default/bottom_right.gif) no-repeat 0 0;
+}
+
+.dialog_sizer {
+ width: 9px;
+ height: 19px;
+ background: transparent url(default/sizer.gif) no-repeat 0 0;
+ cursor:se-resize;
+}
+
+.dialog_close {
+ width: 14px;
+ height: 14px;
+ background: transparent url(default/close.gif) no-repeat 0 0;
+ position:absolute;
+ top:5px;
+ left:8px;
+ cursor:pointer;
+ z-index:2000;
+}
+
+.dialog_minimize {
+ width: 14px;
+ height: 15px;
+ background: transparent url(default/minimize.gif) no-repeat 0 0;
+ position:absolute;
+ top:5px;
+ left:28px;
+ cursor:pointer;
+ z-index:2000;
+}
+
+.dialog_maximize {
+ width: 14px;
+ height: 15px;
+ background: transparent url(default/maximize.gif) no-repeat 0 0;
+ position:absolute;
+ top:5px;
+ left:49px;
+ cursor:pointer;
+ z-index:2000;
+}
+
+.dialog_title {
+ float:left;
+ height:14px;
+ font-family: Tahoma, Arial, sans-serif;
+ font-size:12px;
+ text-align:center;
+ width:100%;
+ color:#000;
+}
+
+.dialog_content {
+ overflow:auto;
+ color: #DDD;
+ font-family: Tahoma, Arial, sans-serif;
+ font-size: 10px;
+ background-color:#123;
+}
+
+.top_draggable, .bottom_draggable {
+ cursor:move;
+}
+
+.status_bar {
+ font-size:12px;
+}
+.status_bar input{
+ font-size:12px;
+}
+
+.wired_frame {
+ display: block;
+ position: absolute;
+ border: 1px #000 dashed;
+}
+
+/* DO NOT CHANGE THESE VALUES*/
+.dialog {
+ display: block;
+ position: absolute;
+}
+
+.dialog table.table_window {
+ border-collapse: collapse;
+ border-spacing: 0;
+ width: 100%;
+ margin: 0px;
+ padding:0px;
+}
+
+.dialog table.table_window td , .dialog table.table_window th {
+ padding: 0;
+}
+
+.dialog .title_window {
+ -moz-user-select:none;
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css
index 249388be5..257a1b1e3 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css
@@ -1,3 +1,3 @@
-/* PNG fix for all themes that uses PNG images on IE */
-td, div { behavior: url(../themes/iefix/iepngfix.htc) }
-
+/* PNG fix for all themes that uses PNG images on IE */
+td, div { behavior: url(../themes/iefix/iepngfix.htc) }
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc
index 9a13f32bf..a6c683b9f 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc
@@ -1,54 +1,54 @@
-
-
+
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css
index 0d955c3d7..95ec287a9 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css
@@ -1,960 +1,960 @@
-.overlay___invisible__ {
- background-color: #666;
- filter:alpha(opacity=0);
- -moz-opacity: 0;
- opacity: 0;
-}
-
-.top_draggable, .bottom_draggable {
- cursor:move;
-}
-
-.status_bar {
- font-size:12px;
-}
-.status_bar input{
- font-size:12px;
-}
-
-.wired_frame {
- display:block;
- position:absolute;
- border:1px #000 dashed;
-}
-
-
-
-.overlay_bluelighting {
- background-color:#FFF;
- filter:alpha(opacity=60);
- -moz-opacity:0.6;
- opacity:0.6;
-}
-
-.bluelighting_wired_frame {
- background:#FFF;
- filter:alpha(opacity=60);
- -moz-opacity:0.6;
- opacity:0.6;
-}
-
-.bluelighting_nw {
- background:transparent url(lighting/top-left-blue.png) no-repeat 0 0;
- width:9px;
- height:28px;
-}
-
-.bluelighting_n {
- background:transparent url(lighting/top-middle-blue.png) repeat-x 0 0;
- height:28px;
-}
-
-.bluelighting_ne {
- background:transparent url(lighting/top-right-blue.png) no-repeat 0 0;
- width:15px;
- height:28px;
-}
-
-.bluelighting_w {
- background:transparent url(lighting/left-blue.png) repeat-y top left;
- width:9px;
-}
-
-.bluelighting_e {
- background:transparent url(lighting/right-blue.png) repeat-y top right;
- width:15px;
-}
-
-.bluelighting_sw {
- background:transparent url(lighting/bottom-left-blue.png) no-repeat 0 0;
- width:9px;
- height:15px;
-}
-
-.bluelighting_s {
- background:transparent url(lighting/bottom-middle-blue.png) repeat-x 0 0;
- height:15px;
-}
-
-.bluelighting_se, .bluelighting_sizer {
- background:transparent url(lighting/bottom-right-blue.png) no-repeat 0 0;
- width:15px;
- height:15px;
-}
-
-.bluelighting_sizer {
- cursor:se-resize;
-}
-
-.bluelighting_close {
- width:15px;
- height:9px;
- background:transparent url(lighting/button-close-blue.png) no-repeat 0 0;
- position:absolute;
- top:11px;
- right:10px;
- cursor:pointer;
- z-index:1000;
-}
-
-.bluelighting_maximize {
- width:15px;
- height:9px;
- background:transparent url(lighting/button-maximize-blue.png) no-repeat 0 0;
- position:absolute;
- top:11px;
- right:25px;
- cursor:pointer;
- z-index:1000;
-}
-
-.bluelighting_minimize {
- width:15px;
- height:9px;
- background:transparent url(lighting/button-minimize-blue.png) no-repeat 0 0;
- position:absolute;
- top:11px;
- right:40px;
- cursor:pointer;
- z-index:1000;
-}
-
-.bluelighting_title {
- float:left;
- height:14px;
- font-size:14px;
- font-weight:bold;
- font-family:Verdana, Arial, sans-serif;
- text-align:center;
- margin-top:2px;
- width:100%;
- color:#17385B;
-}
-
-.bluelighting_content {
- overflow:auto;
- color:#000;
- font-family:Verdana, Arial, sans-serif;
- font-size:12px;
- background:#BFDBFF;
-}
-
-/* For alert/confirm dialog */
-.bluelighting_window {
- border:1px solid #F00;
- background:#FFF;
- padding:20px;
- margin-left:auto;
- margin-right:auto;
- width:400px;
-}
-
-.bluelighting_message {
- font-size:12px;
- text-align:center;
- width:100%;
- padding-bottom:10px;
-}
-
-.bluelighting_buttons {
- text-align:center;
- width:100%;
-}
-
-.bluelighting_buttons input {
- border:1px solid #999;
- border-top-color:#CCC;
- border-left-color:#CCC;
- padding:2px;
- background-color:#FFF;
- color:#333;
- background-image:url(lighting/background_buttons.gif);
- background-repeat:repeat-x;
- font-family:Verdana, Arial, sans-serif;
- font-size:10px;
- font-weight:bold;
- text-align:center;
-}
-
-.bluelighting_progress {
- float:left;
- margin:auto;
- text-align:center;
- width:100%;
- height:16px;
- background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .bluelighting_nw {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_n {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_ne {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_w {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_e {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_sw {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_s {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_se, * html .bluelighting_sizer {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_close {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_minimize {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_maximize {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_content {
- background:#B8D7FF;
-}
-
-
-
-.overlay_greylighting {
- background-color:#FFF;
- filter:alpha(opacity=60);
- -moz-opacity:0.6;
- opacity:0.6;
-}
-
-.greylighting_wired_frame {
- background:#FFF;
- filter:alpha(opacity=60);
- -moz-opacity:0.6;
- opacity:0.6;
-}
-
-.greylighting_nw {
- background:transparent url(lighting/top-left-grey.png) no-repeat 0 0;
- width:9px;
- height:28px;
-}
-
-.greylighting_n {
- background:transparent url(lighting/top-middle-grey.png) repeat-x 0 0;
- height:28px;
-}
-
-.greylighting_ne {
- background:transparent url(lighting/top-right-grey.png) no-repeat 0 0;
- width:15px;
- height:28px;
-}
-
-.greylighting_w {
- background:transparent url(lighting/left-grey.png) repeat-y top left;
- width:9px;
-}
-
-.greylighting_e {
- background:transparent url(lighting/right-grey.png) repeat-y top right;
- width:15px;
-}
-
-.greylighting_sw {
- background:transparent url(lighting/bottom-left-grey.png) no-repeat 0 0;
- width:9px;
- height:15px;
-}
-
-.greylighting_s {
- background:transparent url(lighting/bottom-middle-grey.png) repeat-x 0 0;
- height:15px;
-}
-
-.greylighting_se, .greylighting_sizer {
- background:transparent url(lighting/bottom-right-grey.png) no-repeat 0 0;
- width:15px;
- height:15px;
-}
-
-.greylighting_sizer {
- cursor:se-resize;
-}
-
-.greylighting_close {
- width:15px;
- height:9px;
- background:transparent url(lighting/button-close-grey.png) no-repeat 0 0;
- position:absolute;
- top:11px;
- right:10px;
- cursor:pointer;
- z-index:1000;
-}
-
-.greylighting_maximize {
- width:15px;
- height:9px;
- background:transparent url(lighting/button-maximize-grey.png) no-repeat 0 0;
- position:absolute;
- top:11px;
- right:25px;
- cursor:pointer;
- z-index:1000;
-}
-
-.greylighting_minimize {
- width:15px;
- height:9px;
- background:transparent url(lighting/button-minimize-grey.png) no-repeat 0 0;
- position:absolute;
- top:11px;
- right:40px;
- cursor:pointer;
- z-index:1000;
-}
-
-.greylighting_title {
- float:left;
- height:14px;
- font-size:14px;
- font-weight:bold;
- font-family:Verdana, Arial, sans-serif;
- text-align:center;
- margin-top:2px;
- width:100%;
- color:#525252;
-}
-
-.greylighting_content {
- overflow:auto;
- color:#000;
- font-family:Verdana, Arial, sans-serif;
- font-size:12px;
- background:#CDCDCD;
-}
-
-/* For alert/confirm dialog */
-.greylighting_window {
- border:1px solid #F00;
- background:#FFF;
- padding:20px;
- margin-left:auto;
- margin-right:auto;
- width:400px;
-}
-
-.greylighting_message {
- font-size:12px;
- text-align:center;
- width:100%;
- padding-bottom:10px;
-}
-
-.greylighting_buttons {
- text-align:center;
- width:100%;
-}
-
-.greylighting_buttons input {
- border:1px solid #999;
- border-top-color:#CCC;
- border-left-color:#CCC;
- padding:2px;
- background-color:#FFF;
- color:#333;
- background-image:url(lighting/background_buttons.gif);
- background-repeat:repeat-x;
- font-family:Verdana, Arial, sans-serif;
- font-size:10px;
- font-weight:bold;
- text-align:center;
-}
-
-.greylighting_progress {
- float:left;
- margin:auto;
- text-align:center;
- width:100%;
- height:16px;
- background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .greylighting_nw {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_n {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_ne {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_w {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_e {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_sw {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_s {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-grey.png", sizingMethod="scale");
-}
-
-* html greylighting_se, * html .greylighting_sizer {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_close {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_minimize {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_maximize {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_content {
- background:#C7C7C7;
-}
-
-
-
-.overlay_greenlighting {
- background-color:#FFF;
- filter:alpha(opacity=60);
- -moz-opacity:0.6;
- opacity:0.6;
-}
-
-.greenlighting_wired_frame {
- background:#FFF;
- filter:alpha(opacity=60);
- -moz-opacity:0.6;
- opacity:0.6;
-}
-
-.greenlighting_nw {
- background:transparent url(lighting/top-left-green.png) no-repeat 0 0;
- width:9px;
- height:28px;
-}
-
-.greenlighting_n {
- background:transparent url(lighting/top-middle-green.png) repeat-x 0 0;
- height:28px;
-}
-
-.greenlighting_ne {
- background:transparent url(lighting/top-right-green.png) no-repeat 0 0;
- width:15px;
- height:28px;
-}
-
-.greenlighting_w {
- background:transparent url(lighting/left-green.png) repeat-y top left;
- width:9px;
-}
-
-.greenlighting_e {
- background:transparent url(lighting/right-green.png) repeat-y top right;
- width:15px;
-}
-
-.greenlighting_sw {
- background:transparent url(lighting/bottom-left-green.png) no-repeat 0 0;
- width:9px;
- height:15px;
-}
-
-.greenlighting_s {
- background:transparent url(lighting/bottom-middle-green.png) repeat-x 0 0;
- height:15px;
-}
-
-.greenlighting_se, .greenlighting_sizer {
- background:transparent url(lighting/bottom-right-green.png) no-repeat 0 0;
- width:15px;
- height:15px;
-}
-
-.greenlighting_sizer {
- cursor:se-resize;
-}
-
-.greenlighting_close {
- width:15px;
- height:9px;
- background:transparent url(lighting/button-close-green.png) no-repeat 0 0;
- position:absolute;
- top:11px;
- right:10px;
- cursor:pointer;
- z-index:1000;
-}
-
-.greenlighting_maximize {
- width:15px;
- height:9px;
- background:transparent url(lighting/button-maximize-green.png) no-repeat 0 0;
- position:absolute;
- top:11px;
- right:25px;
- cursor:pointer;
- z-index:1000;
-}
-
-.greenlighting_minimize {
- width:15px;
- height:9px;
- background:transparent url(lighting/button-minimize-green.png) no-repeat 0 0;
- position:absolute;
- top:11px;
- right:40px;
- cursor:pointer;
- z-index:1000;
-}
-
-.greenlighting_title {
- float:left;
- height:14px;
- font-size:14px;
- font-weight:bold;
- font-family:Verdana, Arial, sans-serif;
- text-align:center;
- margin-top:2px;
- width:100%;
- color:#2A6002;
-}
-
-.greenlighting_content {
- overflow:auto;
- color:#000;
- font-family:Verdana, Arial, sans-serif;
- font-size:12px;
- background:#ACFCAF;
-}
-
-/* For alert/confirm dialog */
-.greenlighting_window {
- border:1px solid #F00;
- background:#FFF;
- padding:20px;
- margin-left:auto;
- margin-right:auto;
- width:400px;
-}
-
-.greenlighting_message {
- font-size:12px;
- text-align:center;
- width:100%;
- padding-bottom:10px;
-}
-
-.greenlighting_buttons {
- text-align:center;
- width:100%;
-}
-
-.greenlighting_buttons input {
- border:1px solid #999;
- border-top-color:#CCC;
- border-left-color:#CCC;
- padding:2px;
- background-color:#FFF;
- color:#333;
- background-image:url(lighting/background_buttons.gif);
- background-repeat:repeat-x;
- font-family:Verdana, Arial, sans-serif;
- font-size:10px;
- font-weight:bold;
- text-align:center;
-}
-
-.greenlighting_progress {
- float:left;
- margin:auto;
- text-align:center;
- width:100%;
- height:16px;
- background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .greenlighting_nw {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_n {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_ne {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_w {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_e {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_sw {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_s {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-green.png", sizingMethod="scale");
-}
-
-* html greenlighting_se, * html .greenlighting_sizer {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_close {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_minimize {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_maximize {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_content {
- background:#A4FCA7;
-}
-
-
-
-.overlay_darkbluelighting {
- background-color:#FFF;
- filter:alpha(opacity=60);
- -moz-opacity:0.6;
- opacity:0.6;
-}
-
-.darkbluelighting_wired_frame {
- background:#FFF;
- filter:alpha(opacity=60);
- -moz-opacity:0.6;
- opacity:0.6;
-}
-
-.darkbluelighting_nw {
- background:transparent url(lighting/top-left-darkblue.png) no-repeat 0 0;
- width:9px;
- height:28px;
-}
-
-.darkbluelighting_n {
- background:transparent url(lighting/top-middle-darkblue.png) repeat-x 0 0;
- height:28px;
-}
-
-.darkbluelighting_ne {
- background:transparent url(lighting/top-right-darkblue.png) no-repeat 0 0;
- width:15px;
- height:28px;
-}
-
-.darkbluelighting_w {
- background:transparent url(lighting/left-darkblue.png) repeat-y top left;
- width:9px;
-}
-
-.darkbluelighting_e {
- background:transparent url(lighting/right-darkblue.png) repeat-y top right;
- width:15px;
-}
-
-.darkbluelighting_sw {
- background:transparent url(lighting/bottom-left-darkblue.png) no-repeat 0 0;
- width:9px;
- height:15px;
-}
-
-.darkbluelighting_s {
- background:transparent url(lighting/bottom-middle-darkblue.png) repeat-x 0 0;
- height:15px;
-}
-
-.darkbluelighting_se, .darkbluelighting_sizer {
- background:transparent url(lighting/bottom-right-darkblue.png) no-repeat 0 0;
- width:15px;
- height:15px;
-}
-
-.darkbluelighting_sizer {
- cursor:se-resize;
-}
-
-.darkbluelighting_close {
- width:15px;
- height:9px;
- background:transparent url(lighting/button-close-darkblue.png) no-repeat 0 0;
- position:absolute;
- top:11px;
- right:10px;
- cursor:pointer;
- z-index:1000;
-}
-
-.darkbluelighting_maximize {
- width:15px;
- height:9px;
- background:transparent url(lighting/button-maximize-darkblue.png) no-repeat 0 0;
- position:absolute;
- top:11px;
- right:25px;
- cursor:pointer;
- z-index:1000;
-}
-
-.darkbluelighting_minimize {
- width:15px;
- height:9px;
- background:transparent url(lighting/button-minimize-darkblue.png) no-repeat 0 0;
- position:absolute;
- top:11px;
- right:40px;
- cursor:pointer;
- z-index:1000;
-}
-
-.darkbluelighting_title {
- float:left;
- height:14px;
- font-size:14px;
- font-weight:bold;
- font-family:Verdana, Arial, sans-serif;
- text-align:center;
- margin-top:2px;
- width:100%;
- color:#E4EFFD;
-}
-
-.darkbluelighting_content {
- overflow:auto;
- color:#FFF;
- font-family:Verdana, Arial, sans-serif;
- font-size:12px;
- background:#0413C0;
-}
-
-/* For alert/confirm dialog */
-.darkbluelighting_window {
- border:1px solid #F00;
- background:#FFF;
- padding:20px;
- margin-left:auto;
- margin-right:auto;
- width:400px;
-}
-
-.darkbluelighting_message {
- font-size:12px;
- text-align:center;
- width:100%;
- padding-bottom:10px;
-}
-
-.darkbluelighting_buttons {
- text-align:center;
- width:100%;
-}
-
-.darkbluelighting_buttons input {
- border:1px solid #999;
- border-top-color:#CCC;
- border-left-color:#CCC;
- padding:2px;
- background-color:#FFF;
- color:#333;
- background-image:url(lighting/background_buttons.gif);
- background-repeat:repeat-x;
- font-family:Verdana, Arial, sans-serif;
- font-size:10px;
- font-weight:bold;
- text-align:center;
-}
-
-.darkbluelighting_progress {
- float:left;
- margin:auto;
- text-align:center;
- width:100%;
- height:16px;
- background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .darkbluelighting_nw {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_n {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_ne {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_w {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_e {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_sw {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_s {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-darkblue.png", sizingMethod="scale");
-}
-
-* html darkbluelighting_se, * html .darkbluelighting_sizer {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_close {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_minimize {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_maximize {
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_content {
- background:#020EBA;
-}
-
+.overlay___invisible__ {
+ background-color: #666;
+ filter:alpha(opacity=0);
+ -moz-opacity: 0;
+ opacity: 0;
+}
+
+.top_draggable, .bottom_draggable {
+ cursor:move;
+}
+
+.status_bar {
+ font-size:12px;
+}
+.status_bar input{
+ font-size:12px;
+}
+
+.wired_frame {
+ display:block;
+ position:absolute;
+ border:1px #000 dashed;
+}
+
+
+
+.overlay_bluelighting {
+ background-color:#FFF;
+ filter:alpha(opacity=60);
+ -moz-opacity:0.6;
+ opacity:0.6;
+}
+
+.bluelighting_wired_frame {
+ background:#FFF;
+ filter:alpha(opacity=60);
+ -moz-opacity:0.6;
+ opacity:0.6;
+}
+
+.bluelighting_nw {
+ background:transparent url(lighting/top-left-blue.png) no-repeat 0 0;
+ width:9px;
+ height:28px;
+}
+
+.bluelighting_n {
+ background:transparent url(lighting/top-middle-blue.png) repeat-x 0 0;
+ height:28px;
+}
+
+.bluelighting_ne {
+ background:transparent url(lighting/top-right-blue.png) no-repeat 0 0;
+ width:15px;
+ height:28px;
+}
+
+.bluelighting_w {
+ background:transparent url(lighting/left-blue.png) repeat-y top left;
+ width:9px;
+}
+
+.bluelighting_e {
+ background:transparent url(lighting/right-blue.png) repeat-y top right;
+ width:15px;
+}
+
+.bluelighting_sw {
+ background:transparent url(lighting/bottom-left-blue.png) no-repeat 0 0;
+ width:9px;
+ height:15px;
+}
+
+.bluelighting_s {
+ background:transparent url(lighting/bottom-middle-blue.png) repeat-x 0 0;
+ height:15px;
+}
+
+.bluelighting_se, .bluelighting_sizer {
+ background:transparent url(lighting/bottom-right-blue.png) no-repeat 0 0;
+ width:15px;
+ height:15px;
+}
+
+.bluelighting_sizer {
+ cursor:se-resize;
+}
+
+.bluelighting_close {
+ width:15px;
+ height:9px;
+ background:transparent url(lighting/button-close-blue.png) no-repeat 0 0;
+ position:absolute;
+ top:11px;
+ right:10px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.bluelighting_maximize {
+ width:15px;
+ height:9px;
+ background:transparent url(lighting/button-maximize-blue.png) no-repeat 0 0;
+ position:absolute;
+ top:11px;
+ right:25px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.bluelighting_minimize {
+ width:15px;
+ height:9px;
+ background:transparent url(lighting/button-minimize-blue.png) no-repeat 0 0;
+ position:absolute;
+ top:11px;
+ right:40px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.bluelighting_title {
+ float:left;
+ height:14px;
+ font-size:14px;
+ font-weight:bold;
+ font-family:Verdana, Arial, sans-serif;
+ text-align:center;
+ margin-top:2px;
+ width:100%;
+ color:#17385B;
+}
+
+.bluelighting_content {
+ overflow:auto;
+ color:#000;
+ font-family:Verdana, Arial, sans-serif;
+ font-size:12px;
+ background:#BFDBFF;
+}
+
+/* For alert/confirm dialog */
+.bluelighting_window {
+ border:1px solid #F00;
+ background:#FFF;
+ padding:20px;
+ margin-left:auto;
+ margin-right:auto;
+ width:400px;
+}
+
+.bluelighting_message {
+ font-size:12px;
+ text-align:center;
+ width:100%;
+ padding-bottom:10px;
+}
+
+.bluelighting_buttons {
+ text-align:center;
+ width:100%;
+}
+
+.bluelighting_buttons input {
+ border:1px solid #999;
+ border-top-color:#CCC;
+ border-left-color:#CCC;
+ padding:2px;
+ background-color:#FFF;
+ color:#333;
+ background-image:url(lighting/background_buttons.gif);
+ background-repeat:repeat-x;
+ font-family:Verdana, Arial, sans-serif;
+ font-size:10px;
+ font-weight:bold;
+ text-align:center;
+}
+
+.bluelighting_progress {
+ float:left;
+ margin:auto;
+ text-align:center;
+ width:100%;
+ height:16px;
+ background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .bluelighting_nw {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_n {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_ne {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_w {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_e {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_sw {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_s {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_se, * html .bluelighting_sizer {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_close {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_minimize {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_maximize {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_content {
+ background:#B8D7FF;
+}
+
+
+
+.overlay_greylighting {
+ background-color:#FFF;
+ filter:alpha(opacity=60);
+ -moz-opacity:0.6;
+ opacity:0.6;
+}
+
+.greylighting_wired_frame {
+ background:#FFF;
+ filter:alpha(opacity=60);
+ -moz-opacity:0.6;
+ opacity:0.6;
+}
+
+.greylighting_nw {
+ background:transparent url(lighting/top-left-grey.png) no-repeat 0 0;
+ width:9px;
+ height:28px;
+}
+
+.greylighting_n {
+ background:transparent url(lighting/top-middle-grey.png) repeat-x 0 0;
+ height:28px;
+}
+
+.greylighting_ne {
+ background:transparent url(lighting/top-right-grey.png) no-repeat 0 0;
+ width:15px;
+ height:28px;
+}
+
+.greylighting_w {
+ background:transparent url(lighting/left-grey.png) repeat-y top left;
+ width:9px;
+}
+
+.greylighting_e {
+ background:transparent url(lighting/right-grey.png) repeat-y top right;
+ width:15px;
+}
+
+.greylighting_sw {
+ background:transparent url(lighting/bottom-left-grey.png) no-repeat 0 0;
+ width:9px;
+ height:15px;
+}
+
+.greylighting_s {
+ background:transparent url(lighting/bottom-middle-grey.png) repeat-x 0 0;
+ height:15px;
+}
+
+.greylighting_se, .greylighting_sizer {
+ background:transparent url(lighting/bottom-right-grey.png) no-repeat 0 0;
+ width:15px;
+ height:15px;
+}
+
+.greylighting_sizer {
+ cursor:se-resize;
+}
+
+.greylighting_close {
+ width:15px;
+ height:9px;
+ background:transparent url(lighting/button-close-grey.png) no-repeat 0 0;
+ position:absolute;
+ top:11px;
+ right:10px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.greylighting_maximize {
+ width:15px;
+ height:9px;
+ background:transparent url(lighting/button-maximize-grey.png) no-repeat 0 0;
+ position:absolute;
+ top:11px;
+ right:25px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.greylighting_minimize {
+ width:15px;
+ height:9px;
+ background:transparent url(lighting/button-minimize-grey.png) no-repeat 0 0;
+ position:absolute;
+ top:11px;
+ right:40px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.greylighting_title {
+ float:left;
+ height:14px;
+ font-size:14px;
+ font-weight:bold;
+ font-family:Verdana, Arial, sans-serif;
+ text-align:center;
+ margin-top:2px;
+ width:100%;
+ color:#525252;
+}
+
+.greylighting_content {
+ overflow:auto;
+ color:#000;
+ font-family:Verdana, Arial, sans-serif;
+ font-size:12px;
+ background:#CDCDCD;
+}
+
+/* For alert/confirm dialog */
+.greylighting_window {
+ border:1px solid #F00;
+ background:#FFF;
+ padding:20px;
+ margin-left:auto;
+ margin-right:auto;
+ width:400px;
+}
+
+.greylighting_message {
+ font-size:12px;
+ text-align:center;
+ width:100%;
+ padding-bottom:10px;
+}
+
+.greylighting_buttons {
+ text-align:center;
+ width:100%;
+}
+
+.greylighting_buttons input {
+ border:1px solid #999;
+ border-top-color:#CCC;
+ border-left-color:#CCC;
+ padding:2px;
+ background-color:#FFF;
+ color:#333;
+ background-image:url(lighting/background_buttons.gif);
+ background-repeat:repeat-x;
+ font-family:Verdana, Arial, sans-serif;
+ font-size:10px;
+ font-weight:bold;
+ text-align:center;
+}
+
+.greylighting_progress {
+ float:left;
+ margin:auto;
+ text-align:center;
+ width:100%;
+ height:16px;
+ background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .greylighting_nw {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_n {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-grey.png", sizingMethod="scale");
+}
+
+* html .greylighting_ne {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_w {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-grey.png", sizingMethod="scale");
+}
+
+* html .greylighting_e {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-grey.png", sizingMethod="scale");
+}
+
+* html .greylighting_sw {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_s {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-grey.png", sizingMethod="scale");
+}
+
+* html greylighting_se, * html .greylighting_sizer {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_close {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_minimize {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_maximize {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_content {
+ background:#C7C7C7;
+}
+
+
+
+.overlay_greenlighting {
+ background-color:#FFF;
+ filter:alpha(opacity=60);
+ -moz-opacity:0.6;
+ opacity:0.6;
+}
+
+.greenlighting_wired_frame {
+ background:#FFF;
+ filter:alpha(opacity=60);
+ -moz-opacity:0.6;
+ opacity:0.6;
+}
+
+.greenlighting_nw {
+ background:transparent url(lighting/top-left-green.png) no-repeat 0 0;
+ width:9px;
+ height:28px;
+}
+
+.greenlighting_n {
+ background:transparent url(lighting/top-middle-green.png) repeat-x 0 0;
+ height:28px;
+}
+
+.greenlighting_ne {
+ background:transparent url(lighting/top-right-green.png) no-repeat 0 0;
+ width:15px;
+ height:28px;
+}
+
+.greenlighting_w {
+ background:transparent url(lighting/left-green.png) repeat-y top left;
+ width:9px;
+}
+
+.greenlighting_e {
+ background:transparent url(lighting/right-green.png) repeat-y top right;
+ width:15px;
+}
+
+.greenlighting_sw {
+ background:transparent url(lighting/bottom-left-green.png) no-repeat 0 0;
+ width:9px;
+ height:15px;
+}
+
+.greenlighting_s {
+ background:transparent url(lighting/bottom-middle-green.png) repeat-x 0 0;
+ height:15px;
+}
+
+.greenlighting_se, .greenlighting_sizer {
+ background:transparent url(lighting/bottom-right-green.png) no-repeat 0 0;
+ width:15px;
+ height:15px;
+}
+
+.greenlighting_sizer {
+ cursor:se-resize;
+}
+
+.greenlighting_close {
+ width:15px;
+ height:9px;
+ background:transparent url(lighting/button-close-green.png) no-repeat 0 0;
+ position:absolute;
+ top:11px;
+ right:10px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.greenlighting_maximize {
+ width:15px;
+ height:9px;
+ background:transparent url(lighting/button-maximize-green.png) no-repeat 0 0;
+ position:absolute;
+ top:11px;
+ right:25px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.greenlighting_minimize {
+ width:15px;
+ height:9px;
+ background:transparent url(lighting/button-minimize-green.png) no-repeat 0 0;
+ position:absolute;
+ top:11px;
+ right:40px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.greenlighting_title {
+ float:left;
+ height:14px;
+ font-size:14px;
+ font-weight:bold;
+ font-family:Verdana, Arial, sans-serif;
+ text-align:center;
+ margin-top:2px;
+ width:100%;
+ color:#2A6002;
+}
+
+.greenlighting_content {
+ overflow:auto;
+ color:#000;
+ font-family:Verdana, Arial, sans-serif;
+ font-size:12px;
+ background:#ACFCAF;
+}
+
+/* For alert/confirm dialog */
+.greenlighting_window {
+ border:1px solid #F00;
+ background:#FFF;
+ padding:20px;
+ margin-left:auto;
+ margin-right:auto;
+ width:400px;
+}
+
+.greenlighting_message {
+ font-size:12px;
+ text-align:center;
+ width:100%;
+ padding-bottom:10px;
+}
+
+.greenlighting_buttons {
+ text-align:center;
+ width:100%;
+}
+
+.greenlighting_buttons input {
+ border:1px solid #999;
+ border-top-color:#CCC;
+ border-left-color:#CCC;
+ padding:2px;
+ background-color:#FFF;
+ color:#333;
+ background-image:url(lighting/background_buttons.gif);
+ background-repeat:repeat-x;
+ font-family:Verdana, Arial, sans-serif;
+ font-size:10px;
+ font-weight:bold;
+ text-align:center;
+}
+
+.greenlighting_progress {
+ float:left;
+ margin:auto;
+ text-align:center;
+ width:100%;
+ height:16px;
+ background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .greenlighting_nw {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_n {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-green.png", sizingMethod="scale");
+}
+
+* html .greenlighting_ne {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_w {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-green.png", sizingMethod="scale");
+}
+
+* html .greenlighting_e {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-green.png", sizingMethod="scale");
+}
+
+* html .greenlighting_sw {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_s {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-green.png", sizingMethod="scale");
+}
+
+* html greenlighting_se, * html .greenlighting_sizer {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_close {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_minimize {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_maximize {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_content {
+ background:#A4FCA7;
+}
+
+
+
+.overlay_darkbluelighting {
+ background-color:#FFF;
+ filter:alpha(opacity=60);
+ -moz-opacity:0.6;
+ opacity:0.6;
+}
+
+.darkbluelighting_wired_frame {
+ background:#FFF;
+ filter:alpha(opacity=60);
+ -moz-opacity:0.6;
+ opacity:0.6;
+}
+
+.darkbluelighting_nw {
+ background:transparent url(lighting/top-left-darkblue.png) no-repeat 0 0;
+ width:9px;
+ height:28px;
+}
+
+.darkbluelighting_n {
+ background:transparent url(lighting/top-middle-darkblue.png) repeat-x 0 0;
+ height:28px;
+}
+
+.darkbluelighting_ne {
+ background:transparent url(lighting/top-right-darkblue.png) no-repeat 0 0;
+ width:15px;
+ height:28px;
+}
+
+.darkbluelighting_w {
+ background:transparent url(lighting/left-darkblue.png) repeat-y top left;
+ width:9px;
+}
+
+.darkbluelighting_e {
+ background:transparent url(lighting/right-darkblue.png) repeat-y top right;
+ width:15px;
+}
+
+.darkbluelighting_sw {
+ background:transparent url(lighting/bottom-left-darkblue.png) no-repeat 0 0;
+ width:9px;
+ height:15px;
+}
+
+.darkbluelighting_s {
+ background:transparent url(lighting/bottom-middle-darkblue.png) repeat-x 0 0;
+ height:15px;
+}
+
+.darkbluelighting_se, .darkbluelighting_sizer {
+ background:transparent url(lighting/bottom-right-darkblue.png) no-repeat 0 0;
+ width:15px;
+ height:15px;
+}
+
+.darkbluelighting_sizer {
+ cursor:se-resize;
+}
+
+.darkbluelighting_close {
+ width:15px;
+ height:9px;
+ background:transparent url(lighting/button-close-darkblue.png) no-repeat 0 0;
+ position:absolute;
+ top:11px;
+ right:10px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.darkbluelighting_maximize {
+ width:15px;
+ height:9px;
+ background:transparent url(lighting/button-maximize-darkblue.png) no-repeat 0 0;
+ position:absolute;
+ top:11px;
+ right:25px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.darkbluelighting_minimize {
+ width:15px;
+ height:9px;
+ background:transparent url(lighting/button-minimize-darkblue.png) no-repeat 0 0;
+ position:absolute;
+ top:11px;
+ right:40px;
+ cursor:pointer;
+ z-index:1000;
+}
+
+.darkbluelighting_title {
+ float:left;
+ height:14px;
+ font-size:14px;
+ font-weight:bold;
+ font-family:Verdana, Arial, sans-serif;
+ text-align:center;
+ margin-top:2px;
+ width:100%;
+ color:#E4EFFD;
+}
+
+.darkbluelighting_content {
+ overflow:auto;
+ color:#FFF;
+ font-family:Verdana, Arial, sans-serif;
+ font-size:12px;
+ background:#0413C0;
+}
+
+/* For alert/confirm dialog */
+.darkbluelighting_window {
+ border:1px solid #F00;
+ background:#FFF;
+ padding:20px;
+ margin-left:auto;
+ margin-right:auto;
+ width:400px;
+}
+
+.darkbluelighting_message {
+ font-size:12px;
+ text-align:center;
+ width:100%;
+ padding-bottom:10px;
+}
+
+.darkbluelighting_buttons {
+ text-align:center;
+ width:100%;
+}
+
+.darkbluelighting_buttons input {
+ border:1px solid #999;
+ border-top-color:#CCC;
+ border-left-color:#CCC;
+ padding:2px;
+ background-color:#FFF;
+ color:#333;
+ background-image:url(lighting/background_buttons.gif);
+ background-repeat:repeat-x;
+ font-family:Verdana, Arial, sans-serif;
+ font-size:10px;
+ font-weight:bold;
+ text-align:center;
+}
+
+.darkbluelighting_progress {
+ float:left;
+ margin:auto;
+ text-align:center;
+ width:100%;
+ height:16px;
+ background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .darkbluelighting_nw {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_n {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-darkblue.png", sizingMethod="scale");
+}
+
+* html .darkbluelighting_ne {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_w {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-darkblue.png", sizingMethod="scale");
+}
+
+* html .darkbluelighting_e {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-darkblue.png", sizingMethod="scale");
+}
+
+* html .darkbluelighting_sw {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_s {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-darkblue.png", sizingMethod="scale");
+}
+
+* html darkbluelighting_se, * html .darkbluelighting_sizer {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_close {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_minimize {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_maximize {
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_content {
+ background:#020EBA;
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc
index 92248c665..36ea182e7 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc
@@ -1,67 +1,67 @@
-
-
| 搴忓彿 | - | 浣滃搧鍚嶇О | <% if @homework.homework_type != 3 %> -+ | 浣滃搧鍚嶇О | +<%= link_to "濮撳悕",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl #{@homework.anonymous_comment == 1 ? 'ml35' : 'ml18'}" ,:remote => true%> <% if @show_all && @order == "lastname"%> <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> <% end%> | -+ | <%= link_to "瀛﹀彿",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml30" ,:remote => true%> <% if @show_all && @order == "student_id"%> <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> <% end%> | <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> -+ | 浣滃搧鍚嶇О | +鍏宠仈椤圭洰 | + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> +浣滃搧鍚嶇О | <% end %><%= link_to "鏃堕棿",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%> diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index 0fc4ae480..688e31451 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -5,20 +5,26 @@ | <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %> | -
- <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '鐨勪綔鍝' : student_work.name%>
-
- <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
-
- |
- <% if @homework.homework_type != 3 %>
- + <% if @homework.homework_type != 3 %> + |
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '鐨勪綔鍝' : student_work.name%>
+
+ <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
+
+ |
+ <%= student_work.user.show_name%> | " onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;"> <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> | - <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> +
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '鐨勪綔鍝' : student_work.name%>
+
+ <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
+
+ |
<% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
<%= link_to( student_work.project.name, project_path(student_work.project.id))%> @@ -28,7 +34,14 @@ <%= student_work.project.name %> | <% end %> - <% end %> + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> +
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '鐨勪綔鍝' : student_work.name%>
+
+ <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
+
+ |
+ <% end %>
<% if student_work.created_at && @homework.end_time%> <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%> diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index 0259fddf7..ba017af5f 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -12,14 +12,14 @@ | <%=index + 1 %> | <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40", style: "display:block;") %> - | -
-
- <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '鐨勪綔鍝' : student_work.name%>
- <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
-
|
<% if @homework.homework_type != 3 %>
+
+
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '鐨勪綔鍝' : student_work.name%>
+ <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
+
+ |
<%= student_work.user.show_name%> | @@ -27,6 +27,12 @@ <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> +
+
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '鐨勪綔鍝' : student_work.name%>
+ <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
+
+ |
<% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
<%= link_to( student_work.project.name, project_path(student_work.project.id))%> @@ -36,6 +42,13 @@ <%= student_work.project.name %> | <% end %> + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> +
+
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '鐨勪綔鍝' : student_work.name%>
+ <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
+
+ |
<% end %>
<% else%>
<%=index + 1 %> | diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index 1c699d331..eaf6b9304 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -24,7 +24,7 @@ <%= link_to "浠ｇ爜鏌ラ噸", work_canrepeat_student_work_index_path(homework:@homework.id, course_id:@course.id), class: 'BlueCirBtn fl',:remote => true %> <% end %> <% end%> - [ 鏄剧ず浣滀笟淇℃伅 ] + [ 鏄剧ず浣滀笟淇℃伅 ] @@ -39,6 +39,10 @@ <% 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 @@ +
|---|
- 杩熶氦鎵ｅ垎锛歿{homework.late_penalty}}鍒
- 缂鸿瘎鎵ｅ垎锛歿{homework.absence_penalty}}鍒/浣滃搧
- 鍖胯瘎寮鍚椂闂达細{{homework.evaluation_start}}
- 鍖胯瘎鍏抽棴鏃堕棿锛歿{homework.evaluation_end}} + 杩熶氦鎵ｅ垎锛歿{homework.late_penalty}}鍒
+ 缂鸿瘎鎵ｅ垎锛歿{homework.absence_penalty}}鍒/浣滃搧
+ 鍖胯瘎寮鍚椂闂达細{{homework.evaluation_start}}
+ 鍖胯瘎鍏抽棴鏃堕棿锛歿{homework.evaluation_end}}
{{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}}
@@ -48,7 +48,7 @@
-
+
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 @@
璇疯緭鍏ユ纭殑浠ｇ爜!
";
+ 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 = $('