<% if has_commit %>
<%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
<% else %>
diff --git a/app/views/users/_user_jours.html.erb b/app/views/users/_user_jours.html.erb
index 9d7a601d5..75a7d0fda 100644
--- a/app/views/users/_user_jours.html.erb
+++ b/app/views/users/_user_jours.html.erb
@@ -8,7 +8,7 @@
div.ke-toolbar .ke-outline{border:none;}
div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
- div.recall_con{width:600px;}
+ div.recall_con{width:570px;}
div.recall_con .reply_btn{margin-left:555px;margin-top:5px;}
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index e232579f9..74e4df4f0 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -14,7 +14,7 @@
function reset_homework(){
$("#homework_name").val("");
- $("#homework_end_time").val("");
+ $("#homework_end_time").val("<%= (Time.now + 3600 * 24).strftime('%Y-%m-%d')%>");
$("#course_id").val("");
$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>");
homework_description_editor.html("");
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 2d23c6dd6..207572a1c 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -44,7 +44,7 @@
<%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
:title => "#{ma.course_message.title}" %>
-
<%= time_tag(ma.course_message.created_on).html_safe %>
+
<%= time_tag(ma.created_at).html_safe %>
<% end %>
<% if ma.course_message_type == "Comment" %>
@@ -55,7 +55,7 @@
<%= link_to ma.course_message.comments.html_safe, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
:title => "#{ma.course_message.comments.html_safe}" %>
-
<%= time_tag(ma.course_message.created_on).html_safe %>
+
<%= time_tag(ma.created_at).html_safe %>
<% end %>
<% if ma.course_message_type == "HomeworkCommon" %>
@@ -64,7 +64,7 @@
<%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>">发布了作业：
<%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),:class => "newsGrey", :title => "#{ma.course_message.name}" %>
-
<%= time_tag(ma.course_message.created_at).html_safe %>
+
<%= time_tag(ma.created_at).html_safe %>
<% end %>
<% if ma.course_message_type == "Poll" %>
@@ -75,7 +75,7 @@
<%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
:title => "#{ma.course_message.polls_name}" %>
-
<%= time_tag(ma.course_message.created_at).html_safe %>
+
<%= time_tag(ma.created_at).html_safe %>
<% end %>
<% if ma.course_message_type == "Message" %>
@@ -86,7 +86,7 @@
<%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id,
:topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
:title => "#{ma.course_message.subject.html_safe}" %>
-
<%= time_tag(ma.course_message.created_on).html_safe %>
+
<%= time_tag(ma.created_at).html_safe %>
<% end %>
@@ -107,7 +107,7 @@
<%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>">回复了作品评论：
<%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ma.course_message.notes}" %>
-
<%= time_tag(ma.course_message.created_on).html_safe %>
+
<%= time_tag(ma.created_at).html_safe %>
<% end %>
<% end %>
@@ -143,7 +143,7 @@
issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
:title => "#{get_issue_des_update(ma.forge_message).html_safe}" %>
-
<%= time_tag(ma.forge_message.created_on).html_safe %>
+
<%= time_tag(ma.created_at).html_safe %>
<% end %>
<% if ma.forge_message_type == "Message" %>
@@ -156,7 +156,7 @@
:parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
:topic_id => ma.forge_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
:title => "#{ma.forge_message.subject.html_safe}" %>
-
<%= time_tag(ma.forge_message.created_on).html_safe %>
+
<%= time_tag(ma.created_at).html_safe %>
<% end %>
<% if ma.forge_message_type == "News" %>
@@ -171,7 +171,7 @@
<%= link_to ("#{ma.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id}, :class => "newsGrey", :title => "#{ma.forge_message.title.html_safe}" %>
-
<%= time_tag(ma.forge_message.created_on).html_safe %>
+
<%= time_tag(ma.created_at).html_safe %>
<% end %>
<% if ma.forge_message_type == "Comment" %>
@@ -182,7 +182,7 @@
<%= link_to "#{ma.forge_message.comments.html_safe}",
{:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.forge_message.comments.html_safe}"%>
-
<%= time_tag(ma.forge_message.created_on).html_safe %>
+
<%= time_tag(ma.created_at).html_safe %>
<% end %>
<% end %>
diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb
index ba3efbdfb..f7ae832d1 100644
--- a/app/views/users/user_resource_create.js.erb
+++ b/app/views/users/user_resource_create.js.erb
@@ -1,4 +1,5 @@
closeModal();
$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
-//这里不能将翻页的更新
\ No newline at end of file
+//这里不能将翻页的更新
+$("#res_all_count").html(parseInt($("#res_all_count").html())+1);
\ No newline at end of file
diff --git a/db/migrate/20150829023459_forge_messages.rb b/db/migrate/20150829023459_forge_messages.rb
new file mode 100644
index 000000000..c468ad68f
--- /dev/null
+++ b/db/migrate/20150829023459_forge_messages.rb
@@ -0,0 +1,80 @@
+# encoding: UTF-8
+class ForgeMessages < ActiveRecord::Migration
+ def up
+ Project.all.each do |project|
+ transaction do
+ project.forge_messages << ForgeMessage.new(:user_id => project.user_id, :project_id => project.id)
+
+ # 新闻
+ project.news.each do |new|
+ new.project.members.each do |m|
+ if m.user_id != new.author_id
+ if m.created_on < new.created_on # 在成员加入项目之后
+ new.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => new.project_id, :viewed => true)
+ end
+ end
+ end
+ end
+
+ # 新闻回复
+ project.news.each do |new|
+ if new.comments
+ new.comments.each do |comment|
+ if comment.author_id != comment.commented.author_id
+ comment.forge_messages << ForgeMessage.new(:user_id => comment.commented.author_id, :project_id => comment.commented.project.id, :viewed => true)
+ end
+ end
+ end
+ end
+
+ # 讨论区
+ if project.boards.first
+ project.boards.first.messages.each do |message|
+ if message.parent_id.nil? # 主贴
+ message.project.members.each do |m|
+ if m.user_id != message.author_id
+ if m.created_on < message.created_on
+ message.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => message.board.project_id, :viewed => true)
+ end
+ end
+ end
+ else # 回帖
+ message.project.members.each do |m|
+ if m.user_id == Message.find(message.parent_id).author_id && m.user_id != message.author_id # 只针对主贴回复，回复自己的帖子不发消息
+ if m.created_on < message.created_on
+ message.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => message.board.project_id, :viewed => true)
+ end
+ end
+ end
+ end
+ end
+ end
+
+ # 缺陷
+ project.issues.each do |issue|
+ unless issue.author_id == issue.assigned_to_id
+ issue.forge_messages << ForgeMessage.new(:user_id => issue.assigned_to_id, :project_id => issue.project_id, :viewed => true)
+ end
+ end
+
+ # 缺陷更新
+ project.issues.each do |issue|
+ if issue.journals
+ issue.journals.each do |journal|
+ if journal.user_id != journal.issue.author_id
+ journal.forge_messages << ForgeMessage.new(:user_id => journal.issue.author_id, :project_id => journal.issue.project_id, :viewed => true)
+ end
+ if journal.user_id != journal.issue.assigned_to_id && journal.issue.assigned_to_id != journal.issue.author_id # 指派人不是自己的话，则给指派人发送
+ journal.forge_messages << ForgeMessage.new(:user_id => journal.issue.assigned_to_id, :project_id => journal.issue.project_id, :viewed => true)
+ end
+ end
+ end
+ end
+
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20150829024549_course_messages.rb b/db/migrate/20150829024549_course_messages.rb
new file mode 100644
index 000000000..666ccdaeb
--- /dev/null
+++ b/db/migrate/20150829024549_course_messages.rb
@@ -0,0 +1,115 @@
+# encoding: UTF-8
+class CourseMessages < ActiveRecord::Migration
+ def up
+ Course.all.each do |course|
+ transaction do
+ course.course_messages << CourseMessage.new(:user_id => course.tea_id,:course_id => course.id)
+ # 作业
+ course.homework_commons.each do |homework_common|
+ homework_common.course.members.each do |m|
+ if m.user_id != homework_common.user_id
+ if m.created_on < homework_common.created_at
+ homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => true)
+ end
+ end
+ end
+ end
+
+ # 通知
+ course.news.each do |new|
+ new.course.members.each do |m|
+ if m.user_id != new.author_id
+ if m.created_on < new.created_on # 在成员加入课程之后
+ new.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => true)
+ end
+ end
+ end
+ end
+
+ # 通知的回复
+ course.news.each do |new|
+ if new.comments
+ new.comments.each do |comment|
+ if comment.author_id != comment.commented.author_id
+ comment.course_messages << CourseMessage.new(:user_id => comment.commented.author_id, :course_id => course.id, :viewed => true)
+ end
+ end
+ end
+ end
+
+ # 讨论区
+ if course.boards.first
+ course.boards.first.messages.each do |message|
+ if message.parent_id.nil? # 主贴
+ message.course.members.each do |m|
+ if message.author.allowed_to?(:as_teacher, message.course) && m.user_id != message.author_id # 老师 自己的帖子不给自己发送消息
+ if m.created_on < message.created_on
+ message.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => true)
+ end
+ end
+ end
+ else # 回帖
+ message.course.members.each do |m|
+ if m.user_id == Message.find(message.parent_id).author_id && m.user_id != message.author_id # 只针对主贴回复，回复自己的帖子不发消息
+ if m.created_on < message.created_on
+ message.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => true)
+ end
+ end
+ end
+ end
+ end
+ end
+
+ # 问卷
+ Poll.where("polls_type = 'Course' and polls_group_id = #{course.id}").each do |poll|
+ if poll.polls_status == 2 #问卷是发布状态
+ Course.find(poll.polls_group_id).members.each do |m|
+ if m.user_id != poll.user_id
+ if m.created_on < poll.created_at
+ poll.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => true)
+ end
+ end
+ end
+ elsif poll.polls_status == 1 #问卷是新建状态
+ poll.course_messages.destroy_all
+ end
+ end
+
+ # 作品评阅
+ # course.homework_commons.each do |homework_common|
+ # if homework_common.student_works
+ # homework_common.student_works.each do |student_work|
+ # if student_work.student_works_scores
+ # student_work.student_works_scores.each do |student_works_score|
+ # receiver = student_works_score.student_work.user
+ # if student_works_score.created_at == student_works_score.updated_at
+ # if student_works_score.comment.nil?
+ # student_works_score.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => course.id,
+ # :viewed => true, :content => "作业评分：#{student_works_score.score}", :status=> true)
+ # else
+ # student_works_score.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => course.id,
+ # :viewed => true, :content => "作业评分：#{student_works_score.score} 评语：#{student_works_score.comment}", :status=> true)
+ # end
+ # else # 更新
+ # if student_works_score.comment.nil?
+ # student_works_score.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => course.id,
+ # :viewed => true, :content => "作业评分：#{student_works_score.score}", :status=> true)
+ # else
+ # student_works_score.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => course.id,
+ # :viewed => true, :content => "作业评分：#{student_works_score.score} 评语：#{student_works_score.comment}", :status=> true)
+ # end
+ # end
+ # end
+ # end
+ # end
+ # end
+ # end
+ # 作品讨论
+
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20150829081822_update_message_time.rb b/db/migrate/20150829081822_update_message_time.rb
new file mode 100644
index 000000000..fe670e9b8
--- /dev/null
+++ b/db/migrate/20150829081822_update_message_time.rb
@@ -0,0 +1,26 @@
+class UpdateMessageTime < ActiveRecord::Migration
+ def up
+ course_count = CourseMessage.all.count / 30 + 1
+ transaction do
+ for i in 1 ... course_count do i
+ CourseMessage.page(i).per(30).each do |cmessage|
+ if cmessage.course_message
+ if cmessage.course_message.respond_to?("created_at")
+ cmessage.created_at = cmessage.course_message.created_at
+ elsif cmessage.course_message.respond_to?("created_on")
+ cmessage.created_at = cmessage.course_message.created_on
+ end
+ cmessage.save
+
+ course_all_message = MessageAll.where("message_type = '#{cmessage.class.to_s}' and message_id = '#{cmessage.id}'").first
+ course_all_message.created_at = cmessage.created_at
+ course_all_message.save
+ end
+ end
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20150829130302_update_forge_message_time.rb b/db/migrate/20150829130302_update_forge_message_time.rb
new file mode 100644
index 000000000..70811c307
--- /dev/null
+++ b/db/migrate/20150829130302_update_forge_message_time.rb
@@ -0,0 +1,26 @@
+class UpdateForgeMessageTime < ActiveRecord::Migration
+ def up
+ forge_count = ForgeMessage.all.count / 30 + 1
+ transaction do
+ for i in 1 ... forge_count do i
+ ForgeMessage.page(i).per(30).each do |fmessage|
+ if fmessage.forge_message
+ if fmessage.forge_message.respond_to?("created_at")
+ fmessage.created_at = fmessage.forge_message.created_at
+ elsif fmessage.forge_message.respond_to?("created_on")
+ fmessage.created_at = fmessage.forge_message.created_on
+ end
+ fmessage.save
+
+ forge_all_message = MessageAll.where("message_type = '#{fmessage.class.to_s}' and message_id = '#{fmessage.id}'").first
+ forge_all_message.created_at = fmessage.created_at
+ forge_all_message.save
+ end
+ end
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3c43292e5..05825bd5d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150826061843) do
+ActiveRecord::Schema.define(:version => 20150829070453) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -1317,7 +1317,6 @@ ActiveRecord::Schema.define(:version => 20150826061843) do
t.datetime "updated_at", :null => false
t.integer "late_penalty", :default => 0
t.integer "absence_penalty", :default => 0
- t.integer "system_score"
end
create_table "student_works_evaluation_distributions", :force => true do |t|
@@ -1535,6 +1534,7 @@ ActiveRecord::Schema.define(:version => 20150826061843) do
t.string "identity_url"
t.string "mail_notification", :default => "", :null => false
t.string "salt", :limit => 64
+ t.integer "gid"
end
add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 1a18ca705..1393431d7 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1,7 +1,7 @@
/*右侧内容--动态*/
-.project_r_h{ width:730px; height:40px; background:#eaeaea; margin-bottom:10px;}
-.project_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;}
+.project_r_h{ width:670px; height:40px; background:#eaeaea; margin-bottom:10px;}
+.project_r_h02{ width:920px; height:40px; background:#eaeaea; margin-bottom:10px;}
.project_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
.project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;}
.project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;}
@@ -52,7 +52,7 @@ a:hover.problem_new_btn{ background:#ff7143; color:#fff;}
.problem_p span{ color:#ff3e00;}
a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;}
a:hover.problem_pic{border:1px solid #64bdd9;}
-.problem_txt{ width:670px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;}
+.problem_txt{ width:610px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;}
a.problem_name{ color:#ff5722;max-width:60px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
a:hover.problem_name{ color:#d33503;}
a.problem_tit{ color:#0781b4; max-width:410px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;vertical-align: top;}
@@ -105,14 +105,14 @@ a:hover.grey_btn{ background:#717171; color:#fff;}
.w90{width:90px;}
.ml10{margin-left:10px;}
.resource{ width:670px;}
-.re_top{width:720px; height:40px; background:#eaeaea; padding:5px;}
+.re_top{width:660px; height:40px; background:#eaeaea; padding:5px;}
.re_top input{ float:left;}
.re_search{ margin-top:7px; margin-left:5px;}
.re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
.re_schbtn{ width:60px; height:26px; color:#fff; margin-right:5px; border:none; margin-left:0px;padding-left: 0px;}
a.re_fabu { display:block; width:90px; height:30px; font-size:14px; color:#fff; text-align:center; padding-top:10px; }
a:hover.re_fabu{background:#55a1b9;}
-.re_con{ margin:5px; width:720px;}
+.re_con{ margin:5px; width:665px;}
.re_con_top{color:#494949; }
.re_con_top span{ color:#999999; font-weight:bold;}
a.re_select{ display:block; border:1px solid #ff9900; color:#ff9900; margin-left:10px; padding:1px 5px;}
@@ -172,7 +172,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;}
.wzan a{ display: block;}
a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;}
a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
-.msg_box{ width:728px; border-bottom:1px dashed #CCC; padding-top:10px;}
+.msg_box{ width:670px; border-bottom:1px dashed #CCC; padding-top:10px;}
.msg_box h4{ }
.msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666; font-size:12px; }
@@ -212,7 +212,7 @@ a:hover.ping_sub{ background:#14a8b9;}
.ping_C{border-bottom:1px dashed #CCC; padding:10px 0 0px;}
.ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;}
.ping_dispic a:hover{border:1px solid #15bccf;}
-.ping_discon{ float:left; width:670px; margin-left:10px; }
+.ping_discon{ float:left; width:610px; margin-left:10px; }
/*.ping_distop span{ float:left;}*/
.ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
.ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
@@ -221,16 +221,16 @@ a:hover.ping_sub{ background:#14a8b9;}
/* 创建作品 work */
.Newwork{ width:668px; height:418px;}
.N_top{ float:right; margin-left:390px; }
-.N_con{ color:#484747; font-weight:bold; width:710px; margin-top:10px; }
+.N_con{ color:#484747; font-weight:bold; width:660px; margin-top:10px; }
.N_con p{ }
.w430{ width:470px;}
.w557{ width:557px;}
.w350{ width:350px;}
.h400{height: 400px !important;}
.w620{ width:480px; height:160px; border:1px solid #CCC;}
-.bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:530px; }
+.bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:470px; }
.bo02{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:480px; margin-left:2px; color: #999; }
-.hwork_txt{ width:610px; padding-left:5px; background:#fff;}
+.hwork_txt{ width:560px; padding-left:5px; background:#fff;}
a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:10px;}
a:hover.tijiao{ background:#0f99a9;}
.members_left{ float:left; width:410px; margin-right:20px; text-align:center;}
@@ -556,7 +556,7 @@ a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #64bdd9; pa
/* 20150423作业评分*/
.ml14{ margin-left:14px;}
-.w548{ width:600px;}
+.w548{ width:552px;}
.w547{ width:544px;}
.w196{ width:182px;}
.w459{ width:459px;}
@@ -572,18 +572,18 @@ a:hover.icon_add{background:url(../stylesheets/images/icons.png) -20px -310px no
.w664{ width:664px;}
.w140{ width:140px;}
.talklist_box{ }
-.talkmain_box{ width:730px; border-bottom:1px dashed #d9d9d9; margin-bottom:20px; margin-top: 10px;}
+.talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9; margin-bottom:20px; margin-top: 10px;}
.talkmain_pic{}
a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;}
a:hover.talkmain_pic{border:1px solid #64bdd9;}
-.talkmain_txt{ width:670px; margin-left:10px; color:#333;}
+.talkmain_txt{ width:610px; margin-left:10px; color:#333;}
a.talkmain_name{ color:#ff5722;}
a:hover.talkmain_name{ color:#d33503;}
.talkmain_tit{ color:#0781b4; width:450px; display:block; }
.talklist_main{ }
/*.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}*/
.talkConIpt{ background:#f2f2f2; }
-.talkWrapBox{ width:660px; margin-left:60px; }
+.talkWrapBox{ width:610px; margin-left:60px; }
.inputFeint{ border:1px solid #d9d9d9; background:#fff; width:583px; height:50px; margin:10px; margin-bottom:5px;color:#666;}
.inputFeint02{ border:1px solid #d9d9d9; background:#fff; width:535px; height:30px; margin:5px 0 5px 50px; color:#666;}
.inputFeint03{ border:1px solid #d9d9d9; background:#fff; width:490px; height:30px; margin:5px 0 5px 0px; color:#666;}
@@ -592,7 +592,7 @@ a.Msg_pic{ display:block; width:34px; height:34px; padding:2px; border:1px solid
a:hover.Msg_pic{border:1px solid #64bdd9;}
a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px solid #e3e3e3; float:left;}
a:hover.Reply_pic{border:1px solid #64bdd9;}
-.Msg_txt{ float:left; width:630px; margin-left:10px;}
+.Msg_txt{ float:left; width:540px; margin-left:10px;}
.Msg_txt p{ }
.talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;}
.talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; }
@@ -604,7 +604,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
/* 20150423作业评分*/
.ml14{ margin-left:14px;}
-.w548{ width:600px;}
+.w548{ width:552px;}
.w547{ width:544px;}
.w196{ width:196px;}
.w186{ width:186px;}
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 28caa2639..6b7aa209e 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -90,8 +90,8 @@ li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
a.topnav_login_box:hover {color:#a1ebff;}
.navRow1 {margin:0; padding:0;}
.navRow2 {margin:0; padding:0;}
-.topnav_login_list{ border:1px solid #269ac9; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -4px;}
-.topnav_login_list a{color:#269ac9;}
+.topnav_login_list{ border:1px solid #15bccf; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -5px;}
+.topnav_login_list a{color:#15bccf;}
.topnav_login_list li{ }
/*底部*/
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 5ab4fab81..9f7b2d021 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -7,8 +7,8 @@
/*问卷列表*/
.polls_content{ width:609px;}
-.polls_content02{ width:730px;}
-.polls_head{ width:730px; height:48px; background:#eaeaea;}
+.polls_content02{ width:670px;}
+.polls_head{ width:670px; height:48px; background:#eaeaea;}
.polls_head h2{ float:left; font-size:14px; color:#585858; margin:11px 0 0 10px;}
.polls_head span{ font-weight:normal; color:#15bccf;}
a.newbtn{ float:right; display:block; width:80px; height:27px; padding-top:3px; background:#64bdd9; color:#fff; font-size:14px; margin:10px; text-align:center;}
@@ -61,7 +61,7 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
/*问卷编辑*/
.polls_edit{ color:#767676;}
a:hover{ text-decoration:none; cursor:pointer;}
-.tabs{ width:718px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;}
+.tabs{ width:658px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;}
.tab_item { float:left; height:30px; background:#eeeeee; margin-right:4px; padding:0 8px; margin-bottom:10px;}
.icon_delete{ font-size:16px;}
a:hover.icon_delete{ font-weight: bold;}
@@ -69,7 +69,7 @@ a:hover.icon_delete{ font-weight: bold;}
.tab_add{float:left; width:22px; height:22px; border:1px solid #cbcbcb; margin-top:6px; }
.icon_page_add{ background:url(images/icons.png) 4px -314px no-repeat; width:22px; height:27px; display:block;}
a:hover.icon_page_add{ background:url(images/icons.png) -16px -314px no-repeat;}
-.tab_item02{ float:left; width:154px; height:30px;background:#eeeeee; margin-right:10px; padding:0 10px; margin-bottom:10px; padding:10px 0 0 15px;}
+.tab_item02{ float:left; width:139px; height:30px;background:#eeeeee; margin-right:10px; padding:0 10px; margin-bottom:10px; padding:10px 0 0 15px;}
.tab_item02:hover{ background:#c9c9c9;}
.tab_icon{padding-left:25px;}
a:hover.tab_item02{ background:#fff;}
@@ -78,9 +78,9 @@ a:hover.tab_item02{ background:#fff;}
.icon_text{background:url(images/icons.png) 0px -80px no-repeat; }
.icon_textarea{background:url(images/icons.png) 0px -121px no-repeat; }
-.ur_editor {width:708px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
+.ur_editor {width:648px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
.ur_title_editor_title{ margin-bottom:10px;}
-.input_title{ width:688px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold; background:#fff;border-style:solid; border:1px solid #CBCBCB;}
+.input_title{ width:627px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold; background:#fff;border-style:solid; border:1px solid #CBCBCB;}
.textarea_editor{ width:627px; height:120px; padding:10px; margin-bottom:10px; background:#fff; border-style:solid; border:1px solid #CBCBCB;}
.btn_submit{ width:56px; height:24px; padding-top:4px;background:#15bccf; color:#fff; text-align:center; display:block; float:left; margin-right:10px;}
a:hover.btn_submit{background:#0fa9bb;}
@@ -98,7 +98,7 @@ a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
.ur_editor_toolbar{ margin-bottom:10px;}
.ur_editor_toolbar input{ width:40px; height:20px; background:#fff;}
-.ur_editor02{width:708px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px;}
+.ur_editor02{width:648px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px;}
a.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; }
a:hover.ur_button_submit{ background:#0fa9bb; text-decoration:none;}
@@ -139,7 +139,7 @@ a:hover.btn_pu{ background:#3cb761;}
.polls_n p{ margin-top:-4px;}
/***新增20150123***/
-.ur_buttons{ width:260px; }
+.ur_buttons{ width:275px; }
.ur_button_submit{ float:left;}
.polls_cha{float:left; margin-left:15px; margin-top:10px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index f2155ca20..4cc859721 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -225,7 +225,7 @@ a:hover.blue_n_btn{ background:#329cbd;}
/*框架主类容*/
-#Container{ width:1000px; margin:0 auto; }
+#Container{ width:940px; margin:0 auto; }
/*头部导航*/
#Header{ margin:10px 0; background:#15bccf; height:40px; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; }
@@ -291,7 +291,7 @@ a:hover.search_btn{ background: #0fa9bb;}
.search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; }
/*主类容左右分栏*/
#LSide{ width:240px; }
-#RSide{ width:730px; margin-left:10px; background:#fff; padding:10px; margin-bottom:10px;}
+#RSide{ width:670px; margin-left:10px; background:#fff; padding:10px; margin-bottom:10px;}
/*底部*/